refactoring-impl (minus Refactor-J) merged into java-impl

diff --git a/refactoring/impl/com/intellij/lang/java/JavaClassMembersRefactoringSupport.java b/java/java-impl/src/com/intellij/lang/java/JavaClassMembersRefactoringSupport.java
similarity index 100%
rename from refactoring/impl/com/intellij/lang/java/JavaClassMembersRefactoringSupport.java
rename to java/java-impl/src/com/intellij/lang/java/JavaClassMembersRefactoringSupport.java

diff --git a/refactoring/impl/com/intellij/lang/java/JavaRefactoringSupportProvider.java b/java/java-impl/src/com/intellij/lang/java/JavaRefactoringSupportProvider.java
similarity index 100%
rename from refactoring/impl/com/intellij/lang/java/JavaRefactoringSupportProvider.java
rename to java/java-impl/src/com/intellij/lang/java/JavaRefactoringSupportProvider.java

diff --git a/refactoring/impl/com/intellij/refactoring/HelpID.java b/java/java-impl/src/com/intellij/refactoring/HelpID.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/HelpID.java
rename to java/java-impl/src/com/intellij/refactoring/HelpID.java

diff --git a/refactoring/impl/com/intellij/refactoring/IntroduceHandlerBase.java b/java/java-impl/src/com/intellij/refactoring/IntroduceHandlerBase.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/IntroduceHandlerBase.java
rename to java/java-impl/src/com/intellij/refactoring/IntroduceHandlerBase.java

diff --git a/refactoring/impl/com/intellij/refactoring/JavaRefactoringSettings.java b/java/java-impl/src/com/intellij/refactoring/JavaRefactoringSettings.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/JavaRefactoringSettings.java
rename to java/java-impl/src/com/intellij/refactoring/JavaRefactoringSettings.java

diff --git a/refactoring/impl/com/intellij/refactoring/OptimizeImportsRefactoringHelper.java b/java/java-impl/src/com/intellij/refactoring/OptimizeImportsRefactoringHelper.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/OptimizeImportsRefactoringHelper.java
rename to java/java-impl/src/com/intellij/refactoring/OptimizeImportsRefactoringHelper.java

diff --git a/refactoring/impl/com/intellij/refactoring/RefactorJBundle.java b/java/java-impl/src/com/intellij/refactoring/RefactorJBundle.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/RefactorJBundle.java
rename to java/java-impl/src/com/intellij/refactoring/RefactorJBundle.java

diff --git a/refactoring/impl/com/intellij/refactoring/RefactorJBundle.properties b/java/java-impl/src/com/intellij/refactoring/RefactorJBundle.properties
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/RefactorJBundle.properties
rename to java/java-impl/src/com/intellij/refactoring/RefactorJBundle.properties

diff --git a/refactoring/impl/com/intellij/refactoring/RefactoringManager.java b/java/java-impl/src/com/intellij/refactoring/RefactoringManager.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/RefactoringManager.java
rename to java/java-impl/src/com/intellij/refactoring/RefactoringManager.java

diff --git a/refactoring/impl/com/intellij/refactoring/actions/AnonymousToInnerAction.java b/java/java-impl/src/com/intellij/refactoring/actions/AnonymousToInnerAction.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/actions/AnonymousToInnerAction.java
rename to java/java-impl/src/com/intellij/refactoring/actions/AnonymousToInnerAction.java

diff --git a/refactoring/impl/com/intellij/refactoring/actions/ChangeSignatureAction.java b/java/java-impl/src/com/intellij/refactoring/actions/ChangeSignatureAction.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/actions/ChangeSignatureAction.java
rename to java/java-impl/src/com/intellij/refactoring/actions/ChangeSignatureAction.java

diff --git a/refactoring/impl/com/intellij/refactoring/actions/ConvertToInstanceMethodAction.java b/java/java-impl/src/com/intellij/refactoring/actions/ConvertToInstanceMethodAction.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/actions/ConvertToInstanceMethodAction.java
rename to java/java-impl/src/com/intellij/refactoring/actions/ConvertToInstanceMethodAction.java

diff --git a/refactoring/impl/com/intellij/refactoring/actions/EncapsulateFieldsAction.java b/java/java-impl/src/com/intellij/refactoring/actions/EncapsulateFieldsAction.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/actions/EncapsulateFieldsAction.java
rename to java/java-impl/src/com/intellij/refactoring/actions/EncapsulateFieldsAction.java

diff --git a/refactoring/impl/com/intellij/refactoring/actions/ExtractClassAction.java b/java/java-impl/src/com/intellij/refactoring/actions/ExtractClassAction.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/actions/ExtractClassAction.java
rename to java/java-impl/src/com/intellij/refactoring/actions/ExtractClassAction.java

diff --git a/refactoring/impl/com/intellij/refactoring/actions/InheritanceToDelegationAction.java b/java/java-impl/src/com/intellij/refactoring/actions/InheritanceToDelegationAction.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/actions/InheritanceToDelegationAction.java
rename to java/java-impl/src/com/intellij/refactoring/actions/InheritanceToDelegationAction.java

diff --git a/refactoring/impl/com/intellij/refactoring/actions/IntroduceParameterObjectAction.java b/java/java-impl/src/com/intellij/refactoring/actions/IntroduceParameterObjectAction.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/actions/IntroduceParameterObjectAction.java
rename to java/java-impl/src/com/intellij/refactoring/actions/IntroduceParameterObjectAction.java

