diff --git a/platform/platform-api/src/com/intellij/openapi/diff/ActionButtonPresentation.java b/platform/diff-api/src/com/intellij/openapi/diff/ActionButtonPresentation.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/diff/ActionButtonPresentation.java
rename to platform/diff-api/src/com/intellij/openapi/diff/ActionButtonPresentation.java
diff --git a/platform/platform-api/src/com/intellij/openapi/diff/DiffBundle.java b/platform/diff-api/src/com/intellij/openapi/diff/DiffBundle.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/diff/DiffBundle.java
rename to platform/diff-api/src/com/intellij/openapi/diff/DiffBundle.java
diff --git a/platform/platform-api/src/com/intellij/openapi/diff/DiffColors.java b/platform/diff-api/src/com/intellij/openapi/diff/DiffColors.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/diff/DiffColors.java
rename to platform/diff-api/src/com/intellij/openapi/diff/DiffColors.java
diff --git a/platform/platform-api/src/com/intellij/openapi/diff/DiffContent.java b/platform/diff-api/src/com/intellij/openapi/diff/DiffContent.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/diff/DiffContent.java
rename to platform/diff-api/src/com/intellij/openapi/diff/DiffContent.java
diff --git a/platform/platform-api/src/com/intellij/openapi/diff/DiffContentUtil.java b/platform/diff-api/src/com/intellij/openapi/diff/DiffContentUtil.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/diff/DiffContentUtil.java
rename to platform/diff-api/src/com/intellij/openapi/diff/DiffContentUtil.java
diff --git a/platform/platform-api/src/com/intellij/openapi/diff/DiffManager.java b/platform/diff-api/src/com/intellij/openapi/diff/DiffManager.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/diff/DiffManager.java
rename to platform/diff-api/src/com/intellij/openapi/diff/DiffManager.java
diff --git a/platform/platform-api/src/com/intellij/openapi/diff/DiffNavigationContext.java b/platform/diff-api/src/com/intellij/openapi/diff/DiffNavigationContext.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/diff/DiffNavigationContext.java
rename to platform/diff-api/src/com/intellij/openapi/diff/DiffNavigationContext.java
diff --git a/platform/platform-api/src/com/intellij/openapi/diff/DiffRequest.java b/platform/diff-api/src/com/intellij/openapi/diff/DiffRequest.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/diff/DiffRequest.java
rename to platform/diff-api/src/com/intellij/openapi/diff/DiffRequest.java
diff --git a/platform/platform-api/src/com/intellij/openapi/diff/DiffRequestFactory.java b/platform/diff-api/src/com/intellij/openapi/diff/DiffRequestFactory.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/diff/DiffRequestFactory.java
rename to platform/diff-api/src/com/intellij/openapi/diff/DiffRequestFactory.java
diff --git a/platform/platform-api/src/com/intellij/openapi/diff/DiffTool.java b/platform/diff-api/src/com/intellij/openapi/diff/DiffTool.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/diff/DiffTool.java
rename to platform/diff-api/src/com/intellij/openapi/diff/DiffTool.java
diff --git a/platform/platform-api/src/com/intellij/openapi/diff/DiffViewer.java b/platform/diff-api/src/com/intellij/openapi/diff/DiffViewer.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/diff/DiffViewer.java
rename to platform/diff-api/src/com/intellij/openapi/diff/DiffViewer.java
diff --git a/platform/platform-api/src/com/intellij/openapi/diff/DocumentContent.java b/platform/diff-api/src/com/intellij/openapi/diff/DocumentContent.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/diff/DocumentContent.java
rename to platform/diff-api/src/com/intellij/openapi/diff/DocumentContent.java
diff --git a/platform/platform-api/src/com/intellij/openapi/diff/FileContent.java b/platform/diff-api/src/com/intellij/openapi/diff/FileContent.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/diff/FileContent.java
rename to platform/diff-api/src/com/intellij/openapi/diff/FileContent.java
diff --git a/platform/platform-api/src/com/intellij/openapi/diff/MergeRequest.java b/platform/diff-api/src/com/intellij/openapi/diff/MergeRequest.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/diff/MergeRequest.java
rename to platform/diff-api/src/com/intellij/openapi/diff/MergeRequest.java
diff --git a/platform/platform-api/src/com/intellij/openapi/diff/SimpleContent.java b/platform/diff-api/src/com/intellij/openapi/diff/SimpleContent.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/diff/SimpleContent.java
rename to platform/diff-api/src/com/intellij/openapi/diff/SimpleContent.java
diff --git a/platform/platform-api/src/com/intellij/openapi/diff/SimpleDiffRequest.java b/platform/diff-api/src/com/intellij/openapi/diff/SimpleDiffRequest.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/diff/SimpleDiffRequest.java
rename to platform/diff-api/src/com/intellij/openapi/diff/SimpleDiffRequest.java
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/actions/MergeFilesAction.java b/platform/diff-impl/src/com/intellij/openapi/diff/actions/MergeFilesAction.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/openapi/diff/actions/MergeFilesAction.java
rename to platform/diff-impl/src/com/intellij/openapi/diff/actions/MergeFilesAction.java
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffContentFactory.java b/platform/diff-impl/src/com/intellij/openapi/diff/ex/DiffContentFactory.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffContentFactory.java
rename to platform/diff-impl/src/com/intellij/openapi/diff/ex/DiffContentFactory.java
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffUsageTriggerCollector.java b/platform/diff-impl/src/com/intellij/openapi/diff/impl/DiffUsageTriggerCollector.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffUsageTriggerCollector.java
rename to platform/diff-impl/src/com/intellij/openapi/diff/impl/DiffUsageTriggerCollector.java
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/GenericDataProvider.java b/platform/diff-impl/src/com/intellij/openapi/diff/impl/GenericDataProvider.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/openapi/diff/impl/GenericDataProvider.java
rename to platform/diff-impl/src/com/intellij/openapi/diff/impl/GenericDataProvider.java
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffManagerImpl.java b/platform/diff-impl/src/com/intellij/openapi/diff/impl/external/DiffManagerImpl.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffManagerImpl.java
rename to platform/diff-impl/src/com/intellij/openapi/diff/impl/external/DiffManagerImpl.java
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/mergeTool/DiffRequestFactoryImpl.java b/platform/diff-impl/src/com/intellij/openapi/diff/impl/mergeTool/DiffRequestFactoryImpl.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/openapi/diff/impl/mergeTool/DiffRequestFactoryImpl.java
rename to platform/diff-impl/src/com/intellij/openapi/diff/impl/mergeTool/DiffRequestFactoryImpl.java
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeRequestImpl.java b/platform/diff-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeRequestImpl.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeRequestImpl.java
rename to platform/diff-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeRequestImpl.java
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeVersion.java b/platform/diff-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeVersion.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeVersion.java
rename to platform/diff-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeVersion.java
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/GutterActionRenderer.java b/platform/diff-impl/src/com/intellij/openapi/diff/impl/util/GutterActionRenderer.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/openapi/diff/impl/util/GutterActionRenderer.java
rename to platform/diff-impl/src/com/intellij/openapi/diff/impl/util/GutterActionRenderer.java
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/LabeledEditor.java b/platform/diff-impl/src/com/intellij/openapi/diff/impl/util/LabeledEditor.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/openapi/diff/impl/util/LabeledEditor.java
rename to platform/diff-impl/src/com/intellij/openapi/diff/impl/util/LabeledEditor.java
diff --git a/platform/platform-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java b/platform/diff-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java
rename to platform/diff-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateDiffTool.java
diff --git a/platform/platform-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateToNewDiffUtil.java b/platform/diff-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateToNewDiffUtil.java
similarity index 100%
rename from platform/platform-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateToNewDiffUtil.java
rename to platform/diff-impl/src/com/intellij/openapi/vcs/changes/actions/migrate/MigrateToNewDiffUtil.java
diff --git a/plugins/textmate/intellij.textmate.iml b/plugins/textmate/intellij.textmate.iml
index 6b19274946f8..91190b1669d9 100644
--- a/plugins/textmate/intellij.textmate.iml
+++ b/plugins/textmate/intellij.textmate.iml
@@ -29,5 +29,6 @@
+
\ No newline at end of file