diff --git a/source/com/intellij/execution/filters/YourkitFilter.java b/java/execution/impl/src/com/intellij/execution/filters/YourkitFilter.java
similarity index 100%
rename from source/com/intellij/execution/filters/YourkitFilter.java
rename to java/execution/impl/src/com/intellij/execution/filters/YourkitFilter.java
diff --git a/source/com/intellij/find/findUsages/FindClassUsagesDialog.java b/java/java-impl/src/com/intellij/find/findUsages/FindClassUsagesDialog.java
similarity index 100%
rename from source/com/intellij/find/findUsages/FindClassUsagesDialog.java
rename to java/java-impl/src/com/intellij/find/findUsages/FindClassUsagesDialog.java
diff --git a/source/com/intellij/find/findUsages/FindMethodUsagesDialog.java b/java/java-impl/src/com/intellij/find/findUsages/FindMethodUsagesDialog.java
similarity index 100%
rename from source/com/intellij/find/findUsages/FindMethodUsagesDialog.java
rename to java/java-impl/src/com/intellij/find/findUsages/FindMethodUsagesDialog.java
diff --git a/source/com/intellij/find/findUsages/FindPackageUsagesDialog.java b/java/java-impl/src/com/intellij/find/findUsages/FindPackageUsagesDialog.java
similarity index 100%
rename from source/com/intellij/find/findUsages/FindPackageUsagesDialog.java
rename to java/java-impl/src/com/intellij/find/findUsages/FindPackageUsagesDialog.java
diff --git a/source/com/intellij/find/findUsages/FindThrowUsagesDialog.java b/java/java-impl/src/com/intellij/find/findUsages/FindThrowUsagesDialog.java
similarity index 100%
rename from source/com/intellij/find/findUsages/FindThrowUsagesDialog.java
rename to java/java-impl/src/com/intellij/find/findUsages/FindThrowUsagesDialog.java
diff --git a/source/com/intellij/find/findUsages/FindVariableUsagesDialog.java b/java/java-impl/src/com/intellij/find/findUsages/FindVariableUsagesDialog.java
similarity index 100%
rename from source/com/intellij/find/findUsages/FindVariableUsagesDialog.java
rename to java/java-impl/src/com/intellij/find/findUsages/FindVariableUsagesDialog.java
diff --git a/source/com/intellij/find/findUsages/JavaFindUsagesDialog.java b/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesDialog.java
similarity index 100%
rename from source/com/intellij/find/findUsages/JavaFindUsagesDialog.java
rename to java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesDialog.java
diff --git a/source/com/intellij/find/findUsages/JavaFindUsagesHandler.java b/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java
similarity index 100%
rename from source/com/intellij/find/findUsages/JavaFindUsagesHandler.java
rename to java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java
diff --git a/source/com/intellij/find/findUsages/JavaFindUsagesHandlerFactory.java b/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandlerFactory.java
similarity index 100%
rename from source/com/intellij/find/findUsages/JavaFindUsagesHandlerFactory.java
rename to java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandlerFactory.java
diff --git a/source/com/intellij/find/findUsages/ThrowsUsageTargetProvider.java b/java/java-impl/src/com/intellij/find/findUsages/ThrowsUsageTargetProvider.java
similarity index 100%
rename from source/com/intellij/find/findUsages/ThrowsUsageTargetProvider.java
rename to java/java-impl/src/com/intellij/find/findUsages/ThrowsUsageTargetProvider.java
diff --git a/source/com/intellij/slicer/AnalyzeLeavesAction.java b/java/java-impl/src/com/intellij/slicer/AnalyzeLeavesAction.java
similarity index 100%
rename from source/com/intellij/slicer/AnalyzeLeavesAction.java
rename to java/java-impl/src/com/intellij/slicer/AnalyzeLeavesAction.java
diff --git a/source/com/intellij/slicer/DuplicateMap.java b/java/java-impl/src/com/intellij/slicer/DuplicateMap.java
similarity index 100%
rename from source/com/intellij/slicer/DuplicateMap.java
rename to java/java-impl/src/com/intellij/slicer/DuplicateMap.java
diff --git a/source/com/intellij/slicer/MyColoredTreeCellRenderer.java b/java/java-impl/src/com/intellij/slicer/MyColoredTreeCellRenderer.java
similarity index 100%
rename from source/com/intellij/slicer/MyColoredTreeCellRenderer.java
rename to java/java-impl/src/com/intellij/slicer/MyColoredTreeCellRenderer.java
diff --git a/source/com/intellij/slicer/SliceBackwardAction.java b/java/java-impl/src/com/intellij/slicer/SliceBackwardAction.java
similarity index 100%
rename from source/com/intellij/slicer/SliceBackwardAction.java
rename to java/java-impl/src/com/intellij/slicer/SliceBackwardAction.java
diff --git a/source/com/intellij/slicer/SliceForwardAction.java b/java/java-impl/src/com/intellij/slicer/SliceForwardAction.java
similarity index 100%
rename from source/com/intellij/slicer/SliceForwardAction.java
rename to java/java-impl/src/com/intellij/slicer/SliceForwardAction.java
diff --git a/source/com/intellij/slicer/SliceHandler.java b/java/java-impl/src/com/intellij/slicer/SliceHandler.java
similarity index 100%
rename from source/com/intellij/slicer/SliceHandler.java
rename to java/java-impl/src/com/intellij/slicer/SliceHandler.java
diff --git a/source/com/intellij/slicer/SliceLeafAnalyzer.java b/java/java-impl/src/com/intellij/slicer/SliceLeafAnalyzer.java
similarity index 100%
rename from source/com/intellij/slicer/SliceLeafAnalyzer.java
rename to java/java-impl/src/com/intellij/slicer/SliceLeafAnalyzer.java
diff --git a/source/com/intellij/slicer/SliceLeafValueRootNode.java b/java/java-impl/src/com/intellij/slicer/SliceLeafValueRootNode.java
similarity index 100%
rename from source/com/intellij/slicer/SliceLeafValueRootNode.java
rename to java/java-impl/src/com/intellij/slicer/SliceLeafValueRootNode.java
diff --git a/source/com/intellij/slicer/SliceManager.java b/java/java-impl/src/com/intellij/slicer/SliceManager.java
similarity index 100%
rename from source/com/intellij/slicer/SliceManager.java
rename to java/java-impl/src/com/intellij/slicer/SliceManager.java
diff --git a/source/com/intellij/slicer/SliceNode.java b/java/java-impl/src/com/intellij/slicer/SliceNode.java
similarity index 100%
rename from source/com/intellij/slicer/SliceNode.java
rename to java/java-impl/src/com/intellij/slicer/SliceNode.java
diff --git a/source/com/intellij/slicer/SlicePanel.java b/java/java-impl/src/com/intellij/slicer/SlicePanel.java
similarity index 100%
rename from source/com/intellij/slicer/SlicePanel.java
rename to java/java-impl/src/com/intellij/slicer/SlicePanel.java
diff --git a/source/com/intellij/slicer/SliceRootNode.java b/java/java-impl/src/com/intellij/slicer/SliceRootNode.java
similarity index 100%
rename from source/com/intellij/slicer/SliceRootNode.java
rename to java/java-impl/src/com/intellij/slicer/SliceRootNode.java
diff --git a/source/com/intellij/slicer/SliceToolwindowSettings.java b/java/java-impl/src/com/intellij/slicer/SliceToolwindowSettings.java
similarity index 100%
rename from source/com/intellij/slicer/SliceToolwindowSettings.java
rename to java/java-impl/src/com/intellij/slicer/SliceToolwindowSettings.java
diff --git a/source/com/intellij/slicer/SliceTreeBuilder.java b/java/java-impl/src/com/intellij/slicer/SliceTreeBuilder.java
similarity index 100%
rename from source/com/intellij/slicer/SliceTreeBuilder.java
rename to java/java-impl/src/com/intellij/slicer/SliceTreeBuilder.java
diff --git a/source/com/intellij/slicer/SliceTreeStructure.java b/java/java-impl/src/com/intellij/slicer/SliceTreeStructure.java
similarity index 100%
rename from source/com/intellij/slicer/SliceTreeStructure.java
rename to java/java-impl/src/com/intellij/slicer/SliceTreeStructure.java
diff --git a/source/com/intellij/slicer/SliceUsage.java b/java/java-impl/src/com/intellij/slicer/SliceUsage.java
similarity index 100%
rename from source/com/intellij/slicer/SliceUsage.java
rename to java/java-impl/src/com/intellij/slicer/SliceUsage.java
diff --git a/source/com/intellij/slicer/SliceUsageCellRenderer.java b/java/java-impl/src/com/intellij/slicer/SliceUsageCellRenderer.java
similarity index 100%
rename from source/com/intellij/slicer/SliceUsageCellRenderer.java
rename to java/java-impl/src/com/intellij/slicer/SliceUsageCellRenderer.java
diff --git a/source/com/intellij/slicer/SliceUtil.java b/java/java-impl/src/com/intellij/slicer/SliceUtil.java
similarity index 100%
rename from source/com/intellij/slicer/SliceUtil.java
rename to java/java-impl/src/com/intellij/slicer/SliceUtil.java
diff --git a/source/com/intellij/slicer/forward/SliceFUtil.java b/java/java-impl/src/com/intellij/slicer/forward/SliceFUtil.java
similarity index 100%
rename from source/com/intellij/slicer/forward/SliceFUtil.java
rename to java/java-impl/src/com/intellij/slicer/forward/SliceFUtil.java
diff --git a/source/com/intellij/testIntegration/GenerateTestMethodAction.java b/java/java-impl/src/com/intellij/testIntegration/GenerateTestMethodAction.java
similarity index 100%
rename from source/com/intellij/testIntegration/GenerateTestMethodAction.java
rename to java/java-impl/src/com/intellij/testIntegration/GenerateTestMethodAction.java
diff --git a/source/com/intellij/testIntegration/JavaTestCreator.java b/java/java-impl/src/com/intellij/testIntegration/JavaTestCreator.java
similarity index 100%
rename from source/com/intellij/testIntegration/JavaTestCreator.java
rename to java/java-impl/src/com/intellij/testIntegration/JavaTestCreator.java
diff --git a/source/com/intellij/testIntegration/JavaTestFinder.java b/java/java-impl/src/com/intellij/testIntegration/JavaTestFinder.java
similarity index 100%
rename from source/com/intellij/testIntegration/JavaTestFinder.java
rename to java/java-impl/src/com/intellij/testIntegration/JavaTestFinder.java
diff --git a/source/com/intellij/testIntegration/JavaTestFrameworkDescriptor.java b/java/java-impl/src/com/intellij/testIntegration/JavaTestFrameworkDescriptor.java
similarity index 100%
rename from source/com/intellij/testIntegration/JavaTestFrameworkDescriptor.java
rename to java/java-impl/src/com/intellij/testIntegration/JavaTestFrameworkDescriptor.java
diff --git a/source/com/intellij/testIntegration/TestIntegrationUtils.java b/java/java-impl/src/com/intellij/testIntegration/TestIntegrationUtils.java
similarity index 100%
rename from source/com/intellij/testIntegration/TestIntegrationUtils.java
rename to java/java-impl/src/com/intellij/testIntegration/TestIntegrationUtils.java
diff --git a/source/com/intellij/testIntegration/createTest/CreateTestAction.java b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestAction.java
similarity index 100%
rename from source/com/intellij/testIntegration/createTest/CreateTestAction.java
rename to java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestAction.java
diff --git a/source/com/intellij/testIntegration/createTest/CreateTestDialog.java b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java
similarity index 100%
rename from source/com/intellij/testIntegration/createTest/CreateTestDialog.java
rename to java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java
diff --git a/source/com/intellij/ui/JavaReferenceEditorUtil.java b/java/java-impl/src/com/intellij/ui/JavaReferenceEditorUtil.java
similarity index 100%
rename from source/com/intellij/ui/JavaReferenceEditorUtil.java
rename to java/java-impl/src/com/intellij/ui/JavaReferenceEditorUtil.java
diff --git a/source/com/intellij/ui/ReferenceEditorComboWithBrowseButton.java b/java/java-impl/src/com/intellij/ui/ReferenceEditorComboWithBrowseButton.java
similarity index 100%
rename from source/com/intellij/ui/ReferenceEditorComboWithBrowseButton.java
rename to java/java-impl/src/com/intellij/ui/ReferenceEditorComboWithBrowseButton.java
diff --git a/source/com/intellij/usageView/JavaUsageViewDescriptionProvider.java b/java/java-impl/src/com/intellij/usageView/JavaUsageViewDescriptionProvider.java
similarity index 100%
rename from source/com/intellij/usageView/JavaUsageViewDescriptionProvider.java
rename to java/java-impl/src/com/intellij/usageView/JavaUsageViewDescriptionProvider.java
diff --git a/source/com/intellij/usages/impl/rules/ClassGroupingRule.java b/java/java-impl/src/com/intellij/usages/impl/rules/ClassGroupingRule.java
similarity index 100%
rename from source/com/intellij/usages/impl/rules/ClassGroupingRule.java
rename to java/java-impl/src/com/intellij/usages/impl/rules/ClassGroupingRule.java
diff --git a/source/com/intellij/usages/impl/rules/ImportFilteringRule.java b/java/java-impl/src/com/intellij/usages/impl/rules/ImportFilteringRule.java
similarity index 100%
rename from source/com/intellij/usages/impl/rules/ImportFilteringRule.java
rename to java/java-impl/src/com/intellij/usages/impl/rules/ImportFilteringRule.java
diff --git a/source/com/intellij/usages/impl/rules/JavaClassGroupRuleProvider.java b/java/java-impl/src/com/intellij/usages/impl/rules/JavaClassGroupRuleProvider.java
similarity index 100%
rename from source/com/intellij/usages/impl/rules/JavaClassGroupRuleProvider.java
rename to java/java-impl/src/com/intellij/usages/impl/rules/JavaClassGroupRuleProvider.java
diff --git a/source/com/intellij/usages/impl/rules/JavaMethodGroupRuleProvider.java b/java/java-impl/src/com/intellij/usages/impl/rules/JavaMethodGroupRuleProvider.java
similarity index 100%
rename from source/com/intellij/usages/impl/rules/JavaMethodGroupRuleProvider.java
rename to java/java-impl/src/com/intellij/usages/impl/rules/JavaMethodGroupRuleProvider.java
diff --git a/source/com/intellij/usages/impl/rules/JavaUsageFilteringRuleProvider.java b/java/java-impl/src/com/intellij/usages/impl/rules/JavaUsageFilteringRuleProvider.java
similarity index 100%
rename from source/com/intellij/usages/impl/rules/JavaUsageFilteringRuleProvider.java
rename to java/java-impl/src/com/intellij/usages/impl/rules/JavaUsageFilteringRuleProvider.java
diff --git a/source/com/intellij/usages/impl/rules/JavaUsageTypeProvider.java b/java/java-impl/src/com/intellij/usages/impl/rules/JavaUsageTypeProvider.java
similarity index 100%
rename from source/com/intellij/usages/impl/rules/JavaUsageTypeProvider.java
rename to java/java-impl/src/com/intellij/usages/impl/rules/JavaUsageTypeProvider.java
diff --git a/source/com/intellij/usages/impl/rules/JavaUsageViewSettings.java b/java/java-impl/src/com/intellij/usages/impl/rules/JavaUsageViewSettings.java
similarity index 100%
rename from source/com/intellij/usages/impl/rules/JavaUsageViewSettings.java
rename to java/java-impl/src/com/intellij/usages/impl/rules/JavaUsageViewSettings.java
diff --git a/source/com/intellij/usages/impl/rules/MethodGroupingRule.java b/java/java-impl/src/com/intellij/usages/impl/rules/MethodGroupingRule.java
similarity index 100%
rename from source/com/intellij/usages/impl/rules/MethodGroupingRule.java
rename to java/java-impl/src/com/intellij/usages/impl/rules/MethodGroupingRule.java
diff --git a/source/com/intellij/usages/impl/rules/NonJavaFileGroupRuleProvider.java b/java/java-impl/src/com/intellij/usages/impl/rules/NonJavaFileGroupRuleProvider.java
similarity index 100%
rename from source/com/intellij/usages/impl/rules/NonJavaFileGroupRuleProvider.java
rename to java/java-impl/src/com/intellij/usages/impl/rules/NonJavaFileGroupRuleProvider.java
diff --git a/source/com/intellij/usages/impl/rules/NonJavaFileGroupingRule.java b/java/java-impl/src/com/intellij/usages/impl/rules/NonJavaFileGroupingRule.java
similarity index 100%
rename from source/com/intellij/usages/impl/rules/NonJavaFileGroupingRule.java
rename to java/java-impl/src/com/intellij/usages/impl/rules/NonJavaFileGroupingRule.java
diff --git a/source/com/intellij/usages/impl/rules/PackageGroupingRule.java b/java/java-impl/src/com/intellij/usages/impl/rules/PackageGroupingRule.java
similarity index 100%
rename from source/com/intellij/usages/impl/rules/PackageGroupingRule.java
rename to java/java-impl/src/com/intellij/usages/impl/rules/PackageGroupingRule.java