diff --git a/refactoring/impl/com/intellij/refactoring/actions/InvertBooleanAction.java b/java/java-impl/src/com/intellij/refactoring/actions/InvertBooleanAction.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/actions/InvertBooleanAction.java
rename to java/java-impl/src/com/intellij/refactoring/actions/InvertBooleanAction.java

diff --git a/refactoring/impl/com/intellij/refactoring/actions/MakeStaticAction.java b/java/java-impl/src/com/intellij/refactoring/actions/MakeStaticAction.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/actions/MakeStaticAction.java
rename to java/java-impl/src/com/intellij/refactoring/actions/MakeStaticAction.java

diff --git a/refactoring/impl/com/intellij/refactoring/actions/MethodDuplicatesAction.java b/java/java-impl/src/com/intellij/refactoring/actions/MethodDuplicatesAction.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/actions/MethodDuplicatesAction.java
rename to java/java-impl/src/com/intellij/refactoring/actions/MethodDuplicatesAction.java

diff --git a/refactoring/impl/com/intellij/refactoring/actions/MigrateAction.java b/java/java-impl/src/com/intellij/refactoring/actions/MigrateAction.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/actions/MigrateAction.java
rename to java/java-impl/src/com/intellij/refactoring/actions/MigrateAction.java

diff --git a/refactoring/impl/com/intellij/refactoring/actions/RemoveMiddlemanAction.java b/java/java-impl/src/com/intellij/refactoring/actions/RemoveMiddlemanAction.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/actions/RemoveMiddlemanAction.java
rename to java/java-impl/src/com/intellij/refactoring/actions/RemoveMiddlemanAction.java

diff --git a/refactoring/impl/com/intellij/refactoring/actions/ReplaceConstructorWithBuilderAction.java b/java/java-impl/src/com/intellij/refactoring/actions/ReplaceConstructorWithBuilderAction.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/actions/ReplaceConstructorWithBuilderAction.java
rename to java/java-impl/src/com/intellij/refactoring/actions/ReplaceConstructorWithBuilderAction.java

diff --git a/refactoring/impl/com/intellij/refactoring/actions/ReplaceConstructorWithFactoryAction.java b/java/java-impl/src/com/intellij/refactoring/actions/ReplaceConstructorWithFactoryAction.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/actions/ReplaceConstructorWithFactoryAction.java
rename to java/java-impl/src/com/intellij/refactoring/actions/ReplaceConstructorWithFactoryAction.java

diff --git a/refactoring/impl/com/intellij/refactoring/actions/ReplaceMethodWithMethodObjectAction.java b/java/java-impl/src/com/intellij/refactoring/actions/ReplaceMethodWithMethodObjectAction.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/actions/ReplaceMethodWithMethodObjectAction.java
rename to java/java-impl/src/com/intellij/refactoring/actions/ReplaceMethodWithMethodObjectAction.java

diff --git a/refactoring/impl/com/intellij/refactoring/actions/TempWithQueryAction.java b/java/java-impl/src/com/intellij/refactoring/actions/TempWithQueryAction.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/actions/TempWithQueryAction.java
rename to java/java-impl/src/com/intellij/refactoring/actions/TempWithQueryAction.java

diff --git a/refactoring/impl/com/intellij/refactoring/actions/TurnRefsToSuperAction.java b/java/java-impl/src/com/intellij/refactoring/actions/TurnRefsToSuperAction.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/actions/TurnRefsToSuperAction.java
rename to java/java-impl/src/com/intellij/refactoring/actions/TurnRefsToSuperAction.java

diff --git a/refactoring/impl/com/intellij/refactoring/actions/TypeCookAction.java b/java/java-impl/src/com/intellij/refactoring/actions/TypeCookAction.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/actions/TypeCookAction.java
rename to java/java-impl/src/com/intellij/refactoring/actions/TypeCookAction.java

