diff: cleanup: move to another package

java/debugger/impl/src/com/intellij/debugger/actions/CompareValueWithClipboardAction.java

@@ -17,11 +17,11 @@ package com.intellij.debugger.actions;
 
 import com.intellij.debugger.impl.DebuggerContextImpl;
 import com.intellij.debugger.ui.impl.watch.DebuggerTreeNodeImpl;
+import com.intellij.diff.DiffDialogHints;
+import com.intellij.diff.DiffManager;
+import com.intellij.diff.DiffRequestFactory;
+import com.intellij.diff.requests.DiffRequest;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.diff.DiffDialogHints;
-import com.intellij.openapi.util.diff.DiffManager;
-import com.intellij.openapi.util.diff.DiffRequestFactory;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
 
 /**
  * @author Jeka

platform/diff-api/src/com/intellij/diff/DiffContentFactory.java

@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff;
+package com.intellij.diff;
 
+import com.intellij.diff.contents.DiffContent;
+import com.intellij.diff.contents.DocumentContent;
+import com.intellij.diff.contents.EmptyContent;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.util.diff.contents.DiffContent;
-import com.intellij.openapi.util.diff.contents.DocumentContent;
-import com.intellij.openapi.util.diff.contents.EmptyContent;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.LineSeparator;
 import org.jetbrains.annotations.NotNull;

platform/diff-api/src/com/intellij/diff/DiffContext.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.api;
+package com.intellij.diff;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.UserDataHolder;

platform/diff-api/src/com/intellij/diff/DiffDialogHints.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff;
+package com.intellij.diff;
 
 import com.intellij.openapi.ui.WindowWrapper;
 import org.jetbrains.annotations.NotNull;

platform/diff-api/src/com/intellij/diff/DiffManager.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff;
+package com.intellij.diff;
 
+import com.intellij.diff.chains.DiffRequestChain;
+import com.intellij.diff.requests.DiffRequest;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.diff.chains.DiffRequestChain;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
 import org.intellij.lang.annotations.CalledInAwt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

platform/diff-api/src/com/intellij/diff/DiffManagerEx.java

@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff;
+package com.intellij.diff;
 
+import com.intellij.diff.chains.DiffRequestChain;
+import com.intellij.diff.requests.DiffRequest;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.diff.api.DiffTool;
-import com.intellij.openapi.util.diff.chains.DiffRequestChain;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
 import org.intellij.lang.annotations.CalledInAwt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

platform/diff-api/src/com/intellij/diff/DiffRequestFactory.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff;
+package com.intellij.diff;
 
+import com.intellij.diff.requests.ContentDiffRequest;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.diff.requests.ContentDiffRequest;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

platform/diff-api/src/com/intellij/diff/DiffRequestPanel.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff;
+package com.intellij.diff;
 
+import com.intellij.diff.requests.DiffRequest;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.util.Key;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

platform/diff-api/src/com/intellij/diff/DiffTool.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.api;
+package com.intellij.diff;
 
+import com.intellij.diff.requests.DiffRequest;
 import com.intellij.openapi.extensions.ExtensionPointName;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
 import org.jetbrains.annotations.NotNull;
 
 public interface DiffTool {
-  ExtensionPointName<DiffTool> EP_NAME = ExtensionPointName.create("com.intellij.openapi.util.diff.api.DiffTool");
+  ExtensionPointName<DiffTool> EP_NAME = ExtensionPointName.create("com.intellij.diff.DiffTool");
 
   @NotNull
   String getName();

platform/diff-api/src/com/intellij/diff/FrameDiffTool.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.api;
+package com.intellij.diff;
 
+import com.intellij.diff.requests.DiffRequest;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
 import org.intellij.lang.annotations.CalledInAwt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

platform/diff-api/src/com/intellij/diff/SuppressiveDiffTool.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.api;
+package com.intellij.diff;
 
 import java.util.List;
 

platform/diff-api/src/com/intellij/diff/chains/DiffRequestChain.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.chains;
+package com.intellij.diff.chains;
 
 import com.intellij.openapi.util.UserDataHolder;
 import org.jetbrains.annotations.NotNull;

platform/diff-api/src/com/intellij/diff/chains/DiffRequestPresentable.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.chains;
+package com.intellij.diff.chains;
 
+import com.intellij.diff.requests.DiffRequest;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.util.UserDataHolder;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
 import org.intellij.lang.annotations.CalledInBackground;
 import org.jetbrains.annotations.NotNull;
 

platform/diff-api/src/com/intellij/diff/chains/DiffRequestPresentableException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.chains;
+package com.intellij.diff.chains;
 
 public class DiffRequestPresentableException extends Exception {
   public DiffRequestPresentableException(Throwable cause) {

platform/diff-api/src/com/intellij/diff/chains/SimpleDiffRequestChain.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.chains;
+package com.intellij.diff.chains;
 
+import com.intellij.diff.requests.DiffRequest;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.util.UserDataHolder;
 import com.intellij.openapi.util.UserDataHolderBase;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;

platform/diff-api/src/com/intellij/diff/comparison/ByChar.java

@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison;
+package com.intellij.diff.comparison;
 
+import com.intellij.diff.comparison.iterables.DiffIterable;
+import com.intellij.diff.comparison.iterables.FairDiffIterable;
 import com.intellij.openapi.progress.ProgressIndicator;
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterable;
-import com.intellij.openapi.util.diff.comparison.iterables.FairDiffIterable;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.intellij.openapi.util.diff.comparison.TrimUtil.isPunctuation;
-import static com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.*;
+import static com.intellij.diff.comparison.TrimUtil.isPunctuation;
+import static com.intellij.diff.comparison.iterables.DiffIterableUtil.*;
 import static com.intellij.openapi.util.text.StringUtil.isWhiteSpace;
 
 public class ByChar {

platform/diff-api/src/com/intellij/diff/comparison/ByLine.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison;
+package com.intellij.diff.comparison;
 
+import com.intellij.diff.comparison.iterables.DiffIterableUtil.ChangeBuilder;
+import com.intellij.diff.comparison.iterables.DiffIterableUtil.IntPair;
+import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range;
+import com.intellij.diff.comparison.iterables.FairDiffIterable;
+import com.intellij.diff.fragments.LineFragment;
+import com.intellij.diff.fragments.LineFragmentImpl;
 import com.intellij.openapi.progress.ProgressIndicator;
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.ChangeBuilder;
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.IntPair;
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range;
-import com.intellij.openapi.util.diff.comparison.iterables.FairDiffIterable;
-import com.intellij.openapi.util.diff.fragments.LineFragment;
-import com.intellij.openapi.util.diff.fragments.LineFragmentImpl;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.NotNull;
@@ -29,10 +29,10 @@ import org.jetbrains.annotations.NotNull;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.intellij.openapi.util.diff.comparison.TrimUtil.trimEnd;
-import static com.intellij.openapi.util.diff.comparison.TrimUtil.trimStart;
-import static com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.diff;
-import static com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.fair;
+import static com.intellij.diff.comparison.TrimUtil.trimEnd;
+import static com.intellij.diff.comparison.TrimUtil.trimStart;
+import static com.intellij.diff.comparison.iterables.DiffIterableUtil.diff;
+import static com.intellij.diff.comparison.iterables.DiffIterableUtil.fair;
 import static com.intellij.openapi.util.text.StringUtil.isWhiteSpace;
 
 public class ByLine {

platform/diff-api/src/com/intellij/diff/comparison/ByWord.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison;
+package com.intellij.diff.comparison;
 
+import com.intellij.diff.comparison.LineFragmentSplitter.WordBlock;
+import com.intellij.diff.comparison.iterables.DiffIterable;
+import com.intellij.diff.comparison.iterables.DiffIterableUtil.*;
+import com.intellij.diff.comparison.iterables.FairDiffIterable;
+import com.intellij.diff.fragments.DiffFragment;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.util.Couple;
-import com.intellij.openapi.util.diff.comparison.LineFragmentSplitter.WordBlock;
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterable;
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.*;
-import com.intellij.openapi.util.diff.comparison.iterables.FairDiffIterable;
-import com.intellij.openapi.util.diff.fragments.DiffFragment;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.text.MergingCharSequence;
 import org.jetbrains.annotations.NotNull;
@@ -29,10 +29,10 @@ import org.jetbrains.annotations.NotNull;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.intellij.openapi.util.diff.comparison.TrimUtil.*;
-import static com.intellij.openapi.util.diff.comparison.TrimUtil.trim;
-import static com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.*;
-import static com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.trim;
+import static com.intellij.diff.comparison.TrimUtil.*;
+import static com.intellij.diff.comparison.TrimUtil.trim;
+import static com.intellij.diff.comparison.iterables.DiffIterableUtil.*;
+import static com.intellij.diff.comparison.iterables.DiffIterableUtil.trim;
 import static com.intellij.openapi.util.text.StringUtil.isWhiteSpace;
 
 public class ByWord {

platform/diff-api/src/com/intellij/diff/comparison/ChangeCorrector.java

@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison;
+package com.intellij.diff.comparison;
 
+import com.intellij.diff.comparison.ByChar.Char;
+import com.intellij.diff.comparison.ByLine.Line;
+import com.intellij.diff.comparison.ByLine.LineWrapper;
+import com.intellij.diff.comparison.iterables.DiffIterableUtil;
+import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range;
+import com.intellij.diff.comparison.iterables.FairDiffIterable;
 import com.intellij.openapi.progress.ProgressIndicator;
-import com.intellij.openapi.util.diff.comparison.ByChar.Char;
-import com.intellij.openapi.util.diff.comparison.ByLine.Line;
-import com.intellij.openapi.util.diff.comparison.ByLine.LineWrapper;
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil;
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range;
-import com.intellij.openapi.util.diff.comparison.iterables.FairDiffIterable;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
-import static com.intellij.openapi.util.diff.comparison.TrimUtil.expand;
-import static com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.diff;
-import static com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.fair;
+import static com.intellij.diff.comparison.TrimUtil.expand;
+import static com.intellij.diff.comparison.iterables.DiffIterableUtil.diff;
+import static com.intellij.diff.comparison.iterables.DiffIterableUtil.fair;
 
 /*
  * Base class for two-step diff algorithms.

platform/diff-api/src/com/intellij/diff/comparison/ComparisonPolicy.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison;
+package com.intellij.diff.comparison;
 
 public enum ComparisonPolicy {
   DEFAULT,

platform/diff-api/src/com/intellij/diff/comparison/ComparisonUtil.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison;
+package com.intellij.diff.comparison;
 
+import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range;
+import com.intellij.diff.fragments.DiffFragment;
+import com.intellij.diff.fragments.DiffFragmentImpl;
+import com.intellij.diff.fragments.LineFragment;
+import com.intellij.diff.fragments.LineFragmentImpl;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProgressIndicator;
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range;
-import com.intellij.openapi.util.diff.fragments.DiffFragment;
-import com.intellij.openapi.util.diff.fragments.DiffFragmentImpl;
-import com.intellij.openapi.util.diff.fragments.LineFragment;
-import com.intellij.openapi.util.diff.fragments.LineFragmentImpl;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.Consumer;
 import com.intellij.util.containers.ContainerUtil;
@@ -32,7 +32,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import static com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.convertIntoFragments;
+import static com.intellij.diff.comparison.iterables.DiffIterableUtil.convertIntoFragments;
 
 /**
  * Class for the text comparison

platform/diff-api/src/com/intellij/diff/comparison/DiffTooBigException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison;
+package com.intellij.diff.comparison;
 
 import com.intellij.openapi.progress.ProcessCanceledException;
 

platform/diff-api/src/com/intellij/diff/comparison/LineFragmentSplitter.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison;
+package com.intellij.diff.comparison;
 
+import com.intellij.diff.comparison.ByWord.InlineChunk;
+import com.intellij.diff.comparison.ByWord.NewlineChunk;
+import com.intellij.diff.comparison.iterables.DiffIterableUtil;
+import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range;
+import com.intellij.diff.comparison.iterables.FairDiffIterable;
 import com.intellij.openapi.progress.ProgressIndicator;
-import com.intellij.openapi.util.diff.comparison.ByWord.InlineChunk;
-import com.intellij.openapi.util.diff.comparison.ByWord.NewlineChunk;
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil;
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range;
-import com.intellij.openapi.util.diff.comparison.iterables.FairDiffIterable;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;

platform/diff-api/src/com/intellij/diff/comparison/MergeUtil.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison;
+package com.intellij.diff.comparison;
 
+import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range;
+import com.intellij.diff.comparison.iterables.FairDiffIterable;
+import com.intellij.diff.fragments.MergeLineFragment;
+import com.intellij.diff.util.Side;
+import com.intellij.diff.util.ThreeSide;
 import com.intellij.openapi.progress.ProgressIndicator;
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range;
-import com.intellij.openapi.util.diff.comparison.iterables.FairDiffIterable;
-import com.intellij.openapi.util.diff.fragments.MergeLineFragment;
-import com.intellij.openapi.util.diff.util.Side;
-import com.intellij.openapi.util.diff.util.ThreeSide;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;

platform/diff-api/src/com/intellij/diff/comparison/TextChunk.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison;
+package com.intellij.diff.comparison;
 
 import org.jetbrains.annotations.NotNull;
 

platform/diff-api/src/com/intellij/diff/comparison/TrimUtil.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison;
+package com.intellij.diff.comparison;
 
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.IntPair;
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range;
+import com.intellij.diff.comparison.iterables.DiffIterableUtil.IntPair;
+import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range;
 import gnu.trove.TIntHashSet;
 import org.jetbrains.annotations.NotNull;
 

platform/diff-api/src/com/intellij/diff/comparison/iterables/ChangeDiffIterableBase.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison.iterables;
+package com.intellij.diff.comparison.iterables;
 
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range;
+import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Iterator;

platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffChangeDiffIterable.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison.iterables;
+package com.intellij.diff.comparison.iterables;
 
 import com.intellij.util.diff.Diff;
 import org.jetbrains.annotations.NotNull;

platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffFragmentsDiffIterable.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison.iterables;
+package com.intellij.diff.comparison.iterables;
 
-import com.intellij.openapi.util.diff.fragments.DiffFragment;
+import com.intellij.diff.fragments.DiffFragment;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;

platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffIterable.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison.iterables;
+package com.intellij.diff.comparison.iterables;
 
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range;
+import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Iterator;

platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffIterableBase.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison.iterables;
+package com.intellij.diff.comparison.iterables;
 
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range;
+import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Iterator;

platform/diff-api/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison.iterables;
+package com.intellij.diff.comparison.iterables;
 
+import com.intellij.diff.comparison.DiffTooBigException;
+import com.intellij.diff.fragments.DiffFragment;
+import com.intellij.diff.fragments.DiffFragmentImpl;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.util.diff.comparison.DiffTooBigException;
-import com.intellij.openapi.util.diff.fragments.DiffFragment;
-import com.intellij.openapi.util.diff.fragments.DiffFragmentImpl;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.diff.Diff;

platform/diff-api/src/com/intellij/diff/comparison/iterables/FairDiffIterable.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison.iterables;
+package com.intellij.diff.comparison.iterables;
 
 /*
  * Matched fragments are guaranteed to have same length

platform/diff-api/src/com/intellij/diff/comparison/iterables/FairDiffIterableWrapper.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison.iterables;
+package com.intellij.diff.comparison.iterables;
 
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range;
+import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Iterator;

platform/diff-api/src/com/intellij/diff/comparison/iterables/InvertedDiffIterableWrapper.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison.iterables;
+package com.intellij.diff.comparison.iterables;
 
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range;
+import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Iterator;

platform/diff-api/src/com/intellij/diff/comparison/iterables/RangesDiffIterable.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison.iterables;
+package com.intellij.diff.comparison.iterables;
 
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range;
+import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;

platform/diff-api/src/com/intellij/diff/comparison/iterables/SubiterableDiffIterable.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.comparison.iterables;
+package com.intellij.diff.comparison.iterables;
 
-import com.intellij.openapi.util.diff.comparison.iterables.DiffIterableUtil.Range;
+import com.intellij.diff.comparison.iterables.DiffIterableUtil.Range;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Iterator;

platform/diff-api/src/com/intellij/diff/contents/BinaryFileContent.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.contents;
+package com.intellij.diff.contents;
 
 import org.jetbrains.annotations.NotNull;
 

platform/diff-api/src/com/intellij/diff/contents/BinaryFileContentImpl.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.contents;
+package com.intellij.diff.contents;
 
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.fileTypes.FileType;

platform/diff-api/src/com/intellij/diff/contents/DiffContent.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.contents;
+package com.intellij.diff.contents;
 
+import com.intellij.diff.requests.DiffRequest;
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
 import org.intellij.lang.annotations.CalledInAwt;
 import org.jetbrains.annotations.Nullable;
 

platform/diff-api/src/com/intellij/diff/contents/DirectoryContent.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.contents;
+package com.intellij.diff.contents;
 
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;

platform/diff-api/src/com/intellij/diff/contents/DirectoryContentImpl.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.contents;
+package com.intellij.diff.contents;
 
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.fileTypes.FileType;

platform/diff-api/src/com/intellij/diff/contents/DocumentContent.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.contents;
+package com.intellij.diff.contents;
 
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;

platform/diff-api/src/com/intellij/diff/contents/DocumentContentImpl.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.contents;
+package com.intellij.diff.contents;
 
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;

platform/diff-api/src/com/intellij/diff/contents/DocumentContentWrapper.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.contents;
+package com.intellij.diff.contents;
 
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.EditorFactory;

platform/diff-api/src/com/intellij/diff/contents/EmptyContent.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.contents;
+package com.intellij.diff.contents;
 
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.fileTypes.FileType;

platform/diff-api/src/com/intellij/diff/contents/FileContent.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.contents;
+package com.intellij.diff.contents;
 
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;

platform/diff-api/src/com/intellij/diff/contents/FileDocumentContentImpl.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.contents;
+package com.intellij.diff.contents;
 
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;

platform/diff-api/src/com/intellij/diff/contents/SimpleContentBuilder.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.contents;
+package com.intellij.diff.contents;
 
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.EditorFactory;

platform/diff-api/src/com/intellij/diff/fragments/DiffFragment.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.fragments;
+package com.intellij.diff.fragments;
 
 public interface DiffFragment {
   int getStartOffset1();

platform/diff-api/src/com/intellij/diff/fragments/DiffFragmentImpl.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.fragments;
+package com.intellij.diff.fragments;
 
 public class DiffFragmentImpl implements DiffFragment {
   private final int myStartOffset1;

platform/diff-api/src/com/intellij/diff/fragments/LineFragment.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.fragments;
+package com.intellij.diff.fragments;
 
 import org.jetbrains.annotations.Nullable;
 

platform/diff-api/src/com/intellij/diff/fragments/LineFragmentImpl.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.fragments;
+package com.intellij.diff.fragments;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

platform/diff-api/src/com/intellij/diff/fragments/MergeLineFragment.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.fragments;
+package com.intellij.diff.fragments;
 
-import com.intellij.openapi.util.diff.util.ThreeSide;
+import com.intellij.diff.util.ThreeSide;
 import org.jetbrains.annotations.NotNull;
 
 public interface MergeLineFragment {

platform/diff-api/src/com/intellij/diff/impl/DiffContentFactoryImpl.java

@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.impl;
+package com.intellij.diff.impl;
 
+import com.intellij.diff.DiffContentFactory;
+import com.intellij.diff.contents.*;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
@@ -26,8 +28,6 @@ import com.intellij.openapi.ide.CopyPasteManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.util.diff.DiffContentFactory;
-import com.intellij.openapi.util.diff.contents.*;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VfsUtil;

platform/diff-api/src/com/intellij/diff/impl/DiffRequestFactoryImpl.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.impl;
+package com.intellij.diff.impl;
 
+import com.intellij.diff.DiffContentFactory;
+import com.intellij.diff.DiffRequestFactory;
+import com.intellij.diff.contents.DiffContent;
+import com.intellij.diff.requests.ContentDiffRequest;
+import com.intellij.diff.requests.SimpleDiffRequest;
 import com.intellij.openapi.diff.DiffBundle;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.diff.DiffContentFactory;
-import com.intellij.openapi.util.diff.DiffRequestFactory;
-import com.intellij.openapi.util.diff.contents.DiffContent;
-import com.intellij.openapi.util.diff.requests.ContentDiffRequest;
-import com.intellij.openapi.util.diff.requests.SimpleDiffRequest;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;

platform/diff-api/src/com/intellij/diff/requests/ContentDiffRequest.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.requests;
+package com.intellij.diff.requests;
 
-import com.intellij.openapi.util.diff.contents.DiffContent;
+import com.intellij.diff.contents.DiffContent;
 import org.jetbrains.annotations.NotNull;
 
 /**

platform/diff-api/src/com/intellij/diff/requests/DiffRequest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.requests;
+package com.intellij.diff.requests;
 
 import com.intellij.openapi.util.UserDataHolderBase;
 import org.intellij.lang.annotations.CalledInAwt;

platform/diff-api/src/com/intellij/diff/requests/LoadingDiffRequest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.requests;
+package com.intellij.diff.requests;
 
 import org.jetbrains.annotations.Nullable;
 

platform/diff-api/src/com/intellij/diff/requests/MessageDiffRequest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.requests;
+package com.intellij.diff.requests;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

platform/diff-api/src/com/intellij/diff/requests/NoDiffRequest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.requests;
+package com.intellij.diff.requests;
 
 import org.jetbrains.annotations.Nullable;
 

platform/diff-api/src/com/intellij/diff/requests/OperationCanceledDiffRequest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.requests;
+package com.intellij.diff.requests;
 
 import org.jetbrains.annotations.Nullable;
 

platform/diff-api/src/com/intellij/diff/requests/SimpleDiffRequest.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.requests;
+package com.intellij.diff.requests;
 
-import com.intellij.openapi.util.diff.contents.DiffContent;
+import com.intellij.diff.contents.DiffContent;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

platform/diff-api/src/com/intellij/diff/util/DiffPlaces.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.util;
+package com.intellij.diff.util;
 
 public interface DiffPlaces {
   String DEFAULT = "Default";

platform/diff-api/src/com/intellij/diff/util/DiffUserDataKeys.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.util;
+package com.intellij.diff.util;
 
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.DataProvider;

platform/diff-api/src/com/intellij/diff/util/Side.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.util;
+package com.intellij.diff.util;
 
+import com.intellij.diff.fragments.DiffFragment;
+import com.intellij.diff.fragments.LineFragment;
 import com.intellij.openapi.util.Couple;
-import com.intellij.openapi.util.diff.fragments.DiffFragment;
-import com.intellij.openapi.util.diff.fragments.LineFragment;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

platform/diff-api/src/com/intellij/diff/util/ThreeSide.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.util;
+package com.intellij.diff.util;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

platform/diff-impl/src/com/intellij/diff/DiffManagerImpl.java

@@ -13,23 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff;
+package com.intellij.diff;
 
+import com.intellij.diff.chains.DiffRequestChain;
+import com.intellij.diff.chains.SimpleDiffRequestChain;
+import com.intellij.diff.impl.DiffRequestPanelImpl;
+import com.intellij.diff.impl.DiffWindow;
+import com.intellij.diff.requests.DiffRequest;
+import com.intellij.diff.tools.binary.BinaryDiffTool;
+import com.intellij.diff.tools.dir.DirDiffTool;
+import com.intellij.diff.tools.external.ExternalDiffTool;
+import com.intellij.diff.tools.fragmented.OnesideDiffTool;
+import com.intellij.diff.tools.simple.SimpleDiffTool;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.diff.api.DiffTool;
-import com.intellij.openapi.util.diff.chains.DiffRequestChain;
-import com.intellij.openapi.util.diff.chains.SimpleDiffRequestChain;
-import com.intellij.openapi.util.diff.impl.DiffRequestPanelImpl;
-import com.intellij.openapi.util.diff.impl.DiffWindow;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
-import com.intellij.openapi.util.diff.tools.binary.BinaryDiffTool;
-import com.intellij.openapi.util.diff.tools.dir.DirDiffTool;
-import com.intellij.openapi.util.diff.tools.external.ExternalDiffTool;
-import com.intellij.openapi.util.diff.tools.fragmented.OnesideDiffTool;
-import com.intellij.openapi.util.diff.tools.simple.SimpleDiffTool;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

platform/diff-impl/src/com/intellij/diff/actions/BaseShowDiffAction.java

@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.actions;
+package com.intellij.diff.actions;
 
+import com.intellij.diff.DiffDialogHints;
+import com.intellij.diff.DiffManager;
+import com.intellij.diff.requests.DiffRequest;
 import com.intellij.openapi.actionSystem.ActionPlaces;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.diff.DiffDialogHints;
-import com.intellij.openapi.util.diff.DiffManager;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

platform/diff-impl/src/com/intellij/diff/actions/BufferedLineIterator.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.actions;
+package com.intellij.diff.actions;
 
 import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.NotNull;

platform/diff-impl/src/com/intellij/diff/actions/CompareClipboardWithSelectionAction.java

@@ -13,8 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.actions;
+package com.intellij.diff.actions;
 
+import com.intellij.diff.DiffContentFactory;
+import com.intellij.diff.DiffRequestFactory;
+import com.intellij.diff.contents.DocumentContent;
+import com.intellij.diff.requests.DiffRequest;
+import com.intellij.diff.requests.SimpleDiffRequest;
+import com.intellij.diff.util.DiffUserDataKeys;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.diff.DiffBundle;
@@ -24,12 +30,6 @@ import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.util.diff.contents.DocumentContent;
-import com.intellij.openapi.util.diff.DiffContentFactory;
-import com.intellij.openapi.util.diff.DiffRequestFactory;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
-import com.intellij.openapi.util.diff.requests.SimpleDiffRequest;
-import com.intellij.openapi.util.diff.util.DiffUserDataKeys;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

platform/diff-impl/src/com/intellij/diff/actions/CompareFileWithEditorAction.java

@@ -13,8 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.actions;
+package com.intellij.diff.actions;
 
+import com.intellij.diff.DiffRequestFactory;
+import com.intellij.diff.contents.DiffContent;
+import com.intellij.diff.contents.DocumentContent;
+import com.intellij.diff.requests.ContentDiffRequest;
+import com.intellij.diff.requests.DiffRequest;
+import com.intellij.diff.util.DiffUserDataKeys;
+import com.intellij.diff.util.Side;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.editor.Editor;
@@ -22,13 +29,6 @@ import com.intellij.openapi.editor.EditorFactory;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.util.diff.contents.DiffContent;
-import com.intellij.openapi.util.diff.contents.DocumentContent;
-import com.intellij.openapi.util.diff.DiffRequestFactory;
-import com.intellij.openapi.util.diff.requests.ContentDiffRequest;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
-import com.intellij.openapi.util.diff.util.DiffUserDataKeys;
-import com.intellij.openapi.util.diff.util.Side;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

platform/diff-impl/src/com/intellij/diff/actions/CompareFilesAction.java

@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.actions;
+package com.intellij.diff.actions;
 
+import com.intellij.diff.DiffRequestFactory;
+import com.intellij.diff.requests.DiffRequest;
 import com.intellij.ide.highlighter.ArchiveFileType;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -22,8 +24,6 @@ import com.intellij.openapi.actionSystem.DataKey;
 import com.intellij.openapi.fileChooser.FileChooser;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.diff.DiffRequestFactory;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

platform/diff-impl/src/com/intellij/diff/actions/DocumentFragmentContent.java

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.actions;
+package com.intellij.diff.actions;
 
+import com.intellij.diff.contents.DocumentContent;
 import com.intellij.openapi.diff.FragmentContent;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.EditorFactory;
@@ -25,7 +26,6 @@ import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.util.diff.contents.DocumentContent;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.LineSeparator;
 import org.jetbrains.annotations.NotNull;

platform/diff-impl/src/com/intellij/diff/actions/DocumentsSynchronizer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.actions;
+package com.intellij.diff.actions;
 
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;

platform/diff-impl/src/com/intellij/diff/actions/NavigationContextChecker.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.actions;
+package com.intellij.diff.actions;
 
 import com.intellij.openapi.diff.DiffNavigationContext;
 import com.intellij.openapi.util.Pair;

platform/diff-impl/src/com/intellij/diff/actions/impl/FocusOppositePaneAction.java

@@ -13,10 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.actions.impl;
+package com.intellij.diff.actions.impl;
 
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.CustomShortcutSet;
+import com.intellij.openapi.actionSystem.ShortcutSet;
 import com.intellij.openapi.project.DumbAware;
 import org.jetbrains.annotations.NotNull;
 

platform/diff-impl/src/com/intellij/diff/actions/impl/GoToChangePopupAction.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.actions.impl;
+package com.intellij.diff.actions.impl;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.ActionManager;

platform/diff-impl/src/com/intellij/diff/actions/impl/GoToChangePopupBuilder.java

@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.actions.impl;
+package com.intellij.diff.actions.impl;
 
+import com.intellij.diff.chains.DiffRequestChain;
+import com.intellij.diff.chains.DiffRequestPresentable;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.project.Project;
@@ -22,8 +24,6 @@ import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.ui.popup.PopupStep;
 import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
-import com.intellij.openapi.util.diff.chains.DiffRequestChain;
-import com.intellij.openapi.util.diff.chains.DiffRequestPresentable;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.util.Consumer;
 import org.jetbrains.annotations.NotNull;

platform/diff-impl/src/com/intellij/diff/actions/impl/NextChangeAction.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.actions.impl;
+package com.intellij.diff.actions.impl;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.ActionManager;

platform/diff-impl/src/com/intellij/diff/actions/impl/NextDifferenceAction.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.actions.impl;
+package com.intellij.diff.actions.impl;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.ActionManager;

platform/diff-impl/src/com/intellij/diff/actions/impl/OpenInEditorAction.java

@@ -13,8 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.actions.impl;
+package com.intellij.diff.actions.impl;
 
+import com.intellij.diff.DiffContext;
+import com.intellij.diff.requests.DiffRequest;
+import com.intellij.diff.tools.util.DiffDataKeys;
+import com.intellij.diff.util.DiffUserDataKeys;
+import com.intellij.diff.util.DiffUtil;
 import com.intellij.ide.actions.EditSourceAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DataContext;
@@ -24,11 +29,6 @@ import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.diff.api.DiffContext;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
-import com.intellij.openapi.util.diff.tools.util.DiffDataKeys;
-import com.intellij.openapi.util.diff.util.DiffUserDataKeys;
-import com.intellij.openapi.util.diff.util.DiffUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

platform/diff-impl/src/com/intellij/diff/actions/impl/OpenInEditorWithMouseAction.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.actions.impl;
+package com.intellij.diff.actions.impl;
 
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.editor.Editor;

platform/diff-impl/src/com/intellij/diff/actions/impl/PrevChangeAction.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.actions.impl;
+package com.intellij.diff.actions.impl;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.ActionManager;

platform/diff-impl/src/com/intellij/diff/actions/impl/PrevDifferenceAction.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.actions.impl;
+package com.intellij.diff.actions.impl;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.ActionManager;

platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.actions.impl;
+package com.intellij.diff.actions.impl;
 
+import com.intellij.diff.tools.util.base.TextDiffSettingsHolder;
 import com.intellij.icons.AllIcons;
 import com.intellij.idea.ActionsBundle;
 import com.intellij.openapi.actionSystem.ActionGroup;
@@ -23,7 +24,6 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.ToggleAction;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.DumbAware;
-import com.intellij.openapi.util.diff.tools.util.base.TextDiffSettingsHolder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

platform/diff-impl/src/com/intellij/diff/actions/impl/ShowOldDiffAction.java

@@ -13,8 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.actions.impl;
+package com.intellij.diff.actions.impl;
 
+import com.intellij.diff.contents.*;
+import com.intellij.diff.requests.ContentDiffRequest;
+import com.intellij.diff.requests.DiffRequest;
+import com.intellij.diff.tools.util.DiffDataKeys;
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.application.ApplicationManager;
@@ -24,10 +28,6 @@ import com.intellij.openapi.diff.SimpleDiffRequest;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.diff.contents.*;
-import com.intellij.openapi.util.diff.requests.ContentDiffRequest;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
-import com.intellij.openapi.util.diff.tools.util.DiffDataKeys;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;

platform/diff-impl/src/com/intellij/diff/applications/ApplicationStarterBase.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.applications;
+package com.intellij.diff.applications;
 
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ApplicationStarterEx;

platform/diff-impl/src/com/intellij/diff/applications/DiffApplication.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.applications;
+package com.intellij.diff.applications;
 
+import com.intellij.diff.DiffDialogHints;
+import com.intellij.diff.DiffManagerEx;
+import com.intellij.diff.DiffRequestFactory;
+import com.intellij.diff.requests.DiffRequest;
 import com.intellij.openapi.application.ApplicationNamesInfo;
 import com.intellij.openapi.diff.DiffBundle;
-import com.intellij.openapi.util.diff.DiffDialogHints;
-import com.intellij.openapi.util.diff.DiffManagerEx;
-import com.intellij.openapi.util.diff.DiffRequestFactory;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestChainProcessor.java

@@ -13,8 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.impl;
+package com.intellij.diff.impl;
 
+import com.intellij.diff.actions.impl.GoToChangePopupBuilder;
+import com.intellij.diff.chains.DiffRequestChain;
+import com.intellij.diff.chains.DiffRequestPresentable;
+import com.intellij.diff.chains.DiffRequestPresentableException;
+import com.intellij.diff.requests.*;
+import com.intellij.diff.tools.util.SoftHardCacheMap;
+import com.intellij.diff.util.DiffUserDataKeys;
+import com.intellij.diff.util.DiffUserDataKeys.ScrollToPolicy;
+import com.intellij.diff.util.WaitingBackgroundableTaskExecutor;
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
@@ -24,19 +33,10 @@ import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.util.ProgressWindow;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.diff.actions.impl.GoToChangePopupBuilder;
-import com.intellij.openapi.util.diff.chains.DiffRequestChain;
-import com.intellij.openapi.util.diff.chains.DiffRequestPresentable;
-import com.intellij.openapi.util.diff.chains.DiffRequestPresentableException;
-import com.intellij.openapi.util.diff.requests.*;
-import com.intellij.openapi.util.diff.tools.util.SoftHardCacheMap;
-import org.intellij.lang.annotations.CalledInBackground;
-import com.intellij.openapi.util.diff.util.DiffUserDataKeys;
-import com.intellij.openapi.util.diff.util.DiffUserDataKeys.ScrollToPolicy;
-import com.intellij.openapi.util.diff.util.WaitingBackgroundableTaskExecutor;
 import com.intellij.util.Consumer;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.Convertor;
+import org.intellij.lang.annotations.CalledInBackground;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

platform/diff-impl/src/com/intellij/diff/impl/DiffRequestPanelImpl.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.impl;
+package com.intellij.diff.impl;
 
+import com.intellij.diff.DiffRequestPanel;
+import com.intellij.diff.requests.DiffRequest;
+import com.intellij.diff.requests.NoDiffRequest;
+import com.intellij.diff.util.DiffUserDataKeys;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Key;
-import com.intellij.openapi.util.diff.DiffRequestPanel;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
-import com.intellij.openapi.util.diff.requests.NoDiffRequest;
-import com.intellij.openapi.util.diff.util.DiffUserDataKeys;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java

@@ -13,8 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.impl;
+package com.intellij.diff.impl;
 
+import com.intellij.diff.DiffContext;
+import com.intellij.diff.DiffManagerEx;
+import com.intellij.diff.DiffTool;
+import com.intellij.diff.FrameDiffTool;
+import com.intellij.diff.FrameDiffTool.DiffViewer;
+import com.intellij.diff.actions.impl.*;
+import com.intellij.diff.requests.DiffRequest;
+import com.intellij.diff.requests.ErrorDiffRequest;
+import com.intellij.diff.requests.MessageDiffRequest;
+import com.intellij.diff.requests.NoDiffRequest;
+import com.intellij.diff.tools.ErrorDiffTool;
+import com.intellij.diff.tools.external.ExternalDiffTool;
+import com.intellij.diff.tools.util.DiffDataKeys;
+import com.intellij.diff.tools.util.PrevNextDifferenceIterable;
+import com.intellij.diff.util.DiffUserDataKeys;
+import com.intellij.diff.util.DiffUserDataKeys.ScrollToPolicy;
+import com.intellij.diff.util.DiffUserDataKeysEx;
+import com.intellij.diff.util.DiffUtil;
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
@@ -30,28 +48,10 @@ import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.UserDataHolder;
 import com.intellij.openapi.util.UserDataHolderBase;
-import com.intellij.openapi.util.diff.DiffManagerEx;
-import com.intellij.openapi.util.diff.actions.impl.*;
-import com.intellij.openapi.util.diff.api.DiffTool;
-import com.intellij.openapi.util.diff.api.FrameDiffTool;
-import com.intellij.openapi.util.diff.api.DiffContext;
-import com.intellij.openapi.util.diff.api.FrameDiffTool.DiffViewer;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
-import com.intellij.openapi.util.diff.requests.ErrorDiffRequest;
-import com.intellij.openapi.util.diff.requests.MessageDiffRequest;
-import com.intellij.openapi.util.diff.requests.NoDiffRequest;
-import com.intellij.openapi.util.diff.tools.ErrorDiffTool;
-import com.intellij.openapi.util.diff.tools.external.ExternalDiffTool;
-import com.intellij.openapi.util.diff.tools.util.DiffDataKeys;
-import com.intellij.openapi.util.diff.tools.util.PrevNextDifferenceIterable;
-import org.intellij.lang.annotations.CalledInAwt;
-import com.intellij.openapi.util.diff.util.DiffUserDataKeys;
-import com.intellij.openapi.util.diff.util.DiffUserDataKeys.ScrollToPolicy;
-import com.intellij.openapi.util.diff.util.DiffUserDataKeysEx;
-import com.intellij.openapi.util.diff.util.DiffUtil;
 import com.intellij.openapi.wm.ex.IdeFocusTraversalPolicy;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.UIUtil;
+import org.intellij.lang.annotations.CalledInAwt;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

platform/diff-impl/src/com/intellij/diff/impl/DiffViewerWrapper.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.impl;
+package com.intellij.diff.impl;
 
+import com.intellij.diff.DiffContext;
+import com.intellij.diff.FrameDiffTool.DiffViewer;
+import com.intellij.diff.requests.DiffRequest;
 import com.intellij.openapi.util.Key;
-import com.intellij.openapi.util.diff.api.DiffContext;
-import com.intellij.openapi.util.diff.api.FrameDiffTool.DiffViewer;
-import com.intellij.openapi.util.diff.requests.DiffRequest;
 import org.jetbrains.annotations.NotNull;
 
 public interface DiffViewerWrapper {

platform/diff-impl/src/com/intellij/diff/impl/DiffWindow.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.impl;
+package com.intellij.diff.impl;
 
+import com.intellij.diff.DiffDialogHints;
+import com.intellij.diff.chains.DiffRequestChain;
+import com.intellij.diff.util.DiffUtil;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.diff.DiffDialogHints;
-import com.intellij.openapi.util.diff.chains.DiffRequestChain;
-import com.intellij.openapi.util.diff.util.DiffUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

platform/diff-impl/src/com/intellij/diff/impl/DiffWindowBase.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.impl;
+package com.intellij.diff.impl;
 
+import com.intellij.diff.DiffDialogHints;
+import com.intellij.diff.util.DiffUserDataKeys;
+import com.intellij.diff.util.DiffUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.WindowWrapper;
 import com.intellij.openapi.ui.WindowWrapperBuilder;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.diff.DiffDialogHints;
-import com.intellij.openapi.util.diff.util.DiffUserDataKeys;
-import com.intellij.openapi.util.diff.util.DiffUtil;
 import com.intellij.util.ImageLoader;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

platform/diff-impl/src/com/intellij/diff/impl/ModifiablePanel.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.impl;
+package com.intellij.diff.impl;
 
 import org.jetbrains.annotations.Nullable;
 

platform/diff-impl/src/com/intellij/diff/requests/ErrorDiffRequest.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.requests;
+package com.intellij.diff.requests;
 
-import com.intellij.openapi.util.diff.chains.DiffRequestPresentable;
+import com.intellij.diff.chains.DiffRequestPresentable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsConfigurable.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.util.diff.settings;
+package com.intellij.diff.settings;
 
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;

platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsPaneExternall.form

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.openapi.util.diff.settings.ExternalDiffSettingsPanel">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.diff.settings.ExternalDiffSettingsPanel">
   <grid id="27dc6" binding="myPane" layout-manager="GridLayoutManager" row-count="8" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>

platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsPanel.form

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.openapi.util.diff.settings.DiffSettingsPanel">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.diff.settings.DiffSettingsPanel">
   <grid id="27dc6" binding="myPane" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
@@ -29,7 +29,7 @@
           <text value="Context lines:"/>
         </properties>
       </component>
-      <component id="c5dc3" class="com.intellij.openapi.util.diff.settings.DiffSettingsPanel$ContextRangePanel" binding="myContextRangeComponent" custom-create="true">
+      <component id="c5dc3" class="com.intellij.diff.settings.DiffSettingsPanel$ContextRangePanel" binding="myContextRangeComponent" custom-create="true">
         <constraints>
           <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>