diff --git a/refactoring/impl/com/intellij/refactoring/anonymousToInner/AnonymousToInnerDialog.java b/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/anonymousToInner/AnonymousToInnerDialog.java
rename to java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java b/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java
rename to java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/anonymousToInner/MoveAnonymousToInnerHandler.java b/java/java-impl/src/com/intellij/refactoring/anonymousToInner/MoveAnonymousToInnerHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/anonymousToInner/MoveAnonymousToInnerHandler.java
rename to java/java-impl/src/com/intellij/refactoring/anonymousToInner/MoveAnonymousToInnerHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/anonymousToInner/VariableInfo.java b/java/java-impl/src/com/intellij/refactoring/anonymousToInner/VariableInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/anonymousToInner/VariableInfo.java
rename to java/java-impl/src/com/intellij/refactoring/anonymousToInner/VariableInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java b/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java
rename to java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureProcessor.java b/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeClassSignature/ChangeClassSigntaureViewDescriptor.java b/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSigntaureViewDescriptor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeClassSignature/ChangeClassSigntaureViewDescriptor.java
rename to java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSigntaureViewDescriptor.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeClassSignature/TypeParameterInfo.java b/java/java-impl/src/com/intellij/refactoring/changeClassSignature/TypeParameterInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeClassSignature/TypeParameterInfo.java
rename to java/java-impl/src/com/intellij/refactoring/changeClassSignature/TypeParameterInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeSignature/CallReferenceUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/CallReferenceUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeSignature/CallReferenceUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/changeSignature/CallReferenceUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeSignature/CallerUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/CallerUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeSignature/CallerUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/changeSignature/CallerUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeSignature/ChangeInfoImpl.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeInfoImpl.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeSignature/ChangeInfoImpl.java
rename to java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeInfoImpl.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java
rename to java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeSignature/ChangeSignatureHandler.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeSignature/ChangeSignatureHandler.java
rename to java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeSignature/ChangeSignatureUtil.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureUtil.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeSignature/ChangeSignatureUtil.java
rename to java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureUtil.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeSignature/ChangeSignatureViewDescriptor.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureViewDescriptor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeSignature/ChangeSignatureViewDescriptor.java
rename to java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureViewDescriptor.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeSignature/ExceptionsTableModel.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/ExceptionsTableModel.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeSignature/ExceptionsTableModel.java
rename to java/java-impl/src/com/intellij/refactoring/changeSignature/ExceptionsTableModel.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeSignature/MethodCallUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/MethodCallUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeSignature/MethodCallUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/changeSignature/MethodCallUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeSignature/NewParameterCollidesWithLocalUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/NewParameterCollidesWithLocalUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeSignature/NewParameterCollidesWithLocalUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/changeSignature/NewParameterCollidesWithLocalUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeSignature/OverriderUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/OverriderUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeSignature/OverriderUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/changeSignature/OverriderUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeSignature/ParameterInfoImpl.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/ParameterInfoImpl.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeSignature/ParameterInfoImpl.java
rename to java/java-impl/src/com/intellij/refactoring/changeSignature/ParameterInfoImpl.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeSignature/ParameterTableModel.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/ParameterTableModel.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeSignature/ParameterTableModel.java
rename to java/java-impl/src/com/intellij/refactoring/changeSignature/ParameterTableModel.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeSignature/ThrownExceptionInfo.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/ThrownExceptionInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeSignature/ThrownExceptionInfo.java
rename to java/java-impl/src/com/intellij/refactoring/changeSignature/ThrownExceptionInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeSignature/inCallers/CallerChooser.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/inCallers/CallerChooser.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeSignature/inCallers/CallerChooser.java
rename to java/java-impl/src/com/intellij/refactoring/changeSignature/inCallers/CallerChooser.java

diff --git a/refactoring/impl/com/intellij/refactoring/changeSignature/inCallers/MethodNode.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/inCallers/MethodNode.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/changeSignature/inCallers/MethodNode.java
rename to java/java-impl/src/com/intellij/refactoring/changeSignature/inCallers/MethodNode.java

diff --git a/refactoring/impl/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodDialog.java b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodDialog.java
rename to java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java
rename to java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/convertToInstanceMethod/ImplementingClassUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ImplementingClassUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/convertToInstanceMethod/ImplementingClassUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ImplementingClassUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/convertToInstanceMethod/JavaDocUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/JavaDocUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/convertToInstanceMethod/JavaDocUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/JavaDocUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/convertToInstanceMethod/MethodCallUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/MethodCallUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/convertToInstanceMethod/MethodCallUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/MethodCallUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/convertToInstanceMethod/ParameterUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ParameterUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/convertToInstanceMethod/ParameterUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ParameterUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/copy/CopyClassDialog.java b/java/java-impl/src/com/intellij/refactoring/copy/CopyClassDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/copy/CopyClassDialog.java
rename to java/java-impl/src/com/intellij/refactoring/copy/CopyClassDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/copy/CopyClassesHandler.java b/java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/copy/CopyClassesHandler.java
rename to java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/copy/JavaCopyFilesOrDirectoriesHandler.java b/java/java-impl/src/com/intellij/refactoring/copy/JavaCopyFilesOrDirectoriesHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/copy/JavaCopyFilesOrDirectoriesHandler.java
rename to java/java-impl/src/com/intellij/refactoring/copy/JavaCopyFilesOrDirectoriesHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java
rename to java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsHandler.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsHandler.java
rename to java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsViewDescriptor.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsViewDescriptor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsViewDescriptor.java
rename to java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsViewDescriptor.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractInterface/ExtractClassUtil.java b/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractClassUtil.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractInterface/ExtractClassUtil.java
rename to java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractClassUtil.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java b/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java
rename to java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java b/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java
rename to java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractInterface/ExtractInterfaceProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractInterface/ExtractInterfaceProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/extractInterface/ExtractInterfaceProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractMethod/AbstractExtractDialog.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/AbstractExtractDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractMethod/AbstractExtractDialog.java
rename to java/java-impl/src/com/intellij/refactoring/extractMethod/AbstractExtractDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractMethod/ControlFlowWrapper.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/ControlFlowWrapper.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractMethod/ControlFlowWrapper.java
rename to java/java-impl/src/com/intellij/refactoring/extractMethod/ControlFlowWrapper.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java
rename to java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractMethod/ExtractMethodHandler.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractMethod/ExtractMethodHandler.java
rename to java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractMethod/ExtractMethodUtil.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodUtil.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractMethod/ExtractMethodUtil.java
rename to java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodUtil.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractMethod/InputVariables.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/InputVariables.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractMethod/InputVariables.java
rename to java/java-impl/src/com/intellij/refactoring/extractMethod/InputVariables.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractMethod/ParametersFolder.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/ParametersFolder.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractMethod/ParametersFolder.java
rename to java/java-impl/src/com/intellij/refactoring/extractMethod/ParametersFolder.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractMethod/PrepareFailedException.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/PrepareFailedException.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractMethod/PrepareFailedException.java
rename to java/java-impl/src/com/intellij/refactoring/extractMethod/PrepareFailedException.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectDialog.java b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectDialog.java
rename to java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectHandler.java b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectHandler.java
rename to java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectPanel.form b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectPanel.form
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectPanel.form
rename to java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectPanel.form

diff --git a/refactoring/impl/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectViewDescriptor.java b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectViewDescriptor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectViewDescriptor.java
rename to java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectViewDescriptor.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractMethodObject/MethodToMoveUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/MethodToMoveUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractMethodObject/MethodToMoveUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/extractMethodObject/MethodToMoveUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractSuperclass/BindToOldUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/BindToOldUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractSuperclass/BindToOldUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/extractSuperclass/BindToOldUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java
rename to java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractSuperclass/ExtractSuperClassProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractSuperclass/ExtractSuperClassProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractSuperclass/ExtractSuperClassUtil.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassUtil.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractSuperclass/ExtractSuperClassUtil.java
rename to java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassUtil.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractSuperclass/ExtractSuperClassViewDescriptor.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassViewDescriptor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractSuperclass/ExtractSuperClassViewDescriptor.java
rename to java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassViewDescriptor.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java
rename to java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java b/java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java
rename to java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/BackpointerUsageVisitor.java b/java/java-impl/src/com/intellij/refactoring/extractclass/BackpointerUsageVisitor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/BackpointerUsageVisitor.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/BackpointerUsageVisitor.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/BackpointerUtil.java b/java/java-impl/src/com/intellij/refactoring/extractclass/BackpointerUtil.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/BackpointerUtil.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/BackpointerUtil.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/ExtractClassDialog.java b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/ExtractClassDialog.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/ExtractClassHandler.java b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/ExtractClassHandler.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/ExtractClassProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/ExtractClassProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/ExtractClassUsageViewDescriptor.java b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassUsageViewDescriptor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/ExtractClassUsageViewDescriptor.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassUsageViewDescriptor.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/ExtractedClassBuilder.java b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractedClassBuilder.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/ExtractedClassBuilder.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/ExtractedClassBuilder.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/FieldSpec.java b/java/java-impl/src/com/intellij/refactoring/extractclass/FieldSpec.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/FieldSpec.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/FieldSpec.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/BindJavadocReference.java b/java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/BindJavadocReference.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/BindJavadocReference.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/BindJavadocReference.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/MakeMethodDelegate.java b/java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/MakeMethodDelegate.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/MakeMethodDelegate.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/MakeMethodDelegate.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/RemoveField.java b/java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/RemoveField.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/RemoveField.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/RemoveField.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/RemoveInnerClass.java b/java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/RemoveInnerClass.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/RemoveInnerClass.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/RemoveInnerClass.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/RemoveMethod.java b/java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/RemoveMethod.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/RemoveMethod.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/RemoveMethod.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/ReplaceClassReference.java b/java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/ReplaceClassReference.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/ReplaceClassReference.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/ReplaceClassReference.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/ReplaceInstanceVariableAccess.java b/java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/ReplaceInstanceVariableAccess.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/ReplaceInstanceVariableAccess.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/ReplaceInstanceVariableAccess.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/ReplaceInstanceVariableAssignment.java b/java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/ReplaceInstanceVariableAssignment.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/ReplaceInstanceVariableAssignment.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/ReplaceInstanceVariableAssignment.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/ReplaceInstanceVariableIncrementDecrement.java b/java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/ReplaceInstanceVariableIncrementDecrement.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/ReplaceInstanceVariableIncrementDecrement.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/ReplaceInstanceVariableIncrementDecrement.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/ReplaceStaticVariableAccess.java b/java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/ReplaceStaticVariableAccess.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/ReplaceStaticVariableAccess.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/ReplaceStaticVariableAccess.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/ReplaceStaticVariableAssignment.java b/java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/ReplaceStaticVariableAssignment.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/ReplaceStaticVariableAssignment.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/ReplaceStaticVariableAssignment.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/ReplaceStaticVariableIncrementDecrement.java b/java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/ReplaceStaticVariableIncrementDecrement.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/ReplaceStaticVariableIncrementDecrement.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/ReplaceStaticVariableIncrementDecrement.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/ReplaceThisCallWithDelegateCall.java b/java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/ReplaceThisCallWithDelegateCall.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/ReplaceThisCallWithDelegateCall.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/ReplaceThisCallWithDelegateCall.java

diff --git a/refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/RetargetStaticMethodCall.java b/java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/RetargetStaticMethodCall.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/extractclass/usageInfo/RetargetStaticMethodCall.java
rename to java/java-impl/src/com/intellij/refactoring/extractclass/usageInfo/RetargetStaticMethodCall.java

diff --git a/refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java
rename to java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationHandler.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationHandler.java
rename to java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationUtil.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationUtil.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationUtil.java
rename to java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationUtil.java

diff --git a/refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationViewDescriptor.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationViewDescriptor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationViewDescriptor.java
rename to java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationViewDescriptor.java

diff --git a/refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/InnerClassConstructor.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InnerClassConstructor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/InnerClassConstructor.java
rename to java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InnerClassConstructor.java

diff --git a/refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/InnerClassMethod.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InnerClassMethod.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/InnerClassMethod.java
rename to java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InnerClassMethod.java

diff --git a/refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/usageInfo/FieldAccessibility.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/usageInfo/FieldAccessibility.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/usageInfo/FieldAccessibility.java
rename to java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/usageInfo/FieldAccessibility.java

diff --git a/refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/usageInfo/InheritanceToDelegationUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/usageInfo/InheritanceToDelegationUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/usageInfo/InheritanceToDelegationUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/usageInfo/InheritanceToDelegationUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/usageInfo/NoLongerOverridingSubClassMethodUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/usageInfo/NoLongerOverridingSubClassMethodUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/usageInfo/NoLongerOverridingSubClassMethodUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/usageInfo/NoLongerOverridingSubClassMethodUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/usageInfo/NonDelegatedMemberUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/usageInfo/NonDelegatedMemberUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/usageInfo/NonDelegatedMemberUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/usageInfo/NonDelegatedMemberUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/usageInfo/ObjectUpcastedUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/usageInfo/ObjectUpcastedUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/usageInfo/ObjectUpcastedUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/usageInfo/ObjectUpcastedUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/usageInfo/UnqualifiedNonDelegatedMemberUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/usageInfo/UnqualifiedNonDelegatedMemberUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/usageInfo/UnqualifiedNonDelegatedMemberUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/usageInfo/UnqualifiedNonDelegatedMemberUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/usageInfo/UpcastedUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/usageInfo/UpcastedUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inheritanceToDelegation/usageInfo/UpcastedUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/usageInfo/UpcastedUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/inline/InlineConstantFieldHandler.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inline/InlineConstantFieldHandler.java
rename to java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/inline/InlineFieldDialog.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineFieldDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inline/InlineFieldDialog.java
rename to java/java-impl/src/com/intellij/refactoring/inline/InlineFieldDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/inline/InlineLocalHandler.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineLocalHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inline/InlineLocalHandler.java
rename to java/java-impl/src/com/intellij/refactoring/inline/InlineLocalHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/inline/InlineMethodDialog.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inline/InlineMethodDialog.java
rename to java/java-impl/src/com/intellij/refactoring/inline/InlineMethodDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/inline/InlineMethodHandler.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inline/InlineMethodHandler.java
rename to java/java-impl/src/com/intellij/refactoring/inline/InlineMethodHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/inline/InlineMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inline/InlineMethodProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/inline/InlineParameterDialog.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inline/InlineParameterDialog.java
rename to java/java-impl/src/com/intellij/refactoring/inline/InlineParameterDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/inline/InlineParameterHandler.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inline/InlineParameterHandler.java
rename to java/java-impl/src/com/intellij/refactoring/inline/InlineParameterHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/inline/InlineToAnonymousClassDialog.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inline/InlineToAnonymousClassDialog.java
rename to java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/inline/InlineToAnonymousClassHandler.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inline/InlineToAnonymousClassHandler.java
rename to java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/inline/InlineToAnonymousClassProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inline/InlineToAnonymousClassProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/inline/InlineToAnonymousConstructorProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousConstructorProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inline/InlineToAnonymousConstructorProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousConstructorProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/inline/InlineViewDescriptor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineViewDescriptor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inline/InlineViewDescriptor.java
rename to java/java-impl/src/com/intellij/refactoring/inline/InlineViewDescriptor.java

diff --git a/refactoring/impl/com/intellij/refactoring/inline/JavaInlineActionHandler.java b/java/java-impl/src/com/intellij/refactoring/inline/JavaInlineActionHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inline/JavaInlineActionHandler.java
rename to java/java-impl/src/com/intellij/refactoring/inline/JavaInlineActionHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/inline/ReferencedElementsCollector.java b/java/java-impl/src/com/intellij/refactoring/inline/ReferencedElementsCollector.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inline/ReferencedElementsCollector.java
rename to java/java-impl/src/com/intellij/refactoring/inline/ReferencedElementsCollector.java

diff --git a/refactoring/impl/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringDialog.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringDialog.java
rename to java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringHandler.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringHandler.java
rename to java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/inlineSuperClass/InlineSuperClassUsageViewDescriptor.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassUsageViewDescriptor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inlineSuperClass/InlineSuperClassUsageViewDescriptor.java
rename to java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassUsageViewDescriptor.java

diff --git a/refactoring/impl/com/intellij/refactoring/inlineSuperClass/usageInfo/RemoveImportUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/RemoveImportUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inlineSuperClass/usageInfo/RemoveImportUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/RemoveImportUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/inlineSuperClass/usageInfo/RemoveQualifierUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/RemoveQualifierUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inlineSuperClass/usageInfo/RemoveQualifierUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/RemoveQualifierUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceConstructorUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceConstructorUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceConstructorUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceConstructorUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceExtendsListUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceExtendsListUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceExtendsListUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceExtendsListUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceReferenceUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceReferenceUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceReferenceUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceReferenceUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceStaticImportUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceStaticImportUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceStaticImportUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceStaticImportUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceWithSubtypeUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceWithSubtypeUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceWithSubtypeUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceWithSubtypeUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
rename to java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceField/ElementToWorkOn.java b/java/java-impl/src/com/intellij/refactoring/introduceField/ElementToWorkOn.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceField/ElementToWorkOn.java
rename to java/java-impl/src/com/intellij/refactoring/introduceField/ElementToWorkOn.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceField/IntroduceConstantDialog.form b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.form
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceField/IntroduceConstantDialog.form
rename to java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.form

diff --git a/refactoring/impl/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java
rename to java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java
rename to java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceField/IntroduceFieldDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceField/IntroduceFieldDialog.java
rename to java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceField/IntroduceFieldHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceField/IntroduceFieldHandler.java
rename to java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceFieldHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceField/LocalToFieldHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceField/LocalToFieldHandler.java
rename to java/java-impl/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceParameter/ChangedMethodCallInfo.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/ChangedMethodCallInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceParameter/ChangedMethodCallInfo.java
rename to java/java-impl/src/com/intellij/refactoring/introduceParameter/ChangedMethodCallInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceParameter/ClassMemberInExprUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/ClassMemberInExprUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceParameter/ClassMemberInExprUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/introduceParameter/ClassMemberInExprUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java
rename to java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceParameter/ExternalUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/ExternalUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceParameter/ExternalUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/introduceParameter/ExternalUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceParameter/InExprUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/InExprUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceParameter/InExprUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/introduceParameter/InExprUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceParameter/InternalUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/InternalUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceParameter/InternalUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/introduceParameter/InternalUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceParameter/IntroduceParameterData.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterData.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceParameter/IntroduceParameterData.java
rename to java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterData.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java
rename to java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java
rename to java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceParameter/IntroduceParameterMethodUsagesProcessor.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterMethodUsagesProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceParameter/IntroduceParameterMethodUsagesProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterMethodUsagesProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceParameter/IntroduceParameterViewDescriptor.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterViewDescriptor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceParameter/IntroduceParameterViewDescriptor.java
rename to java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterViewDescriptor.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/introduceParameter/JavaIntroduceParameterMethodUsagesProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceParameter/LocalVariableInExprUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/LocalVariableInExprUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceParameter/LocalVariableInExprUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/introduceParameter/LocalVariableInExprUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceParameter/OldReferenceResolver.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/OldReferenceResolver.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceParameter/OldReferenceResolver.java
rename to java/java-impl/src/com/intellij/refactoring/introduceParameter/OldReferenceResolver.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceParameter/ParameterInExprUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/ParameterInExprUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceParameter/ParameterInExprUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/introduceParameter/ParameterInExprUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceParameter/Util.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/Util.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceParameter/Util.java
rename to java/java-impl/src/com/intellij/refactoring/introduceParameter/Util.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceVariable/InputValidator.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/InputValidator.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceVariable/InputValidator.java
rename to java/java-impl/src/com/intellij/refactoring/introduceVariable/InputValidator.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java
rename to java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceVariable/IntroduceVariableDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceVariable/IntroduceVariableDialog.java
rename to java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceVariable/IntroduceVariableHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceVariable/IntroduceVariableHandler.java
rename to java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceVariable/IntroduceVariableSettings.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableSettings.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceVariable/IntroduceVariableSettings.java
rename to java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableSettings.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceVariable/PsiExpressionTrimRenderer.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/PsiExpressionTrimRenderer.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceVariable/PsiExpressionTrimRenderer.java
rename to java/java-impl/src/com/intellij/refactoring/introduceVariable/PsiExpressionTrimRenderer.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectDialog.java
rename to java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectForm.form b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectForm.form
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectForm.form
rename to java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectForm.form

diff --git a/refactoring/impl/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectHandler.java
rename to java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectUsageViewDescriptor.java b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectUsageViewDescriptor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectUsageViewDescriptor.java
rename to java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectUsageViewDescriptor.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceparameterobject/ParameterObjectBuilder.java b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/ParameterObjectBuilder.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceparameterobject/ParameterObjectBuilder.java
rename to java/java-impl/src/com/intellij/refactoring/introduceparameterobject/ParameterObjectBuilder.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceparameterobject/ParameterSpec.java b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/ParameterSpec.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceparameterobject/ParameterSpec.java
rename to java/java-impl/src/com/intellij/refactoring/introduceparameterobject/ParameterSpec.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceparameterobject/usageInfo/MergeMethodArguments.java b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/usageInfo/MergeMethodArguments.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceparameterobject/usageInfo/MergeMethodArguments.java
rename to java/java-impl/src/com/intellij/refactoring/introduceparameterobject/usageInfo/MergeMethodArguments.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceparameterobject/usageInfo/ReplaceParameterAssignmentWithCall.java b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/usageInfo/ReplaceParameterAssignmentWithCall.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceparameterobject/usageInfo/ReplaceParameterAssignmentWithCall.java
rename to java/java-impl/src/com/intellij/refactoring/introduceparameterobject/usageInfo/ReplaceParameterAssignmentWithCall.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceparameterobject/usageInfo/ReplaceParameterIncrementDecrement.java b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/usageInfo/ReplaceParameterIncrementDecrement.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceparameterobject/usageInfo/ReplaceParameterIncrementDecrement.java
rename to java/java-impl/src/com/intellij/refactoring/introduceparameterobject/usageInfo/ReplaceParameterIncrementDecrement.java

diff --git a/refactoring/impl/com/intellij/refactoring/introduceparameterobject/usageInfo/ReplaceParameterReferenceWithCall.java b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/usageInfo/ReplaceParameterReferenceWithCall.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/introduceparameterobject/usageInfo/ReplaceParameterReferenceWithCall.java
rename to java/java-impl/src/com/intellij/refactoring/introduceparameterobject/usageInfo/ReplaceParameterReferenceWithCall.java

diff --git a/refactoring/impl/com/intellij/refactoring/invertBoolean/InvertBoolean.form b/java/java-impl/src/com/intellij/refactoring/invertBoolean/InvertBoolean.form
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/invertBoolean/InvertBoolean.form
rename to java/java-impl/src/com/intellij/refactoring/invertBoolean/InvertBoolean.form

diff --git a/refactoring/impl/com/intellij/refactoring/invertBoolean/InvertBooleanDialog.java b/java/java-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/invertBoolean/InvertBooleanDialog.java
rename to java/java-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/invertBoolean/InvertBooleanHandler.java b/java/java-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/invertBoolean/InvertBooleanHandler.java
rename to java/java-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/invertBoolean/InvertBooleanProcessor.java b/java/java-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/invertBoolean/InvertBooleanProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/invertBoolean/InvertBooleanUsageViewDescriptor.java b/java/java-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanUsageViewDescriptor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/invertBoolean/InvertBooleanUsageViewDescriptor.java
rename to java/java-impl/src/com/intellij/refactoring/invertBoolean/InvertBooleanUsageViewDescriptor.java

diff --git a/refactoring/impl/com/intellij/refactoring/listeners/impl/JavaRefactoringListenerManagerImpl.java b/java/java-impl/src/com/intellij/refactoring/listeners/impl/JavaRefactoringListenerManagerImpl.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/listeners/impl/JavaRefactoringListenerManagerImpl.java
rename to java/java-impl/src/com/intellij/refactoring/listeners/impl/JavaRefactoringListenerManagerImpl.java

diff --git a/refactoring/impl/com/intellij/refactoring/makeStatic/AbstractMakeStaticDialog.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/AbstractMakeStaticDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/makeStatic/AbstractMakeStaticDialog.java
rename to java/java-impl/src/com/intellij/refactoring/makeStatic/AbstractMakeStaticDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/makeStatic/InternalUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/InternalUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/makeStatic/InternalUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/makeStatic/InternalUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/makeStatic/MakeClassStaticProcessor.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeClassStaticProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/makeStatic/MakeClassStaticProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/makeStatic/MakeClassStaticProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/makeStatic/MakeMethodOrClassStaticProcessor.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeMethodOrClassStaticProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/makeStatic/MakeMethodOrClassStaticProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/makeStatic/MakeMethodOrClassStaticProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/makeStatic/MakeMethodOrClassStaticViewDescriptor.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeMethodOrClassStaticViewDescriptor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/makeStatic/MakeMethodOrClassStaticViewDescriptor.java
rename to java/java-impl/src/com/intellij/refactoring/makeStatic/MakeMethodOrClassStaticViewDescriptor.java

diff --git a/refactoring/impl/com/intellij/refactoring/makeStatic/MakeMethodStaticProcessor.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeMethodStaticProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/makeStatic/MakeMethodStaticProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/makeStatic/MakeMethodStaticProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/makeStatic/MakeParameterizedStaticDialog.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeParameterizedStaticDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/makeStatic/MakeParameterizedStaticDialog.java
rename to java/java-impl/src/com/intellij/refactoring/makeStatic/MakeParameterizedStaticDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/makeStatic/MakeStaticHandler.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeStaticHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/makeStatic/MakeStaticHandler.java
rename to java/java-impl/src/com/intellij/refactoring/makeStatic/MakeStaticHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/makeStatic/MakeStaticUtil.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeStaticUtil.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/makeStatic/MakeStaticUtil.java
rename to java/java-impl/src/com/intellij/refactoring/makeStatic/MakeStaticUtil.java

diff --git a/refactoring/impl/com/intellij/refactoring/makeStatic/OverridingMethodUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/OverridingMethodUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/makeStatic/OverridingMethodUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/makeStatic/OverridingMethodUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/makeStatic/SelfUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/SelfUsageInfo.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/makeStatic/SelfUsageInfo.java
rename to java/java-impl/src/com/intellij/refactoring/makeStatic/SelfUsageInfo.java

diff --git a/refactoring/impl/com/intellij/refactoring/makeStatic/Settings.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/Settings.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/makeStatic/Settings.java
rename to java/java-impl/src/com/intellij/refactoring/makeStatic/Settings.java

diff --git a/refactoring/impl/com/intellij/refactoring/makeStatic/SimpleMakeStaticDialog.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/SimpleMakeStaticDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/makeStatic/SimpleMakeStaticDialog.java
rename to java/java-impl/src/com/intellij/refactoring/makeStatic/SimpleMakeStaticDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/memberPullUp/JavaDocPanel.java b/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaDocPanel.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/memberPullUp/JavaDocPanel.java
rename to java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaDocPanel.java

diff --git a/refactoring/impl/com/intellij/refactoring/memberPullUp/JavaPullUpHandler.java b/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/memberPullUp/JavaPullUpHandler.java
rename to java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/memberPullUp/PullUpConflictsUtil.java b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpConflictsUtil.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/memberPullUp/PullUpConflictsUtil.java
rename to java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpConflictsUtil.java

diff --git a/refactoring/impl/com/intellij/refactoring/memberPullUp/PullUpDialog.java b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/memberPullUp/PullUpDialog.java
rename to java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/memberPullUp/PullUpHelper.java b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpHelper.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/memberPullUp/PullUpHelper.java
rename to java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpHelper.java

diff --git a/refactoring/impl/com/intellij/refactoring/memberPushDown/JavaPushDownHandler.java b/java/java-impl/src/com/intellij/refactoring/memberPushDown/JavaPushDownHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/memberPushDown/JavaPushDownHandler.java
rename to java/java-impl/src/com/intellij/refactoring/memberPushDown/JavaPushDownHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/memberPushDown/PushDownConflicts.java b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownConflicts.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/memberPushDown/PushDownConflicts.java
rename to java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownConflicts.java

diff --git a/refactoring/impl/com/intellij/refactoring/memberPushDown/PushDownDialog.java b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/memberPushDown/PushDownDialog.java
rename to java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/memberPushDown/PushDownProcessor.java b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/memberPushDown/PushDownUsageViewDescriptor.java b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownUsageViewDescriptor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/memberPushDown/PushDownUsageViewDescriptor.java
rename to java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownUsageViewDescriptor.java

diff --git a/refactoring/impl/com/intellij/refactoring/migration/EditMigrationDialog.java b/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/migration/EditMigrationDialog.java
rename to java/java-impl/src/com/intellij/refactoring/migration/EditMigrationDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/migration/EditMigrationEntryDialog.java b/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationEntryDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/migration/EditMigrationEntryDialog.java
rename to java/java-impl/src/com/intellij/refactoring/migration/EditMigrationEntryDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/migration/MigrationDialog.form b/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.form
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/migration/MigrationDialog.form
rename to java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.form

diff --git a/refactoring/impl/com/intellij/refactoring/migration/MigrationDialog.java b/java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/migration/MigrationDialog.java
rename to java/java-impl/src/com/intellij/refactoring/migration/MigrationDialog.java

diff --git a/refactoring/impl/com/intellij/refactoring/migration/MigrationManager.java b/java/java-impl/src/com/intellij/refactoring/migration/MigrationManager.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/migration/MigrationManager.java
rename to java/java-impl/src/com/intellij/refactoring/migration/MigrationManager.java

diff --git a/refactoring/impl/com/intellij/refactoring/migration/MigrationMap.java b/java/java-impl/src/com/intellij/refactoring/migration/MigrationMap.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/migration/MigrationMap.java
rename to java/java-impl/src/com/intellij/refactoring/migration/MigrationMap.java

diff --git a/refactoring/impl/com/intellij/refactoring/migration/MigrationMapEntry.java b/java/java-impl/src/com/intellij/refactoring/migration/MigrationMapEntry.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/migration/MigrationMapEntry.java
rename to java/java-impl/src/com/intellij/refactoring/migration/MigrationMapEntry.java

diff --git a/refactoring/impl/com/intellij/refactoring/migration/MigrationMapSet.java b/java/java-impl/src/com/intellij/refactoring/migration/MigrationMapSet.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/migration/MigrationMapSet.java
rename to java/java-impl/src/com/intellij/refactoring/migration/MigrationMapSet.java

diff --git a/refactoring/impl/com/intellij/refactoring/migration/MigrationProcessor.java b/java/java-impl/src/com/intellij/refactoring/migration/MigrationProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/migration/MigrationProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/migration/MigrationProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/migration/MigrationUsagesViewDescriptor.java b/java/java-impl/src/com/intellij/refactoring/migration/MigrationUsagesViewDescriptor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/migration/MigrationUsagesViewDescriptor.java
rename to java/java-impl/src/com/intellij/refactoring/migration/MigrationUsagesViewDescriptor.java

diff --git a/refactoring/impl/com/intellij/refactoring/migration/MigrationUtil.java b/java/java-impl/src/com/intellij/refactoring/migration/MigrationUtil.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/migration/MigrationUtil.java
rename to java/java-impl/src/com/intellij/refactoring/migration/MigrationUtil.java

diff --git a/refactoring/impl/com/intellij/refactoring/migration/res/Swing__1_0_3____1_1_.xml b/java/java-impl/src/com/intellij/refactoring/migration/res/Swing__1_0_3____1_1_.xml
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/migration/res/Swing__1_0_3____1_1_.xml
rename to java/java-impl/src/com/intellij/refactoring/migration/res/Swing__1_0_3____1_1_.xml

diff --git a/refactoring/impl/com/intellij/refactoring/move/MoveClassesOrPackagesCallback.java b/java/java-impl/src/com/intellij/refactoring/move/MoveClassesOrPackagesCallback.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/move/MoveClassesOrPackagesCallback.java
rename to java/java-impl/src/com/intellij/refactoring/move/MoveClassesOrPackagesCallback.java

diff --git a/refactoring/impl/com/intellij/refactoring/move/MoveInstanceMembersUtil.java b/java/java-impl/src/com/intellij/refactoring/move/MoveInstanceMembersUtil.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/move/MoveInstanceMembersUtil.java
rename to java/java-impl/src/com/intellij/refactoring/move/MoveInstanceMembersUtil.java

diff --git a/refactoring/impl/com/intellij/refactoring/move/moveClassesOrPackages/AutocreatingMoveDestination.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/AutocreatingMoveDestination.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/move/moveClassesOrPackages/AutocreatingMoveDestination.java
rename to java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/AutocreatingMoveDestination.java

diff --git a/refactoring/impl/com/intellij/refactoring/move/moveClassesOrPackages/AutocreatingSingleSourceRootMoveDestination.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/AutocreatingSingleSourceRootMoveDestination.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/move/moveClassesOrPackages/AutocreatingSingleSourceRootMoveDestination.java
rename to java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/AutocreatingSingleSourceRootMoveDestination.java

diff --git a/refactoring/impl/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassHandler.java
rename to java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java
rename to java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java

diff --git a/refactoring/impl/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesHandler.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesHandler.java
rename to java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesHandler.java

diff --git a/refactoring/impl/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.form b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.form
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.form
rename to java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.form

diff --git a/refactoring/impl/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
similarity index 100%
rename from refactoring/impl/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.java
rename to