From 4d0e4e551ae2b8be130d7efe743318eb2326f0e4 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Sun, 30 Aug 2009 21:38:31 +0400 Subject: [PATCH] codeInsight-impl -> java-impl --- .../codeInsight-impl.iml => java/java-impl/java-impl.iml | 4 ++-- .../src}/com/intellij/codeInsight/ChangeContextUtil.java | 0 .../src}/com/intellij/codeInsight/CodeInsightUtil.java | 0 .../src}/com/intellij/codeInsight/ExceptionUtil.java | 0 .../src}/com/intellij/codeInsight/ExpectedTypeInfo.java | 0 .../src}/com/intellij/codeInsight/ExpectedTypeInfoImpl.java | 0 .../src}/com/intellij/codeInsight/ExpectedTypeUtil.java | 0 .../src}/com/intellij/codeInsight/ExpectedTypesProvider.java | 0 .../intellij/codeInsight/ExternalAnnotationsManagerImpl.java | 0 .../java-impl/src}/com/intellij/codeInsight/TailTypes.java | 0 .../src}/com/intellij/codeInsight/TargetElementUtil.java | 0 .../com/intellij/codeInsight/completion/AllClassesGetter.java | 0 .../completion/BasicExpressionCompletionContributor.java | 0 .../codeInsight/completion/BasicToClassNameDelegator.java | 0 .../codeInsight/completion/CastingLookupElementDecorator.java | 0 .../com/intellij/codeInsight/completion/CompletionBundle.java | 0 .../intellij/codeInsight/completion/DefaultCharFilter.java | 0 .../intellij/codeInsight/completion/DefaultInsertHandler.java | 0 .../src}/com/intellij/codeInsight/completion/DocAnalyzer.java | 0 .../completion/ExcludeFromCompletionLookupActionProvider.java | 0 .../completion/ExpectedTypeBasedCompletionProvider.java | 0 .../completion/ExpressionSmartCompletionContributor.java | 0 .../intellij/codeInsight/completion/Java15CompletionData.java | 0 .../codeInsight/completion/JavaAwareCompletionData.java | 0 .../codeInsight/completion/JavaChainLookupElement.java | 0 .../com/intellij/codeInsight/completion/JavaCharFilter.java | 0 .../completion/JavaClassNameCompletionContributor.java | 0 .../completion/JavaClassReferenceCompletionContributor.java | 0 .../codeInsight/completion/JavaCompletionContributor.java | 0 .../intellij/codeInsight/completion/JavaCompletionData.java | 0 .../codeInsight/completion/JavaCompletionFeatures.java | 0 .../codeInsight/completion/JavaCompletionStatistician.java | 0 .../intellij/codeInsight/completion/JavaCompletionUtil.java | 0 .../codeInsight/completion/JavaDocCompletionContributor.java | 0 .../completion/JavaMemberNameCompletionContributor.java | 0 .../codeInsight/completion/JavaMethodCallElement.java | 0 .../codeInsight/completion/JavaMethodMergingContributor.java | 0 .../codeInsight/completion/JavaProximityStatistician.java | 0 .../codeInsight/completion/JavaPsiClassReferenceElement.java | 0 .../completion/JavaSmartCompletionContributor.java | 0 .../codeInsight/completion/JavaSmartCompletionParameters.java | 0 .../codeInsight/completion/JavadocAutoLookupHandler.java | 0 .../com/intellij/codeInsight/completion/LookupHandler.java | 0 .../com/intellij/codeInsight/completion/ModifierChooser.java | 0 .../codeInsight/completion/NameEndMatchingDegreeWeigher.java | 0 .../completion/NullSmartCompletionContributor.java | 0 .../codeInsight/completion/PreferAccessibleWeigher.java | 0 .../codeInsight/completion/PreferEnumConstantsWeigher.java | 0 .../codeInsight/completion/PreferExpectedTypeWeigher.java | 0 .../codeInsight/completion/PreferFieldsAndGettersWeigher.java | 0 .../PreferLocalVariablesLiteralsAndAnnoMethodsWeigher.java | 0 .../codeInsight/completion/PreferNonGenericWeigher.java | 0 .../intellij/codeInsight/completion/PreferShorterWeigher.java | 0 .../intellij/codeInsight/completion/PreferSimpleWeigher.java | 0 .../codeInsight/completion/RecursiveCallParameterWeigher.java | 0 .../completion/ReferenceExpressionCompletionContributor.java | 0 .../com/intellij/codeInsight/completion/SameWordsWeigher.java | 0 .../completion/SkipAbstractExpectedTypeWeigher.java | 0 .../codeInsight/completion/SmartCompletionDecorator.java | 0 .../intellij/codeInsight/completion/StaticMembersWeigher.java | 0 .../codeInsight/completion/proc/VariablesProcessor.java | 0 .../codeInsight/completion/scope/CompletionElement.java | 0 .../codeInsight/completion/scope/JavaCompletionProcessor.java | 0 .../codeInsight/completion/simple/BracesTailType.java | 0 .../codeInsight/completion/simple/ParenthesesTailType.java | 0 .../codeInsight/completion/simple/PsiMethodInsertHandler.java | 0 .../codeInsight/completion/simple/RParenthTailType.java | 0 .../com/intellij/codeInsight/daemon/JavaErrorMessages.java | 0 .../codeInsight/daemon/impl/GutterIconTooltipHelper.java | 0 .../codeInsight/daemon/impl/IconLineMarkerProvider.java | 0 .../daemon/impl/ImportPopupHectorComponentProvider.java | 0 .../codeInsight/daemon/impl/JavaHightlightInfoTypes.java | 0 .../codeInsight/daemon/impl/JavaLineMarkerProvider.java | 0 .../codeInsight/daemon/impl/JavaReferenceImporter.java | 0 .../intellij/codeInsight/daemon/impl/LineMarkerNavigator.java | 0 .../src}/com/intellij/codeInsight/daemon/impl/MarkerType.java | 0 .../com/intellij/codeInsight/daemon/impl/RefCountHolder.java | 0 .../codeInsight/daemon/impl/RemoveSuppressWarningAction.java | 0 .../codeInsight/daemon/impl/actions/AddImportAction.java | 0 .../daemon/impl/actions/AddNoInspectionJavaCommentFix.java | 0 .../impl/actions/AddSuppressInspectionAllForClassFix.java | 0 .../daemon/impl/actions/AddSuppressInspectionFix.java | 0 .../daemon/impl/actions/AddSuppressInspectionForClassFix.java | 0 .../daemon/impl/analysis/AnnotationsHighlightUtil.java | 0 .../daemon/impl/analysis/GenericsHighlightUtil.java | 0 .../codeInsight/daemon/impl/analysis/HighlightClassUtil.java | 0 .../daemon/impl/analysis/HighlightControlFlowUtil.java | 0 .../daemon/impl/analysis/HighlightMessageUtil.java | 0 .../codeInsight/daemon/impl/analysis/HighlightMethodUtil.java | 0 .../codeInsight/daemon/impl/analysis/HighlightNamesUtil.java | 0 .../codeInsight/daemon/impl/analysis/HighlightUtil.java | 0 .../daemon/impl/analysis/HighlightVisitorImpl.java | 0 .../daemon/impl/analysis/IncreaseLanguageLevelFix.java | 0 .../codeInsight/daemon/impl/analysis/JavadocErrorFilter.java | 0 .../daemon/impl/quickfix/AccessStaticViaInstanceFix.java | 0 .../daemon/impl/quickfix/AddDefaultConstructorFix.java | 0 .../daemon/impl/quickfix/AddExceptionToCatchFix.java | 0 .../daemon/impl/quickfix/AddExceptionToThrowsFix.java | 0 .../codeInsight/daemon/impl/quickfix/AddMethodBodyFix.java | 0 .../codeInsight/daemon/impl/quickfix/AddMethodFix.java | 0 .../daemon/impl/quickfix/AddNewArrayExpressionFix.java | 0 .../codeInsight/daemon/impl/quickfix/AddReturnFix.java | 0 .../impl/quickfix/AddRuntimeExceptionToThrowsAction.java | 0 .../codeInsight/daemon/impl/quickfix/AddTypeArgumentsFix.java | 0 .../codeInsight/daemon/impl/quickfix/AddTypeCastFix.java | 0 .../daemon/impl/quickfix/AddVariableInitializerFix.java | 0 .../daemon/impl/quickfix/ArgumentFixerActionFactory.java | 0 .../daemon/impl/quickfix/BringVariableIntoScopeFix.java | 0 .../daemon/impl/quickfix/CastMethodArgumentFix.java | 0 .../daemon/impl/quickfix/ChangeExtendsToImplementsFix.java | 0 .../impl/quickfix/ChangeMethodSignatureFromUsageFix.java | 0 .../daemon/impl/quickfix/ChangeNewOperatorTypeFix.java | 0 .../daemon/impl/quickfix/ChangeParameterClassFix.java | 0 .../quickfix/ChangeStringLiteralToCharInMethodCallFix.java | 0 .../daemon/impl/quickfix/ConstructorParametersFixer.java | 0 .../daemon/impl/quickfix/ConvertReturnStatementsVisitor.java | 0 .../quickfix/CreateCastExpressionFromInstanceofAction.java | 0 .../daemon/impl/quickfix/CreateClassFromNewFix.java | 0 .../daemon/impl/quickfix/CreateClassFromUsageBaseFix.java | 0 .../daemon/impl/quickfix/CreateClassFromUsageFix.java | 0 .../codeInsight/daemon/impl/quickfix/CreateClassKind.java | 0 .../daemon/impl/quickfix/CreateConstantFieldFromUsageFix.java | 0 .../daemon/impl/quickfix/CreateConstructorFromCallFix.java | 0 .../daemon/impl/quickfix/CreateConstructorFromSuperFix.java | 0 .../daemon/impl/quickfix/CreateConstructorFromThisFix.java | 0 .../impl/quickfix/CreateConstructorFromThisOrSuperFix.java | 0 .../impl/quickfix/CreateConstructorMatchingSuperFix.java | 0 .../impl/quickfix/CreateConstructorParameterFromFieldFix.java | 0 .../daemon/impl/quickfix/CreateEnumConstantFromUsageFix.java | 0 .../daemon/impl/quickfix/CreateFieldFromUsageFix.java | 0 .../daemon/impl/quickfix/CreateFromUsageBaseFix.java | 0 .../daemon/impl/quickfix/CreateFromUsageUtils.java | 0 .../daemon/impl/quickfix/CreateGetterOrSetterFix.java | 0 .../daemon/impl/quickfix/CreateInnerClassFromNewFix.java | 0 .../daemon/impl/quickfix/CreateInnerClassFromUsageFix.java | 0 .../daemon/impl/quickfix/CreateLocalFromUsageFix.java | 0 .../impl/quickfix/CreateLocalVarFromInstanceofAction.java | 0 .../daemon/impl/quickfix/CreateMethodFromUsageFix.java | 0 .../daemon/impl/quickfix/CreateMethodQuickFix.java | 0 .../daemon/impl/quickfix/CreateParameterFromUsageFix.java | 0 .../daemon/impl/quickfix/CreatePropertyFromUsageFix.java | 0 .../daemon/impl/quickfix/CreateVarFromUsageFix.java | 0 .../codeInsight/daemon/impl/quickfix/DeclarationSearcher.java | 0 .../daemon/impl/quickfix/DefaultQuickFixProvider.java | 0 .../daemon/impl/quickfix/DeferFinalAssignmentFix.java | 0 .../codeInsight/daemon/impl/quickfix/DeleteCatchFix.java | 0 .../codeInsight/daemon/impl/quickfix/DeleteMethodBodyFix.java | 0 .../impl/quickfix/EnableOptimizeImportsOnTheFlyFix.java | 0 .../codeInsight/daemon/impl/quickfix/ExtendsListFix.java | 0 .../codeInsight/daemon/impl/quickfix/GeneralizeCatchFix.java | 0 .../codeInsight/daemon/impl/quickfix/GenerifyFileFix.java | 0 .../codeInsight/daemon/impl/quickfix/GuessTypeParameters.java | 0 .../codeInsight/daemon/impl/quickfix/ImplementMethodsFix.java | 0 .../codeInsight/daemon/impl/quickfix/ImportClassFix.java | 0 .../codeInsight/daemon/impl/quickfix/ImportClassFixBase.java | 0 .../codeInsight/daemon/impl/quickfix/InsertNewFix.java | 0 .../codeInsight/daemon/impl/quickfix/InsertSuperFix.java | 0 .../codeInsight/daemon/impl/quickfix/LocateLibraryDialog.form | 0 .../codeInsight/daemon/impl/quickfix/LocateLibraryDialog.java | 0 .../daemon/impl/quickfix/MakeClassInterfaceFix.java | 0 .../daemon/impl/quickfix/MakeMethodConstructorFix.java | 0 .../daemon/impl/quickfix/MakeVarargParameterLastFix.java | 0 .../codeInsight/daemon/impl/quickfix/MethodArgumentFix.java | 0 .../codeInsight/daemon/impl/quickfix/MethodParameterFix.java | 0 .../daemon/impl/quickfix/MethodReturnBooleanFix.java | 0 .../codeInsight/daemon/impl/quickfix/MethodReturnFix.java | 0 .../codeInsight/daemon/impl/quickfix/MethodThrowsFix.java | 0 .../codeInsight/daemon/impl/quickfix/ModifierFix.java | 0 .../daemon/impl/quickfix/MoveBoundClassToFrontFix.java | 0 .../codeInsight/daemon/impl/quickfix/MoveCatchUpFix.java | 0 .../daemon/impl/quickfix/MoveClassToModuleFix.java | 0 .../daemon/impl/quickfix/MoveClassToSeparateFileFix.java | 0 .../daemon/impl/quickfix/NegationBroadScopeFix.java | 0 .../codeInsight/daemon/impl/quickfix/OptimizeImportsFix.java | 0 .../codeInsight/daemon/impl/quickfix/OrderEntryFix.java | 0 .../codeInsight/daemon/impl/quickfix/PermuteArgumentsFix.java | 0 .../daemon/impl/quickfix/RemoveNewQualifierFix.java | 0 .../codeInsight/daemon/impl/quickfix/RemoveQualifierFix.java | 0 .../daemon/impl/quickfix/RemoveRedundantElseAction.java | 0 .../daemon/impl/quickfix/RemoveUnusedParameterFix.java | 0 .../daemon/impl/quickfix/RemoveUnusedVariableFix.java | 0 .../codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java | 0 .../impl/quickfix/ReplaceAddAllArrayToCollectionFix.java | 0 .../daemon/impl/quickfix/ReuseVariableDeclarationFix.java | 0 .../codeInsight/daemon/impl/quickfix/SafeDeleteFix.java | 0 .../codeInsight/daemon/impl/quickfix/SetupJDKFix.java | 0 .../daemon/impl/quickfix/ShowModulePropertiesFix.java | 0 .../daemon/impl/quickfix/SideEffectWarningDialog.java | 0 .../daemon/impl/quickfix/SimplifyBooleanExpressionFix.java | 0 .../daemon/impl/quickfix/StaticImportMethodFix.java | 0 .../daemon/impl/quickfix/SuperMethodReturnFix.java | 0 .../daemon/impl/quickfix/SurroundWithArrayFix.java | 0 .../daemon/impl/quickfix/SurroundWithTryCatchFix.java | 0 .../daemon/impl/quickfix/VariableAccessFromInnerClassFix.java | 0 .../daemon/impl/quickfix/VariableArrayTypeFix.java | 0 .../daemon/impl/quickfix/VariableParameterizedTypeFix.java | 0 .../codeInsight/daemon/impl/quickfix/VariableTypeFix.java | 0 .../daemon/impl/quickfix/VariableTypeQuickFixProvider.java | 0 .../codeInsight/daemon/impl/quickfix/WrapExpressionFix.java | 0 .../codeInsight/daemon/quickFix/CreateClassOrPackageFix.java | 0 .../codeInsight/daemon/quickFix/CreateFieldOrPropertyFix.java | 0 .../codeInsight/editorActions/BlockJoinLinesHandler.java | 0 .../editorActions/CopyPasteReferenceProcessor.java | 0 .../editorActions/DeclarationJoinLinesHandler.java | 0 .../codeInsight/editorActions/JavaBackspaceHandler.java | 0 .../intellij/codeInsight/editorActions/JavaQuoteHandler.java | 0 .../intellij/codeInsight/editorActions/JavaTypedHandler.java | 0 .../codeInsight/editorActions/JavaTypedHandlerUtil.java | 0 .../codeInsight/editorActions/LiteralJoinLinesHandler.java | 0 .../codeInsight/editorActions/ReferenceTransferableData.java | 0 .../codeInsight/editorActions/RestoreReferencesDialog.java | 0 .../editorActions/StringLiteralCopyPasteProcessor.java | 0 .../editorActions/moveUpDown/DeclarationMover.java | 0 .../codeInsight/editorActions/moveUpDown/StatementMover.java | 0 .../smartEnter/AfterSemicolonEnterProcessor.java | 0 .../codeInsight/editorActions/smartEnter/BlockBraceFixer.java | 0 .../smartEnter/BreakingControlFlowEnterProcessor.java | 0 .../editorActions/smartEnter/CatchDeclarationFixer.java | 0 .../smartEnter/CommentBreakerEnterProcessor.java | 0 .../codeInsight/editorActions/smartEnter/CompletionFixer.java | 0 .../editorActions/smartEnter/DoWhileConditionFixer.java | 0 .../codeInsight/editorActions/smartEnter/EnterProcessor.java | 0 .../codeInsight/editorActions/smartEnter/EnumFieldFixer.java | 0 .../intellij/codeInsight/editorActions/smartEnter/Fixer.java | 0 .../editorActions/smartEnter/IfConditionFixer.java | 0 .../editorActions/smartEnter/JavaSmartEnterProcessor.java | 0 .../codeInsight/editorActions/smartEnter/LiteralFixer.java | 0 .../codeInsight/editorActions/smartEnter/MethodCallFixer.java | 0 .../smartEnter/MissingArrayInitializerBraceFixer.java | 0 .../editorActions/smartEnter/MissingCatchBodyFixer.java | 0 .../editorActions/smartEnter/MissingForBodyFixer.java | 0 .../editorActions/smartEnter/MissingForeachBodyFixer.java | 0 .../editorActions/smartEnter/MissingIfBranchesFixer.java | 0 .../editorActions/smartEnter/MissingMethodBodyFixer.java | 0 .../smartEnter/MissingReturnExpressionFixer.java | 0 .../editorActions/smartEnter/MissingSwitchBodyFixer.java | 0 .../smartEnter/MissingSynchronizedBodyFixer.java | 0 .../editorActions/smartEnter/MissingThrowExpressionFixer.java | 0 .../editorActions/smartEnter/MissingWhileBodyFixer.java | 0 .../editorActions/smartEnter/ParameterListFixer.java | 0 .../editorActions/smartEnter/ParenthesizedFixer.java | 0 .../editorActions/smartEnter/PlainEnterProcessor.java | 0 .../codeInsight/editorActions/smartEnter/SemicolonFixer.java | 0 .../editorActions/smartEnter/SwitchExpressionFixer.java | 0 .../editorActions/smartEnter/WhileConditionFixer.java | 0 .../codeInsight/editorActions/smartEnter/XmlTagFixer.java | 0 .../wordSelection/AntLikePropertySelectionHandler.java | 0 .../editorActions/wordSelection/BasicSelectioner.java | 0 .../wordSelection/CaseStatementsSelectioner.java | 0 .../wordSelection/CodeBlockOrInitializerSelectioner.java | 0 .../editorActions/wordSelection/DocCommentSelectioner.java | 0 .../editorActions/wordSelection/DocTagSelectioner.java | 0 .../editorActions/wordSelection/FieldSelectioner.java | 0 .../editorActions/wordSelection/FinallyBlockSelectioner.java | 0 .../editorActions/wordSelection/IfStatementSelectioner.java | 0 .../wordSelection/JavaBasicWordSelectionFilter.java | 0 .../editorActions/wordSelection/JavaTokenSelectioner.java | 0 .../editorActions/wordSelection/ListSelectioner.java | 0 .../editorActions/wordSelection/LiteralSelectioner.java | 0 .../editorActions/wordSelection/MethodOrClassSelectioner.java | 0 .../editorActions/wordSelection/ReferenceSelectioner.java | 0 .../wordSelection/StatementGroupSelectioner.java | 0 .../editorActions/wordSelection/TypeCastSelectioner.java | 0 .../codeInsight/folding/impl/CollapseBlockHandler.java | 0 .../folding/impl/CollapseExpandJavadocsHandler.java | 0 .../codeInsight/folding/impl/JavaCodeFoldingSettingsImpl.java | 0 .../codeInsight/folding/impl/actions/CollapseBlockAction.java | 0 .../folding/impl/actions/CollapseJavadocsAction.java | 0 .../folding/impl/actions/ExpandJavadocsAction.java | 0 .../codeInsight/generation/EncapsulatableClassMember.java | 0 .../generation/GenerateAccessorProviderRegistrar.java | 0 .../codeInsight/generation/GenerateConstructorHandler.java | 0 .../codeInsight/generation/GenerateDelegateHandler.java | 0 .../codeInsight/generation/GenerateEqualsHandler.java | 0 .../intellij/codeInsight/generation/GenerateEqualsHelper.java | 0 .../generation/GenerateFieldOrPropertyHandler.java | 0 .../generation/GenerateGetterAndSetterHandler.java | 0 .../codeInsight/generation/GenerateGetterHandler.java | 0 .../generation/GenerateGetterSetterHandlerBase.java | 0 .../codeInsight/generation/GenerateMembersHandlerBase.java | 0 .../intellij/codeInsight/generation/GenerateMembersUtil.java | 0 .../codeInsight/generation/GenerateSetterHandler.java | 0 .../com/intellij/codeInsight/generation/GenerationInfo.java | 0 .../codeInsight/generation/JavaImplementMethodsHandler.java | 0 .../codeInsight/generation/JavaOverrideMethodsHandler.java | 0 .../codeInsight/generation/OverrideImplementUtil.java | 0 .../generation/OverrideImplementsAnnotationsHandler.java | 0 .../generation/OverrideImplementsAnnotationsHandlerImpl.java | 0 .../generation/PsiDocCommentOwnerMemberChooserObject.java | 0 .../codeInsight/generation/PsiElementClassMember.java | 0 .../com/intellij/codeInsight/generation/PsiFieldMember.java | 0 .../intellij/codeInsight/generation/PsiGenerationInfo.java | 0 .../com/intellij/codeInsight/generation/PsiMethodMember.java | 0 .../codeInsight/generation/TemplateGenerationInfo.java | 0 .../generation/actions/GenerateConstructorAction.java | 0 .../generation/actions/GenerateDelegateAction.java | 0 .../codeInsight/generation/actions/GenerateEqualsAction.java | 0 .../codeInsight/generation/actions/GenerateGetterAction.java | 0 .../generation/actions/GenerateGetterAndSetterAction.java | 0 .../codeInsight/generation/actions/GenerateSetterAction.java | 0 .../generation/actions/GenerateSuperMethodCallAction.java | 0 .../generation/actions/GenerateSuperMethodCallHandler.java | 0 .../surroundWith/JavaExpressionSurroundDescriptor.java | 0 .../surroundWith/JavaStatementsSurroundDescriptor.java | 0 .../generation/surroundWith/JavaStatementsSurrounder.java | 0 .../generation/surroundWith/JavaWithBlockSurrounder.java | 0 .../generation/surroundWith/JavaWithCastSurrounder.java | 0 .../generation/surroundWith/JavaWithDoWhileSurrounder.java | 0 .../generation/surroundWith/JavaWithForSurrounder.java | 0 .../surroundWith/JavaWithIfElseExpressionSurrounder.java | 0 .../generation/surroundWith/JavaWithIfElseSurrounder.java | 0 .../surroundWith/JavaWithIfExpressionSurrounder.java | 0 .../generation/surroundWith/JavaWithIfSurrounder.java | 0 .../surroundWith/JavaWithNotInstanceofSurrounder.java | 0 .../generation/surroundWith/JavaWithNotSurrounder.java | 0 .../surroundWith/JavaWithParenthesesSurrounder.java | 0 .../generation/surroundWith/JavaWithRunnableSurrounder.java | 0 .../surroundWith/JavaWithSynchronizedSurrounder.java | 0 .../surroundWith/JavaWithTryCatchFinallySurrounder.java | 0 .../generation/surroundWith/JavaWithTryCatchSurrounder.java | 0 .../generation/surroundWith/JavaWithTryFinallySurrounder.java | 0 .../generation/surroundWith/JavaWithWhileSurrounder.java | 0 .../codeInsight/generation/surroundWith/SurroundWithUtil.java | 0 .../generation/surroundWith/XmlSurroundWithRangeAdjuster.java | 0 .../codeInsight/generation/ui/GenerateEqualsWizard.java | 0 .../codeInsight/generation/ui/SimpleFieldChooser.java | 0 .../src}/com/intellij/codeInsight/guess/GuessManager.java | 0 .../intellij/codeInsight/guess/impl/DfaInstanceofValue.java | 0 .../codeInsight/guess/impl/ExpressionTypeMemoryState.java | 0 .../com/intellij/codeInsight/guess/impl/GuessManagerImpl.java | 0 .../com/intellij/codeInsight/guess/impl/MethodPattern.java | 0 .../com/intellij/codeInsight/guess/impl/MethodPatternMap.java | 0 .../highlighting/ChooseClassAndDoHighlightRunnable.java | 0 .../codeInsight/highlighting/HighlightExceptionsHandler.java | 0 .../highlighting/HighlightExceptionsHandlerFactory.java | 0 .../codeInsight/highlighting/HighlightExitPointsHandler.java | 0 .../highlighting/HighlightExitPointsHandlerFactory.java | 0 .../highlighting/HighlightOverridingMethodsHandler.java | 0 .../HighlightOverridingMethodsHandlerFactory.java | 0 .../highlighting/HighlightSuppressedWarningsFactory.java | 0 .../highlighting/HighlightSuppressedWarningsHandler.java | 0 .../intellij/codeInsight/highlighting/JavaBraceMatcher.java | 0 .../highlighting/JavaHighlightUsagesDescriptionProvider.java | 0 .../codeInsight/highlighting/JavaReadWriteAccessDetector.java | 0 .../codeInsight/hint/ClassDeclarationRangeHandler.java | 0 .../hint/ClassInitializerDeclarationRangeHandler.java | 0 .../codeInsight/hint/JavaImplementationTextSelectioner.java | 0 .../codeInsight/hint/MethodDeclarationRangeHandler.java | 0 .../intellij/codeInsight/hint/ShowContainerInfoHandler.java | 0 .../codeInsight/hint/actions/ShowContainerInfoAction.java | 0 .../hint/api/impls/AnnotationParameterInfoHandler.java | 0 .../hint/api/impls/MethodParameterInfoHandler.java | 0 .../hint/api/impls/ReferenceParameterInfoHandler.java | 0 .../intention/impl/AddDeprecationAnnotationFix.java | 0 .../codeInsight/intention/impl/AddNotNullAnnotationFix.java | 0 .../codeInsight/intention/impl/AddNullableAnnotationFix.java | 0 .../intention/impl/AddNullableNotNullAnnotationFix.java | 0 .../intention/impl/AddOnDemandStaticImportAction.java | 0 .../intention/impl/AddOverrideAnnotationAction.java | 0 .../intention/impl/AddSingleMemberStaticImportAction.java | 0 .../intention/impl/AssignFieldFromParameterAction.java | 0 .../intention/impl/ColorChooserIntentionAction.java | 0 .../intention/impl/ConcatenationToMessageFormatAction.java | 0 .../impl/CopyAbstractMethodImplementationAction.java | 0 .../impl/CopyAbstractMethodImplementationHandler.java | 0 .../codeInsight/intention/impl/CreateClassDialog.java | 0 .../intention/impl/CreateFieldFromParameterAction.java | 0 .../intention/impl/CreateFieldFromParameterDialog.java | 0 .../codeInsight/intention/impl/CreateSubclassAction.java | 0 .../codeInsight/intention/impl/DeannotateIntentionAction.java | 0 .../intention/impl/ImplementAbstractMethodAction.java | 0 .../intention/impl/ImplementAbstractMethodHandler.java | 0 .../codeInsight/intention/impl/InvertIfConditionAction.java | 0 .../codeInsight/intention/impl/MakeTypeGenericAction.java | 0 .../impl/MoveFieldAssignmentToInitializerAction.java | 0 .../intention/impl/MoveInitializerToConstructorAction.java | 0 .../intention/impl/SimplifyBooleanExpressionAction.java | 0 .../codeInsight/intention/impl/SplitDeclarationAction.java | 0 .../intellij/codeInsight/intention/impl/SplitIfAction.java | 0 .../intellij/codeInsight/intention/impl/TypeExpression.java | 0 .../intention/impl/config/QuickFixFactoryImpl.java | 0 .../src}/com/intellij/codeInsight/javadoc/ColorUtil.java | 0 .../intellij/codeInsight/javadoc/JavaDocExternalFilter.java | 0 .../intellij/codeInsight/javadoc/JavaDocInfoGenerator.java | 0 .../src}/com/intellij/codeInsight/javadoc/JavaDocUtil.java | 0 .../com/intellij/codeInsight/lookup/ExpressionLookupItem.java | 0 .../com/intellij/codeInsight/lookup/KeywordLookupItem.java | 0 .../src}/com/intellij/codeInsight/lookup/LookupItemUtil.java | 0 .../com/intellij/codeInsight/lookup/PsiTypeLookupItem.java | 0 .../src}/com/intellij/codeInsight/lookup/TypedLookupItem.java | 0 .../codeInsight/navigation/ClassImplementationsSearch.java | 0 .../intellij/codeInsight/navigation/JavaGotoSuperHandler.java | 0 .../navigation/JavaMethodNavigationOffsetProvider.java | 0 .../codeInsight/navigation/MethodImplementationsSearch.java | 0 .../navigation/actions/GotoBreakContinueHandler.java | 0 .../navigation/actions/JavaTypeDeclarationProvider.java | 0 .../com/intellij/codeInsight/template/ExpressionUtil.java | 0 .../intellij/codeInsight/template/JavaCodeContextType.java | 0 .../intellij/codeInsight/template/JavaCommentContextType.java | 0 .../intellij/codeInsight/template/JavaPsiElementResult.java | 0 .../intellij/codeInsight/template/JavaStringContextType.java | 0 .../src}/com/intellij/codeInsight/template/PsiTypeResult.java | 0 .../codeInsight/template/SmartCompletionContextType.java | 0 .../template/impl/JavaTemplateLookupSelectionHandler.java | 0 .../intellij/codeInsight/template/impl/JavaTemplateUtil.java | 0 .../codeInsight/template/impl/ShortenFQNamesProcessor.java | 0 .../intellij/codeInsight/template/impl/TextExpression.java | 0 .../intellij/codeInsight/template/macro/AnnotatedMacro.java | 0 .../codeInsight/template/macro/ArrayVariableMacro.java | 0 .../codeInsight/template/macro/CastToLeftSideTypeMacro.java | 0 .../intellij/codeInsight/template/macro/ClassNameMacro.java | 0 .../codeInsight/template/macro/ComponentTypeOfMacro.java | 0 .../codeInsight/template/macro/CurrentPackageMacro.java | 0 .../template/macro/DescendantClassesEnumMacro.java | 0 .../com/intellij/codeInsight/template/macro/EnumMacro.java | 0 .../codeInsight/template/macro/ExpectedTypeMacro.java | 0 .../codeInsight/template/macro/GroovyScriptMacro.java | 0 .../codeInsight/template/macro/GuessElementTypeMacro.java | 0 .../template/macro/IterableComponentTypeMacro.java | 0 .../codeInsight/template/macro/IterableVariableMacro.java | 0 .../template/macro/JavaTemplateCompletionProcessor.java | 0 .../com/intellij/codeInsight/template/macro/MacroUtil.java | 0 .../intellij/codeInsight/template/macro/MethodNameMacro.java | 0 .../codeInsight/template/macro/MethodReturnTypeMacro.java | 0 .../codeInsight/template/macro/QualifiedClassNameMacro.java | 0 .../codeInsight/template/macro/RightSideTypeMacro.java | 0 .../intellij/codeInsight/template/macro/SubtypesMacro.java | 0 .../codeInsight/template/macro/SuggestIndexNameMacro.java | 0 .../codeInsight/template/macro/SuggestVariableNameMacro.java | 0 .../codeInsight/template/macro/TypeOfVariableMacro.java | 0 .../codeInsight/template/macro/VariableOfTypeMacro.java | 0 .../codeInsight/template/macro/VariableTypeMacroBase.java | 0 .../intellij/codeInsight/unwrap/JavaAnonymousUnwrapper.java | 0 .../com/intellij/codeInsight/unwrap/JavaBracesUnwrapper.java | 0 .../com/intellij/codeInsight/unwrap/JavaCatchRemover.java | 0 .../src}/com/intellij/codeInsight/unwrap/JavaElseRemover.java | 0 .../com/intellij/codeInsight/unwrap/JavaElseUnwrapper.java | 0 .../intellij/codeInsight/unwrap/JavaElseUnwrapperBase.java | 0 .../com/intellij/codeInsight/unwrap/JavaForUnwrapper.java | 0 .../src}/com/intellij/codeInsight/unwrap/JavaIfUnwrapper.java | 0 .../codeInsight/unwrap/JavaMethodParameterUnwrapper.java | 0 .../codeInsight/unwrap/JavaSynchronizedUnwrapper.java | 0 .../com/intellij/codeInsight/unwrap/JavaTryUnwrapper.java | 0 .../com/intellij/codeInsight/unwrap/JavaUnwrapDescriptor.java | 0 .../src}/com/intellij/codeInsight/unwrap/JavaUnwrapper.java | 0 .../com/intellij/codeInsight/unwrap/JavaWhileUnwrapper.java | 0 .../com/intellij/ide/actions/JavaQualifiedNameProvider.java | 0 .../src}/com/intellij/psi/AbstractQualifiedReference.java | 0 .../src}/com/intellij/psi/filters/getters/CastTypeGetter.java | 0 .../com/intellij/psi/filters/getters/ClassLiteralGetter.java | 0 .../psi/filters/getters/ClassLiteralLookupElement.java | 0 .../com/intellij/psi/filters/getters/ExpectedTypesGetter.java | 0 .../src}/com/intellij/psi/filters/getters/FilterGetter.java | 0 .../psi/filters/getters/InstanceOfLeftPartTypeGetter.java | 0 .../src}/com/intellij/psi/filters/getters/MembersGetter.java | 0 .../com/intellij/psi/filters/getters/TemplatesGetter.java | 0 .../src}/com/intellij/psi/filters/getters/ThisGetter.java | 0 .../com/intellij/psi/filters/getters/ThrowsListGetter.java | 0 .../psi/impl/source/tree/injected/MyTestInjector.java | 0 459 files changed, 2 insertions(+), 2 deletions(-) rename codeInsight/codeInsight-impl.iml => java/java-impl/java-impl.iml (90%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/ChangeContextUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/CodeInsightUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/ExceptionUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/ExpectedTypeInfo.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/ExpectedTypeInfoImpl.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/ExpectedTypeUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/ExpectedTypesProvider.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/TailTypes.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/TargetElementUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/AllClassesGetter.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/BasicExpressionCompletionContributor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/BasicToClassNameDelegator.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/CastingLookupElementDecorator.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/CompletionBundle.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/DefaultCharFilter.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/DefaultInsertHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/DocAnalyzer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/ExcludeFromCompletionLookupActionProvider.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/ExpectedTypeBasedCompletionProvider.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/ExpressionSmartCompletionContributor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/Java15CompletionData.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/JavaAwareCompletionData.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/JavaChainLookupElement.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/JavaCharFilter.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/JavaClassReferenceCompletionContributor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/JavaCompletionContributor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/JavaCompletionData.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/JavaCompletionFeatures.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/JavaCompletionStatistician.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/JavaCompletionUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/JavaMethodCallElement.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/JavaMethodMergingContributor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/JavaProximityStatistician.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/JavaPsiClassReferenceElement.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/JavaSmartCompletionParameters.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/JavadocAutoLookupHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/LookupHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/ModifierChooser.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/NameEndMatchingDegreeWeigher.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/NullSmartCompletionContributor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/PreferAccessibleWeigher.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/PreferEnumConstantsWeigher.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/PreferExpectedTypeWeigher.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/PreferFieldsAndGettersWeigher.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/PreferLocalVariablesLiteralsAndAnnoMethodsWeigher.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/PreferNonGenericWeigher.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/PreferShorterWeigher.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/PreferSimpleWeigher.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/RecursiveCallParameterWeigher.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/ReferenceExpressionCompletionContributor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/SameWordsWeigher.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/SkipAbstractExpectedTypeWeigher.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/SmartCompletionDecorator.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/StaticMembersWeigher.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/proc/VariablesProcessor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/scope/CompletionElement.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/simple/BracesTailType.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/simple/ParenthesesTailType.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/simple/PsiMethodInsertHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/completion/simple/RParenthTailType.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/JavaErrorMessages.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/GutterIconTooltipHelper.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/IconLineMarkerProvider.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/ImportPopupHectorComponentProvider.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/JavaHightlightInfoTypes.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/JavaReferenceImporter.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/LineMarkerNavigator.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/MarkerType.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/RefCountHolder.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/RemoveSuppressWarningAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/actions/AddImportAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/actions/AddNoInspectionJavaCommentFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/actions/AddSuppressInspectionAllForClassFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/actions/AddSuppressInspectionFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/actions/AddSuppressInspectionForClassFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/analysis/HighlightClassUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/analysis/HighlightMessageUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/analysis/IncreaseLanguageLevelFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/analysis/JavadocErrorFilter.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/AddDefaultConstructorFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToCatchFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToThrowsFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodBodyFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/AddNewArrayExpressionFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/AddReturnFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/AddRuntimeExceptionToThrowsAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/AddVariableInitializerFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/ArgumentFixerActionFactory.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CastMethodArgumentFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/ChangeExtendsToImplementsFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/ChangeNewOperatorTypeFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/ChangeParameterClassFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/ChangeStringLiteralToCharInMethodCallFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/ConstructorParametersFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/ConvertReturnStatementsVisitor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateCastExpressionFromInstanceofAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromUsageBaseFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromUsageFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassKind.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstantFieldFromUsageFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromCallFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromSuperFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromThisFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromThisOrSuperFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorMatchingSuperFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateEnumConstantFromUsageFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateFieldFromUsageFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromNewFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalFromUsageFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalVarFromInstanceofAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodQuickFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateParameterFromUsageFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreatePropertyFromUsageFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/CreateVarFromUsageFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/DeclarationSearcher.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/DefaultQuickFixProvider.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/DeferFinalAssignmentFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/DeleteCatchFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/DeleteMethodBodyFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/EnableOptimizeImportsOnTheFlyFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/ExtendsListFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/GeneralizeCatchFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/GenerifyFileFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/ImplementMethodsFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/InsertNewFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/InsertSuperFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/LocateLibraryDialog.form (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/LocateLibraryDialog.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/MakeClassInterfaceFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/MakeMethodConstructorFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/MakeVarargParameterLastFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/MethodArgumentFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/MethodParameterFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnBooleanFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/MethodThrowsFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/ModifierFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/MoveBoundClassToFrontFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/MoveCatchUpFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToModuleFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToSeparateFileFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/NegationBroadScopeFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/OptimizeImportsFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/PermuteArgumentsFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/RemoveNewQualifierFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/RemoveQualifierFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/RemoveRedundantElseAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedParameterFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceAddAllArrayToCollectionFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/ReuseVariableDeclarationFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/SafeDeleteFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/SetupJDKFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/ShowModulePropertiesFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/SideEffectWarningDialog.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMethodFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/SuperMethodReturnFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithArrayFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithTryCatchFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/VariableArrayTypeFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/VariableParameterizedTypeFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeQuickFixProvider.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/impl/quickfix/WrapExpressionFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/quickFix/CreateClassOrPackageFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/daemon/quickFix/CreateFieldOrPropertyFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/CopyPasteReferenceProcessor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/DeclarationJoinLinesHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/JavaBackspaceHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/JavaQuoteHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/JavaTypedHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/JavaTypedHandlerUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/LiteralJoinLinesHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/ReferenceTransferableData.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/RestoreReferencesDialog.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/StringLiteralCopyPasteProcessor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/moveUpDown/DeclarationMover.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/moveUpDown/StatementMover.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/AfterSemicolonEnterProcessor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/BlockBraceFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/BreakingControlFlowEnterProcessor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/CatchDeclarationFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/CommentBreakerEnterProcessor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/CompletionFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/DoWhileConditionFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/EnterProcessor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/EnumFieldFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/Fixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/IfConditionFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/LiteralFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/MethodCallFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/MissingArrayInitializerBraceFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/MissingCatchBodyFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/MissingForBodyFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/MissingForeachBodyFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/MissingIfBranchesFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/MissingMethodBodyFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/MissingReturnExpressionFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/MissingSwitchBodyFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/MissingSynchronizedBodyFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/MissingThrowExpressionFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/MissingWhileBodyFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/ParameterListFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/ParenthesizedFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/PlainEnterProcessor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/SemicolonFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/SwitchExpressionFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/WhileConditionFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/smartEnter/XmlTagFixer.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/wordSelection/AntLikePropertySelectionHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/wordSelection/BasicSelectioner.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/wordSelection/CaseStatementsSelectioner.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/wordSelection/CodeBlockOrInitializerSelectioner.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/wordSelection/DocCommentSelectioner.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/wordSelection/DocTagSelectioner.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/wordSelection/FieldSelectioner.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/wordSelection/FinallyBlockSelectioner.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/wordSelection/IfStatementSelectioner.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/wordSelection/JavaBasicWordSelectionFilter.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/wordSelection/JavaTokenSelectioner.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/wordSelection/ListSelectioner.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/wordSelection/LiteralSelectioner.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/wordSelection/ReferenceSelectioner.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/wordSelection/StatementGroupSelectioner.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/editorActions/wordSelection/TypeCastSelectioner.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/folding/impl/CollapseBlockHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/folding/impl/CollapseExpandJavadocsHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/folding/impl/JavaCodeFoldingSettingsImpl.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/folding/impl/actions/CollapseBlockAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/folding/impl/actions/CollapseJavadocsAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/folding/impl/actions/ExpandJavadocsAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/EncapsulatableClassMember.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/GenerateAccessorProviderRegistrar.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/GenerateConstructorHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/GenerateDelegateHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/GenerateEqualsHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/GenerateEqualsHelper.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/GenerateFieldOrPropertyHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/GenerateGetterAndSetterHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/GenerateGetterHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/GenerateGetterSetterHandlerBase.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/GenerateMembersUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/GenerateSetterHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/GenerationInfo.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/JavaImplementMethodsHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/JavaOverrideMethodsHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/OverrideImplementUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/OverrideImplementsAnnotationsHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/OverrideImplementsAnnotationsHandlerImpl.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/PsiDocCommentOwnerMemberChooserObject.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/PsiElementClassMember.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/PsiFieldMember.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/PsiGenerationInfo.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/PsiMethodMember.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/TemplateGenerationInfo.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/actions/GenerateConstructorAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/actions/GenerateDelegateAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/actions/GenerateEqualsAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/actions/GenerateGetterAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/actions/GenerateGetterAndSetterAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/actions/GenerateSetterAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/actions/GenerateSuperMethodCallAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/actions/GenerateSuperMethodCallHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaExpressionSurroundDescriptor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaStatementsSurroundDescriptor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaStatementsSurrounder.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaWithBlockSurrounder.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaWithCastSurrounder.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaWithDoWhileSurrounder.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaWithForSurrounder.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaWithIfElseExpressionSurrounder.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaWithIfElseSurrounder.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaWithIfExpressionSurrounder.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaWithIfSurrounder.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaWithNotInstanceofSurrounder.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaWithNotSurrounder.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaWithParenthesesSurrounder.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaWithRunnableSurrounder.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaWithSynchronizedSurrounder.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaWithTryCatchFinallySurrounder.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaWithTryCatchSurrounder.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaWithTryFinallySurrounder.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/JavaWithWhileSurrounder.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/SurroundWithUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/surroundWith/XmlSurroundWithRangeAdjuster.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/ui/GenerateEqualsWizard.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/generation/ui/SimpleFieldChooser.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/guess/GuessManager.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/guess/impl/DfaInstanceofValue.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/guess/impl/ExpressionTypeMemoryState.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/guess/impl/GuessManagerImpl.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/guess/impl/MethodPattern.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/guess/impl/MethodPatternMap.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/highlighting/ChooseClassAndDoHighlightRunnable.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/highlighting/HighlightExceptionsHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/highlighting/HighlightExceptionsHandlerFactory.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/highlighting/HighlightExitPointsHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/highlighting/HighlightExitPointsHandlerFactory.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/highlighting/HighlightOverridingMethodsHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/highlighting/HighlightOverridingMethodsHandlerFactory.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/highlighting/HighlightSuppressedWarningsFactory.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/highlighting/HighlightSuppressedWarningsHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/highlighting/JavaBraceMatcher.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/highlighting/JavaHighlightUsagesDescriptionProvider.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/highlighting/JavaReadWriteAccessDetector.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/hint/ClassDeclarationRangeHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/hint/ClassInitializerDeclarationRangeHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/hint/JavaImplementationTextSelectioner.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/hint/MethodDeclarationRangeHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/hint/ShowContainerInfoHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/hint/actions/ShowContainerInfoAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/hint/api/impls/AnnotationParameterInfoHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/hint/api/impls/ReferenceParameterInfoHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/AddDeprecationAnnotationFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/AddNotNullAnnotationFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/AddNullableAnnotationFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/AddNullableNotNullAnnotationFix.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/AddOverrideAnnotationAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/AssignFieldFromParameterAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/ColorChooserIntentionAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/ConcatenationToMessageFormatAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/CreateClassDialog.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterDialog.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/CreateSubclassAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/DeannotateIntentionAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/MakeTypeGenericAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/MoveFieldAssignmentToInitializerAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/MoveInitializerToConstructorAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/SimplifyBooleanExpressionAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/SplitIfAction.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/TypeExpression.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/javadoc/ColorUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/javadoc/JavaDocExternalFilter.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/javadoc/JavaDocUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/lookup/ExpressionLookupItem.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/lookup/KeywordLookupItem.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/lookup/LookupItemUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/lookup/PsiTypeLookupItem.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/lookup/TypedLookupItem.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/navigation/ClassImplementationsSearch.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/navigation/JavaGotoSuperHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/navigation/JavaMethodNavigationOffsetProvider.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/navigation/MethodImplementationsSearch.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/navigation/actions/GotoBreakContinueHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/navigation/actions/JavaTypeDeclarationProvider.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/ExpressionUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/JavaCodeContextType.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/JavaCommentContextType.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/JavaPsiElementResult.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/JavaStringContextType.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/PsiTypeResult.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/SmartCompletionContextType.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/impl/JavaTemplateLookupSelectionHandler.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/impl/JavaTemplateUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/impl/ShortenFQNamesProcessor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/impl/TextExpression.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/AnnotatedMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/ArrayVariableMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/CastToLeftSideTypeMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/ClassNameMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/ComponentTypeOfMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/CurrentPackageMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/DescendantClassesEnumMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/EnumMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/ExpectedTypeMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/GroovyScriptMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/GuessElementTypeMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/IterableComponentTypeMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/IterableVariableMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/JavaTemplateCompletionProcessor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/MacroUtil.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/MethodNameMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/MethodReturnTypeMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/QualifiedClassNameMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/RightSideTypeMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/SubtypesMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/SuggestIndexNameMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/SuggestVariableNameMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/TypeOfVariableMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/VariableOfTypeMacro.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/template/macro/VariableTypeMacroBase.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/unwrap/JavaAnonymousUnwrapper.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/unwrap/JavaBracesUnwrapper.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/unwrap/JavaCatchRemover.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/unwrap/JavaElseRemover.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/unwrap/JavaElseUnwrapper.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/unwrap/JavaElseUnwrapperBase.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/unwrap/JavaForUnwrapper.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/unwrap/JavaIfUnwrapper.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/unwrap/JavaMethodParameterUnwrapper.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/unwrap/JavaSynchronizedUnwrapper.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/unwrap/JavaTryUnwrapper.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/unwrap/JavaUnwrapDescriptor.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/unwrap/JavaUnwrapper.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/codeInsight/unwrap/JavaWhileUnwrapper.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/ide/actions/JavaQualifiedNameProvider.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/psi/AbstractQualifiedReference.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/psi/filters/getters/CastTypeGetter.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/psi/filters/getters/ClassLiteralGetter.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/psi/filters/getters/ClassLiteralLookupElement.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/psi/filters/getters/ExpectedTypesGetter.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/psi/filters/getters/FilterGetter.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/psi/filters/getters/InstanceOfLeftPartTypeGetter.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/psi/filters/getters/MembersGetter.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/psi/filters/getters/TemplatesGetter.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/psi/filters/getters/ThisGetter.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/psi/filters/getters/ThrowsListGetter.java (100%) rename {codeInsight/impl => java/java-impl/src}/com/intellij/psi/impl/source/tree/injected/MyTestInjector.java (100%) diff --git a/codeInsight/codeInsight-impl.iml b/java/java-impl/java-impl.iml similarity index 90% rename from codeInsight/codeInsight-impl.iml rename to java/java-impl/java-impl.iml index 1d5f354829d1..0f4b02ae18cd 100644 --- a/codeInsight/codeInsight-impl.iml +++ b/java/java-impl/java-impl.iml @@ -2,8 +2,8 @@ - - + + diff --git a/codeInsight/impl/com/intellij/codeInsight/ChangeContextUtil.java b/java/java-impl/src/com/intellij/codeInsight/ChangeContextUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/ChangeContextUtil.java rename to java/java-impl/src/com/intellij/codeInsight/ChangeContextUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/CodeInsightUtil.java b/java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/CodeInsightUtil.java rename to java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/ExceptionUtil.java b/java/java-impl/src/com/intellij/codeInsight/ExceptionUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/ExceptionUtil.java rename to java/java-impl/src/com/intellij/codeInsight/ExceptionUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/ExpectedTypeInfo.java b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfo.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/ExpectedTypeInfo.java rename to java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfo.java diff --git a/codeInsight/impl/com/intellij/codeInsight/ExpectedTypeInfoImpl.java b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfoImpl.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/ExpectedTypeInfoImpl.java rename to java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfoImpl.java diff --git a/codeInsight/impl/com/intellij/codeInsight/ExpectedTypeUtil.java b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/ExpectedTypeUtil.java rename to java/java-impl/src/com/intellij/codeInsight/ExpectedTypeUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/ExpectedTypesProvider.java b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/ExpectedTypesProvider.java rename to java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java diff --git a/codeInsight/impl/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java b/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java rename to java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java diff --git a/codeInsight/impl/com/intellij/codeInsight/TailTypes.java b/java/java-impl/src/com/intellij/codeInsight/TailTypes.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/TailTypes.java rename to java/java-impl/src/com/intellij/codeInsight/TailTypes.java diff --git a/codeInsight/impl/com/intellij/codeInsight/TargetElementUtil.java b/java/java-impl/src/com/intellij/codeInsight/TargetElementUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/TargetElementUtil.java rename to java/java-impl/src/com/intellij/codeInsight/TargetElementUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/AllClassesGetter.java b/java/java-impl/src/com/intellij/codeInsight/completion/AllClassesGetter.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/AllClassesGetter.java rename to java/java-impl/src/com/intellij/codeInsight/completion/AllClassesGetter.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/BasicExpressionCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/BasicExpressionCompletionContributor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/BasicExpressionCompletionContributor.java rename to java/java-impl/src/com/intellij/codeInsight/completion/BasicExpressionCompletionContributor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/BasicToClassNameDelegator.java b/java/java-impl/src/com/intellij/codeInsight/completion/BasicToClassNameDelegator.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/BasicToClassNameDelegator.java rename to java/java-impl/src/com/intellij/codeInsight/completion/BasicToClassNameDelegator.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/CastingLookupElementDecorator.java b/java/java-impl/src/com/intellij/codeInsight/completion/CastingLookupElementDecorator.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/CastingLookupElementDecorator.java rename to java/java-impl/src/com/intellij/codeInsight/completion/CastingLookupElementDecorator.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/CompletionBundle.java b/java/java-impl/src/com/intellij/codeInsight/completion/CompletionBundle.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/CompletionBundle.java rename to java/java-impl/src/com/intellij/codeInsight/completion/CompletionBundle.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/DefaultCharFilter.java b/java/java-impl/src/com/intellij/codeInsight/completion/DefaultCharFilter.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/DefaultCharFilter.java rename to java/java-impl/src/com/intellij/codeInsight/completion/DefaultCharFilter.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/DefaultInsertHandler.java b/java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/DefaultInsertHandler.java rename to java/java-impl/src/com/intellij/codeInsight/completion/DefaultInsertHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/DocAnalyzer.java b/java/java-impl/src/com/intellij/codeInsight/completion/DocAnalyzer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/DocAnalyzer.java rename to java/java-impl/src/com/intellij/codeInsight/completion/DocAnalyzer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/ExcludeFromCompletionLookupActionProvider.java b/java/java-impl/src/com/intellij/codeInsight/completion/ExcludeFromCompletionLookupActionProvider.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/ExcludeFromCompletionLookupActionProvider.java rename to java/java-impl/src/com/intellij/codeInsight/completion/ExcludeFromCompletionLookupActionProvider.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/ExpectedTypeBasedCompletionProvider.java b/java/java-impl/src/com/intellij/codeInsight/completion/ExpectedTypeBasedCompletionProvider.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/ExpectedTypeBasedCompletionProvider.java rename to java/java-impl/src/com/intellij/codeInsight/completion/ExpectedTypeBasedCompletionProvider.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/ExpressionSmartCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/ExpressionSmartCompletionContributor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/ExpressionSmartCompletionContributor.java rename to java/java-impl/src/com/intellij/codeInsight/completion/ExpressionSmartCompletionContributor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/Java15CompletionData.java b/java/java-impl/src/com/intellij/codeInsight/completion/Java15CompletionData.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/Java15CompletionData.java rename to java/java-impl/src/com/intellij/codeInsight/completion/Java15CompletionData.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/JavaAwareCompletionData.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaAwareCompletionData.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/JavaAwareCompletionData.java rename to java/java-impl/src/com/intellij/codeInsight/completion/JavaAwareCompletionData.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/JavaChainLookupElement.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaChainLookupElement.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/JavaChainLookupElement.java rename to java/java-impl/src/com/intellij/codeInsight/completion/JavaChainLookupElement.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/JavaCharFilter.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCharFilter.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/JavaCharFilter.java rename to java/java-impl/src/com/intellij/codeInsight/completion/JavaCharFilter.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java rename to java/java-impl/src/com/intellij/codeInsight/completion/JavaClassNameCompletionContributor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/JavaClassReferenceCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaClassReferenceCompletionContributor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/JavaClassReferenceCompletionContributor.java rename to java/java-impl/src/com/intellij/codeInsight/completion/JavaClassReferenceCompletionContributor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/JavaCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/JavaCompletionContributor.java rename to java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionContributor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/JavaCompletionData.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/JavaCompletionData.java rename to java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/JavaCompletionFeatures.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionFeatures.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/JavaCompletionFeatures.java rename to java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionFeatures.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/JavaCompletionStatistician.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionStatistician.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/JavaCompletionStatistician.java rename to java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionStatistician.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/JavaCompletionUtil.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/JavaCompletionUtil.java rename to java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java rename to java/java-impl/src/com/intellij/codeInsight/completion/JavaDocCompletionContributor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java rename to java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/JavaMethodCallElement.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodCallElement.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/JavaMethodCallElement.java rename to java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodCallElement.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/JavaMethodMergingContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodMergingContributor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/JavaMethodMergingContributor.java rename to java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodMergingContributor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/JavaProximityStatistician.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaProximityStatistician.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/JavaProximityStatistician.java rename to java/java-impl/src/com/intellij/codeInsight/completion/JavaProximityStatistician.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/JavaPsiClassReferenceElement.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaPsiClassReferenceElement.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/JavaPsiClassReferenceElement.java rename to java/java-impl/src/com/intellij/codeInsight/completion/JavaPsiClassReferenceElement.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java rename to java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionContributor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/JavaSmartCompletionParameters.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionParameters.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/JavaSmartCompletionParameters.java rename to java/java-impl/src/com/intellij/codeInsight/completion/JavaSmartCompletionParameters.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/JavadocAutoLookupHandler.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavadocAutoLookupHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/JavadocAutoLookupHandler.java rename to java/java-impl/src/com/intellij/codeInsight/completion/JavadocAutoLookupHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/LookupHandler.java b/java/java-impl/src/com/intellij/codeInsight/completion/LookupHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/LookupHandler.java rename to java/java-impl/src/com/intellij/codeInsight/completion/LookupHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/ModifierChooser.java b/java/java-impl/src/com/intellij/codeInsight/completion/ModifierChooser.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/ModifierChooser.java rename to java/java-impl/src/com/intellij/codeInsight/completion/ModifierChooser.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/NameEndMatchingDegreeWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/NameEndMatchingDegreeWeigher.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/NameEndMatchingDegreeWeigher.java rename to java/java-impl/src/com/intellij/codeInsight/completion/NameEndMatchingDegreeWeigher.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/NullSmartCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/NullSmartCompletionContributor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/NullSmartCompletionContributor.java rename to java/java-impl/src/com/intellij/codeInsight/completion/NullSmartCompletionContributor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/PreferAccessibleWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferAccessibleWeigher.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/PreferAccessibleWeigher.java rename to java/java-impl/src/com/intellij/codeInsight/completion/PreferAccessibleWeigher.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/PreferEnumConstantsWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferEnumConstantsWeigher.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/PreferEnumConstantsWeigher.java rename to java/java-impl/src/com/intellij/codeInsight/completion/PreferEnumConstantsWeigher.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/PreferExpectedTypeWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferExpectedTypeWeigher.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/PreferExpectedTypeWeigher.java rename to java/java-impl/src/com/intellij/codeInsight/completion/PreferExpectedTypeWeigher.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/PreferFieldsAndGettersWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferFieldsAndGettersWeigher.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/PreferFieldsAndGettersWeigher.java rename to java/java-impl/src/com/intellij/codeInsight/completion/PreferFieldsAndGettersWeigher.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/PreferLocalVariablesLiteralsAndAnnoMethodsWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferLocalVariablesLiteralsAndAnnoMethodsWeigher.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/PreferLocalVariablesLiteralsAndAnnoMethodsWeigher.java rename to java/java-impl/src/com/intellij/codeInsight/completion/PreferLocalVariablesLiteralsAndAnnoMethodsWeigher.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/PreferNonGenericWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferNonGenericWeigher.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/PreferNonGenericWeigher.java rename to java/java-impl/src/com/intellij/codeInsight/completion/PreferNonGenericWeigher.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/PreferShorterWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferShorterWeigher.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/PreferShorterWeigher.java rename to java/java-impl/src/com/intellij/codeInsight/completion/PreferShorterWeigher.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/PreferSimpleWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferSimpleWeigher.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/PreferSimpleWeigher.java rename to java/java-impl/src/com/intellij/codeInsight/completion/PreferSimpleWeigher.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/RecursiveCallParameterWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/RecursiveCallParameterWeigher.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/RecursiveCallParameterWeigher.java rename to java/java-impl/src/com/intellij/codeInsight/completion/RecursiveCallParameterWeigher.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/ReferenceExpressionCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/ReferenceExpressionCompletionContributor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/ReferenceExpressionCompletionContributor.java rename to java/java-impl/src/com/intellij/codeInsight/completion/ReferenceExpressionCompletionContributor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/SameWordsWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/SameWordsWeigher.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/SameWordsWeigher.java rename to java/java-impl/src/com/intellij/codeInsight/completion/SameWordsWeigher.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/SkipAbstractExpectedTypeWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/SkipAbstractExpectedTypeWeigher.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/SkipAbstractExpectedTypeWeigher.java rename to java/java-impl/src/com/intellij/codeInsight/completion/SkipAbstractExpectedTypeWeigher.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/SmartCompletionDecorator.java b/java/java-impl/src/com/intellij/codeInsight/completion/SmartCompletionDecorator.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/SmartCompletionDecorator.java rename to java/java-impl/src/com/intellij/codeInsight/completion/SmartCompletionDecorator.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/StaticMembersWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/StaticMembersWeigher.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/StaticMembersWeigher.java rename to java/java-impl/src/com/intellij/codeInsight/completion/StaticMembersWeigher.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/proc/VariablesProcessor.java b/java/java-impl/src/com/intellij/codeInsight/completion/proc/VariablesProcessor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/proc/VariablesProcessor.java rename to java/java-impl/src/com/intellij/codeInsight/completion/proc/VariablesProcessor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/scope/CompletionElement.java b/java/java-impl/src/com/intellij/codeInsight/completion/scope/CompletionElement.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/scope/CompletionElement.java rename to java/java-impl/src/com/intellij/codeInsight/completion/scope/CompletionElement.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java b/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java rename to java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/simple/BracesTailType.java b/java/java-impl/src/com/intellij/codeInsight/completion/simple/BracesTailType.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/simple/BracesTailType.java rename to java/java-impl/src/com/intellij/codeInsight/completion/simple/BracesTailType.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/simple/ParenthesesTailType.java b/java/java-impl/src/com/intellij/codeInsight/completion/simple/ParenthesesTailType.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/simple/ParenthesesTailType.java rename to java/java-impl/src/com/intellij/codeInsight/completion/simple/ParenthesesTailType.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/simple/PsiMethodInsertHandler.java b/java/java-impl/src/com/intellij/codeInsight/completion/simple/PsiMethodInsertHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/simple/PsiMethodInsertHandler.java rename to java/java-impl/src/com/intellij/codeInsight/completion/simple/PsiMethodInsertHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/completion/simple/RParenthTailType.java b/java/java-impl/src/com/intellij/codeInsight/completion/simple/RParenthTailType.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/completion/simple/RParenthTailType.java rename to java/java-impl/src/com/intellij/codeInsight/completion/simple/RParenthTailType.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/JavaErrorMessages.java b/java/java-impl/src/com/intellij/codeInsight/daemon/JavaErrorMessages.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/JavaErrorMessages.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/JavaErrorMessages.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/GutterIconTooltipHelper.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/GutterIconTooltipHelper.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/GutterIconTooltipHelper.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/GutterIconTooltipHelper.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/IconLineMarkerProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/IconLineMarkerProvider.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/IconLineMarkerProvider.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/IconLineMarkerProvider.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/ImportPopupHectorComponentProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/ImportPopupHectorComponentProvider.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/ImportPopupHectorComponentProvider.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/ImportPopupHectorComponentProvider.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/JavaHightlightInfoTypes.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaHightlightInfoTypes.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/JavaHightlightInfoTypes.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaHightlightInfoTypes.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/JavaReferenceImporter.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaReferenceImporter.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/JavaReferenceImporter.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaReferenceImporter.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/LineMarkerNavigator.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkerNavigator.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/LineMarkerNavigator.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/LineMarkerNavigator.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/MarkerType.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/MarkerType.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/RefCountHolder.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/RefCountHolder.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/RefCountHolder.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/RefCountHolder.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/RemoveSuppressWarningAction.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/RemoveSuppressWarningAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/RemoveSuppressWarningAction.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/RemoveSuppressWarningAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/actions/AddImportAction.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/AddImportAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/actions/AddImportAction.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/AddImportAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/actions/AddNoInspectionJavaCommentFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/AddNoInspectionJavaCommentFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/actions/AddNoInspectionJavaCommentFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/AddNoInspectionJavaCommentFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/actions/AddSuppressInspectionAllForClassFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/AddSuppressInspectionAllForClassFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/actions/AddSuppressInspectionAllForClassFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/AddSuppressInspectionAllForClassFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/actions/AddSuppressInspectionFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/AddSuppressInspectionFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/actions/AddSuppressInspectionFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/AddSuppressInspectionFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/actions/AddSuppressInspectionForClassFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/AddSuppressInspectionForClassFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/actions/AddSuppressInspectionForClassFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/actions/AddSuppressInspectionForClassFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/HighlightClassUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightClassUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/HighlightClassUtil.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightClassUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/HighlightMessageUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMessageUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/HighlightMessageUtil.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMessageUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightNamesUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/IncreaseLanguageLevelFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/IncreaseLanguageLevelFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/IncreaseLanguageLevelFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/IncreaseLanguageLevelFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/JavadocErrorFilter.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/JavadocErrorFilter.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/analysis/JavadocErrorFilter.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/JavadocErrorFilter.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddDefaultConstructorFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddDefaultConstructorFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddDefaultConstructorFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddDefaultConstructorFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToCatchFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToCatchFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToCatchFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToCatchFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToThrowsFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToThrowsFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToThrowsFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToThrowsFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodBodyFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodBodyFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodBodyFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodBodyFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddNewArrayExpressionFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddNewArrayExpressionFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddNewArrayExpressionFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddNewArrayExpressionFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddReturnFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddReturnFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddReturnFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddReturnFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddRuntimeExceptionToThrowsAction.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddRuntimeExceptionToThrowsAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddRuntimeExceptionToThrowsAction.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddRuntimeExceptionToThrowsAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeArgumentsFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddVariableInitializerFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddVariableInitializerFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/AddVariableInitializerFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddVariableInitializerFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ArgumentFixerActionFactory.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ArgumentFixerActionFactory.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ArgumentFixerActionFactory.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ArgumentFixerActionFactory.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/BringVariableIntoScopeFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CastMethodArgumentFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CastMethodArgumentFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CastMethodArgumentFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CastMethodArgumentFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ChangeExtendsToImplementsFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeExtendsToImplementsFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ChangeExtendsToImplementsFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeExtendsToImplementsFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ChangeNewOperatorTypeFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeNewOperatorTypeFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ChangeNewOperatorTypeFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeNewOperatorTypeFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ChangeParameterClassFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeParameterClassFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ChangeParameterClassFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeParameterClassFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ChangeStringLiteralToCharInMethodCallFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeStringLiteralToCharInMethodCallFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ChangeStringLiteralToCharInMethodCallFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeStringLiteralToCharInMethodCallFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ConstructorParametersFixer.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConstructorParametersFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ConstructorParametersFixer.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConstructorParametersFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ConvertReturnStatementsVisitor.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertReturnStatementsVisitor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ConvertReturnStatementsVisitor.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertReturnStatementsVisitor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateCastExpressionFromInstanceofAction.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateCastExpressionFromInstanceofAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateCastExpressionFromInstanceofAction.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateCastExpressionFromInstanceofAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromUsageBaseFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromUsageBaseFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromUsageBaseFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromUsageBaseFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromUsageFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromUsageFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromUsageFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassKind.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassKind.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassKind.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassKind.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstantFieldFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstantFieldFromUsageFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstantFieldFromUsageFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstantFieldFromUsageFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromCallFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromCallFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromCallFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromCallFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromSuperFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromSuperFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromSuperFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromSuperFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromThisFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromThisFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromThisFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromThisFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromThisOrSuperFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromThisOrSuperFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromThisOrSuperFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorFromThisOrSuperFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorMatchingSuperFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorMatchingSuperFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorMatchingSuperFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorMatchingSuperFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateEnumConstantFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateEnumConstantFromUsageFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateEnumConstantFromUsageFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateEnumConstantFromUsageFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateFieldFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFieldFromUsageFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateFieldFromUsageFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFieldFromUsageFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromNewFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromNewFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromNewFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromNewFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalFromUsageFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalFromUsageFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalFromUsageFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalVarFromInstanceofAction.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalVarFromInstanceofAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalVarFromInstanceofAction.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateLocalVarFromInstanceofAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodFromUsageFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodQuickFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodQuickFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodQuickFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateMethodQuickFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateParameterFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateParameterFromUsageFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateParameterFromUsageFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateParameterFromUsageFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreatePropertyFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreatePropertyFromUsageFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreatePropertyFromUsageFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreatePropertyFromUsageFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateVarFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateVarFromUsageFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/CreateVarFromUsageFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateVarFromUsageFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/DeclarationSearcher.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeclarationSearcher.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/DeclarationSearcher.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeclarationSearcher.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/DefaultQuickFixProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefaultQuickFixProvider.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/DefaultQuickFixProvider.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefaultQuickFixProvider.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/DeferFinalAssignmentFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeferFinalAssignmentFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/DeferFinalAssignmentFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeferFinalAssignmentFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/DeleteCatchFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteCatchFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/DeleteCatchFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteCatchFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/DeleteMethodBodyFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteMethodBodyFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/DeleteMethodBodyFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeleteMethodBodyFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/EnableOptimizeImportsOnTheFlyFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/EnableOptimizeImportsOnTheFlyFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/EnableOptimizeImportsOnTheFlyFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/EnableOptimizeImportsOnTheFlyFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ExtendsListFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ExtendsListFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ExtendsListFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ExtendsListFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/GeneralizeCatchFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GeneralizeCatchFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/GeneralizeCatchFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GeneralizeCatchFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/GenerifyFileFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GenerifyFileFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/GenerifyFileFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GenerifyFileFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GuessTypeParameters.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ImplementMethodsFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImplementMethodsFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ImplementMethodsFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImplementMethodsFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/InsertNewFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertNewFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/InsertNewFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertNewFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/InsertSuperFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertSuperFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/InsertSuperFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertSuperFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/LocateLibraryDialog.form b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/LocateLibraryDialog.form similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/LocateLibraryDialog.form rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/LocateLibraryDialog.form diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/LocateLibraryDialog.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/LocateLibraryDialog.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/LocateLibraryDialog.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/LocateLibraryDialog.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MakeClassInterfaceFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeClassInterfaceFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MakeClassInterfaceFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeClassInterfaceFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MakeMethodConstructorFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeMethodConstructorFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MakeMethodConstructorFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeMethodConstructorFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MakeVarargParameterLastFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeVarargParameterLastFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MakeVarargParameterLastFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MakeVarargParameterLastFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MethodArgumentFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodArgumentFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MethodArgumentFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodArgumentFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MethodParameterFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodParameterFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MethodParameterFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodParameterFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnBooleanFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnBooleanFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnBooleanFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnBooleanFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodReturnFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MethodThrowsFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodThrowsFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MethodThrowsFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodThrowsFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ModifierFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ModifierFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ModifierFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ModifierFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MoveBoundClassToFrontFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveBoundClassToFrontFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MoveBoundClassToFrontFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveBoundClassToFrontFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MoveCatchUpFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveCatchUpFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MoveCatchUpFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveCatchUpFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToModuleFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToModuleFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToModuleFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToModuleFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToSeparateFileFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToSeparateFileFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToSeparateFileFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToSeparateFileFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/NegationBroadScopeFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/NegationBroadScopeFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/NegationBroadScopeFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/NegationBroadScopeFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/OptimizeImportsFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/OptimizeImportsFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/OptimizeImportsFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/OptimizeImportsFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/OrderEntryFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/PermuteArgumentsFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PermuteArgumentsFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/PermuteArgumentsFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PermuteArgumentsFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/RemoveNewQualifierFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveNewQualifierFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/RemoveNewQualifierFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveNewQualifierFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/RemoveQualifierFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveQualifierFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/RemoveQualifierFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveQualifierFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/RemoveRedundantElseAction.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveRedundantElseAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/RemoveRedundantElseAction.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveRedundantElseAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedParameterFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedParameterFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedParameterFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedParameterFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedVariableFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceAddAllArrayToCollectionFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceAddAllArrayToCollectionFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceAddAllArrayToCollectionFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReplaceAddAllArrayToCollectionFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ReuseVariableDeclarationFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReuseVariableDeclarationFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ReuseVariableDeclarationFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ReuseVariableDeclarationFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/SafeDeleteFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SafeDeleteFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/SafeDeleteFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SafeDeleteFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/SetupJDKFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SetupJDKFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/SetupJDKFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SetupJDKFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ShowModulePropertiesFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ShowModulePropertiesFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/ShowModulePropertiesFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ShowModulePropertiesFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/SideEffectWarningDialog.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SideEffectWarningDialog.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/SideEffectWarningDialog.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SideEffectWarningDialog.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMethodFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMethodFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMethodFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/StaticImportMethodFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/SuperMethodReturnFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SuperMethodReturnFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/SuperMethodReturnFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SuperMethodReturnFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithArrayFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithArrayFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithArrayFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithArrayFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithTryCatchFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithTryCatchFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithTryCatchFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithTryCatchFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/VariableArrayTypeFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableArrayTypeFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/VariableArrayTypeFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableArrayTypeFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/VariableParameterizedTypeFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableParameterizedTypeFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/VariableParameterizedTypeFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableParameterizedTypeFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeQuickFixProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeQuickFixProvider.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeQuickFixProvider.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeQuickFixProvider.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/WrapExpressionFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapExpressionFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/impl/quickfix/WrapExpressionFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/WrapExpressionFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/quickFix/CreateClassOrPackageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateClassOrPackageFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/quickFix/CreateClassOrPackageFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateClassOrPackageFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/daemon/quickFix/CreateFieldOrPropertyFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateFieldOrPropertyFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/daemon/quickFix/CreateFieldOrPropertyFix.java rename to java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateFieldOrPropertyFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/BlockJoinLinesHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/CopyPasteReferenceProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/CopyPasteReferenceProcessor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/CopyPasteReferenceProcessor.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/CopyPasteReferenceProcessor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/DeclarationJoinLinesHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/DeclarationJoinLinesHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/DeclarationJoinLinesHandler.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/DeclarationJoinLinesHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/JavaBackspaceHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaBackspaceHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/JavaBackspaceHandler.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/JavaBackspaceHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/JavaQuoteHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaQuoteHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/JavaQuoteHandler.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/JavaQuoteHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/JavaTypedHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/JavaTypedHandler.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/JavaTypedHandlerUtil.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandlerUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/JavaTypedHandlerUtil.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandlerUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/LiteralJoinLinesHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/LiteralJoinLinesHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/LiteralJoinLinesHandler.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/LiteralJoinLinesHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/ReferenceTransferableData.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/ReferenceTransferableData.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/ReferenceTransferableData.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/ReferenceTransferableData.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/RestoreReferencesDialog.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/RestoreReferencesDialog.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/RestoreReferencesDialog.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/RestoreReferencesDialog.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/StringLiteralCopyPasteProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/StringLiteralCopyPasteProcessor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/StringLiteralCopyPasteProcessor.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/StringLiteralCopyPasteProcessor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/moveUpDown/DeclarationMover.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/moveUpDown/DeclarationMover.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/moveUpDown/DeclarationMover.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/moveUpDown/DeclarationMover.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/moveUpDown/StatementMover.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/moveUpDown/StatementMover.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/moveUpDown/StatementMover.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/moveUpDown/StatementMover.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/AfterSemicolonEnterProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/AfterSemicolonEnterProcessor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/AfterSemicolonEnterProcessor.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/AfterSemicolonEnterProcessor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/BlockBraceFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/BlockBraceFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/BlockBraceFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/BlockBraceFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/BreakingControlFlowEnterProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/BreakingControlFlowEnterProcessor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/BreakingControlFlowEnterProcessor.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/BreakingControlFlowEnterProcessor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/CatchDeclarationFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/CatchDeclarationFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/CatchDeclarationFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/CatchDeclarationFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/CommentBreakerEnterProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/CommentBreakerEnterProcessor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/CommentBreakerEnterProcessor.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/CommentBreakerEnterProcessor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/CompletionFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/CompletionFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/CompletionFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/CompletionFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/DoWhileConditionFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/DoWhileConditionFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/DoWhileConditionFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/DoWhileConditionFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/EnterProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/EnterProcessor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/EnterProcessor.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/EnterProcessor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/EnumFieldFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/EnumFieldFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/EnumFieldFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/EnumFieldFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/Fixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/Fixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/Fixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/Fixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/IfConditionFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/IfConditionFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/IfConditionFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/IfConditionFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/LiteralFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/LiteralFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/LiteralFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/LiteralFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MethodCallFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MethodCallFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MethodCallFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MethodCallFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingArrayInitializerBraceFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingArrayInitializerBraceFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingArrayInitializerBraceFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingArrayInitializerBraceFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingCatchBodyFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingCatchBodyFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingCatchBodyFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingCatchBodyFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingForBodyFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingForBodyFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingForBodyFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingForBodyFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingForeachBodyFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingForeachBodyFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingForeachBodyFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingForeachBodyFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingIfBranchesFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingIfBranchesFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingIfBranchesFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingIfBranchesFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingMethodBodyFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingMethodBodyFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingMethodBodyFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingMethodBodyFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingReturnExpressionFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingReturnExpressionFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingReturnExpressionFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingReturnExpressionFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingSwitchBodyFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingSwitchBodyFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingSwitchBodyFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingSwitchBodyFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingSynchronizedBodyFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingSynchronizedBodyFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingSynchronizedBodyFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingSynchronizedBodyFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingThrowExpressionFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingThrowExpressionFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingThrowExpressionFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingThrowExpressionFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingWhileBodyFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingWhileBodyFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/MissingWhileBodyFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingWhileBodyFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/ParameterListFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/ParameterListFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/ParameterListFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/ParameterListFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/ParenthesizedFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/ParenthesizedFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/ParenthesizedFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/ParenthesizedFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/PlainEnterProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/PlainEnterProcessor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/PlainEnterProcessor.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/PlainEnterProcessor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/SemicolonFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SemicolonFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/SemicolonFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SemicolonFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/SwitchExpressionFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SwitchExpressionFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/SwitchExpressionFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/SwitchExpressionFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/WhileConditionFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/WhileConditionFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/WhileConditionFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/WhileConditionFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/XmlTagFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/XmlTagFixer.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/smartEnter/XmlTagFixer.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/XmlTagFixer.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/AntLikePropertySelectionHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/AntLikePropertySelectionHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/AntLikePropertySelectionHandler.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/AntLikePropertySelectionHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/BasicSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/BasicSelectioner.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/BasicSelectioner.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/BasicSelectioner.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/CaseStatementsSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/CaseStatementsSelectioner.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/CaseStatementsSelectioner.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/CaseStatementsSelectioner.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/CodeBlockOrInitializerSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/CodeBlockOrInitializerSelectioner.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/CodeBlockOrInitializerSelectioner.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/CodeBlockOrInitializerSelectioner.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/DocCommentSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/DocCommentSelectioner.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/DocCommentSelectioner.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/DocCommentSelectioner.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/DocTagSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/DocTagSelectioner.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/DocTagSelectioner.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/DocTagSelectioner.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/FieldSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/FieldSelectioner.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/FieldSelectioner.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/FieldSelectioner.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/FinallyBlockSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/FinallyBlockSelectioner.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/FinallyBlockSelectioner.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/FinallyBlockSelectioner.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/IfStatementSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/IfStatementSelectioner.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/IfStatementSelectioner.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/IfStatementSelectioner.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/JavaBasicWordSelectionFilter.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/JavaBasicWordSelectionFilter.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/JavaBasicWordSelectionFilter.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/JavaBasicWordSelectionFilter.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/JavaTokenSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/JavaTokenSelectioner.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/JavaTokenSelectioner.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/JavaTokenSelectioner.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/ListSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/ListSelectioner.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/ListSelectioner.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/ListSelectioner.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/LiteralSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/LiteralSelectioner.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/LiteralSelectioner.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/LiteralSelectioner.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/ReferenceSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/ReferenceSelectioner.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/ReferenceSelectioner.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/ReferenceSelectioner.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/StatementGroupSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/StatementGroupSelectioner.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/StatementGroupSelectioner.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/StatementGroupSelectioner.java diff --git a/codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/TypeCastSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/TypeCastSelectioner.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/editorActions/wordSelection/TypeCastSelectioner.java rename to java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/TypeCastSelectioner.java diff --git a/codeInsight/impl/com/intellij/codeInsight/folding/impl/CollapseBlockHandler.java b/java/java-impl/src/com/intellij/codeInsight/folding/impl/CollapseBlockHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/folding/impl/CollapseBlockHandler.java rename to java/java-impl/src/com/intellij/codeInsight/folding/impl/CollapseBlockHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/folding/impl/CollapseExpandJavadocsHandler.java b/java/java-impl/src/com/intellij/codeInsight/folding/impl/CollapseExpandJavadocsHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/folding/impl/CollapseExpandJavadocsHandler.java rename to java/java-impl/src/com/intellij/codeInsight/folding/impl/CollapseExpandJavadocsHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/folding/impl/JavaCodeFoldingSettingsImpl.java b/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaCodeFoldingSettingsImpl.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/folding/impl/JavaCodeFoldingSettingsImpl.java rename to java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaCodeFoldingSettingsImpl.java diff --git a/codeInsight/impl/com/intellij/codeInsight/folding/impl/actions/CollapseBlockAction.java b/java/java-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseBlockAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/folding/impl/actions/CollapseBlockAction.java rename to java/java-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseBlockAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/folding/impl/actions/CollapseJavadocsAction.java b/java/java-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseJavadocsAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/folding/impl/actions/CollapseJavadocsAction.java rename to java/java-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseJavadocsAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/folding/impl/actions/ExpandJavadocsAction.java b/java/java-impl/src/com/intellij/codeInsight/folding/impl/actions/ExpandJavadocsAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/folding/impl/actions/ExpandJavadocsAction.java rename to java/java-impl/src/com/intellij/codeInsight/folding/impl/actions/ExpandJavadocsAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/EncapsulatableClassMember.java b/java/java-impl/src/com/intellij/codeInsight/generation/EncapsulatableClassMember.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/EncapsulatableClassMember.java rename to java/java-impl/src/com/intellij/codeInsight/generation/EncapsulatableClassMember.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/GenerateAccessorProviderRegistrar.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateAccessorProviderRegistrar.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/GenerateAccessorProviderRegistrar.java rename to java/java-impl/src/com/intellij/codeInsight/generation/GenerateAccessorProviderRegistrar.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/GenerateConstructorHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/GenerateConstructorHandler.java rename to java/java-impl/src/com/intellij/codeInsight/generation/GenerateConstructorHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/GenerateDelegateHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/GenerateDelegateHandler.java rename to java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/GenerateEqualsHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/GenerateEqualsHandler.java rename to java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/GenerateEqualsHelper.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHelper.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/GenerateEqualsHelper.java rename to java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHelper.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/GenerateFieldOrPropertyHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateFieldOrPropertyHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/GenerateFieldOrPropertyHandler.java rename to java/java-impl/src/com/intellij/codeInsight/generation/GenerateFieldOrPropertyHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/GenerateGetterAndSetterHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateGetterAndSetterHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/GenerateGetterAndSetterHandler.java rename to java/java-impl/src/com/intellij/codeInsight/generation/GenerateGetterAndSetterHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/GenerateGetterHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateGetterHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/GenerateGetterHandler.java rename to java/java-impl/src/com/intellij/codeInsight/generation/GenerateGetterHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/GenerateGetterSetterHandlerBase.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateGetterSetterHandlerBase.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/GenerateGetterSetterHandlerBase.java rename to java/java-impl/src/com/intellij/codeInsight/generation/GenerateGetterSetterHandlerBase.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java rename to java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/GenerateMembersUtil.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/GenerateMembersUtil.java rename to java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/GenerateSetterHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateSetterHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/GenerateSetterHandler.java rename to java/java-impl/src/com/intellij/codeInsight/generation/GenerateSetterHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/GenerationInfo.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerationInfo.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/GenerationInfo.java rename to java/java-impl/src/com/intellij/codeInsight/generation/GenerationInfo.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/JavaImplementMethodsHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/JavaImplementMethodsHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/JavaImplementMethodsHandler.java rename to java/java-impl/src/com/intellij/codeInsight/generation/JavaImplementMethodsHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/JavaOverrideMethodsHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/JavaOverrideMethodsHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/JavaOverrideMethodsHandler.java rename to java/java-impl/src/com/intellij/codeInsight/generation/JavaOverrideMethodsHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/OverrideImplementUtil.java b/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/OverrideImplementUtil.java rename to java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/OverrideImplementsAnnotationsHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementsAnnotationsHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/OverrideImplementsAnnotationsHandler.java rename to java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementsAnnotationsHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/OverrideImplementsAnnotationsHandlerImpl.java b/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementsAnnotationsHandlerImpl.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/OverrideImplementsAnnotationsHandlerImpl.java rename to java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementsAnnotationsHandlerImpl.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/PsiDocCommentOwnerMemberChooserObject.java b/java/java-impl/src/com/intellij/codeInsight/generation/PsiDocCommentOwnerMemberChooserObject.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/PsiDocCommentOwnerMemberChooserObject.java rename to java/java-impl/src/com/intellij/codeInsight/generation/PsiDocCommentOwnerMemberChooserObject.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/PsiElementClassMember.java b/java/java-impl/src/com/intellij/codeInsight/generation/PsiElementClassMember.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/PsiElementClassMember.java rename to java/java-impl/src/com/intellij/codeInsight/generation/PsiElementClassMember.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/PsiFieldMember.java b/java/java-impl/src/com/intellij/codeInsight/generation/PsiFieldMember.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/PsiFieldMember.java rename to java/java-impl/src/com/intellij/codeInsight/generation/PsiFieldMember.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/PsiGenerationInfo.java b/java/java-impl/src/com/intellij/codeInsight/generation/PsiGenerationInfo.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/PsiGenerationInfo.java rename to java/java-impl/src/com/intellij/codeInsight/generation/PsiGenerationInfo.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/PsiMethodMember.java b/java/java-impl/src/com/intellij/codeInsight/generation/PsiMethodMember.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/PsiMethodMember.java rename to java/java-impl/src/com/intellij/codeInsight/generation/PsiMethodMember.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/TemplateGenerationInfo.java b/java/java-impl/src/com/intellij/codeInsight/generation/TemplateGenerationInfo.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/TemplateGenerationInfo.java rename to java/java-impl/src/com/intellij/codeInsight/generation/TemplateGenerationInfo.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/actions/GenerateConstructorAction.java b/java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateConstructorAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/actions/GenerateConstructorAction.java rename to java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateConstructorAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/actions/GenerateDelegateAction.java b/java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateDelegateAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/actions/GenerateDelegateAction.java rename to java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateDelegateAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/actions/GenerateEqualsAction.java b/java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateEqualsAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/actions/GenerateEqualsAction.java rename to java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateEqualsAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/actions/GenerateGetterAction.java b/java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateGetterAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/actions/GenerateGetterAction.java rename to java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateGetterAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/actions/GenerateGetterAndSetterAction.java b/java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateGetterAndSetterAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/actions/GenerateGetterAndSetterAction.java rename to java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateGetterAndSetterAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/actions/GenerateSetterAction.java b/java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateSetterAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/actions/GenerateSetterAction.java rename to java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateSetterAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/actions/GenerateSuperMethodCallAction.java b/java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateSuperMethodCallAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/actions/GenerateSuperMethodCallAction.java rename to java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateSuperMethodCallAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/actions/GenerateSuperMethodCallHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateSuperMethodCallHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/actions/GenerateSuperMethodCallHandler.java rename to java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateSuperMethodCallHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaExpressionSurroundDescriptor.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaExpressionSurroundDescriptor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaExpressionSurroundDescriptor.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaExpressionSurroundDescriptor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaStatementsSurroundDescriptor.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaStatementsSurroundDescriptor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaStatementsSurroundDescriptor.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaStatementsSurroundDescriptor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaStatementsSurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaStatementsSurrounder.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaStatementsSurrounder.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaStatementsSurrounder.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithBlockSurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithBlockSurrounder.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithBlockSurrounder.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithBlockSurrounder.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithCastSurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithCastSurrounder.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithCastSurrounder.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithCastSurrounder.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithDoWhileSurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithDoWhileSurrounder.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithDoWhileSurrounder.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithDoWhileSurrounder.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithForSurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithForSurrounder.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithForSurrounder.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithForSurrounder.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithIfElseExpressionSurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithIfElseExpressionSurrounder.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithIfElseExpressionSurrounder.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithIfElseExpressionSurrounder.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithIfElseSurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithIfElseSurrounder.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithIfElseSurrounder.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithIfElseSurrounder.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithIfExpressionSurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithIfExpressionSurrounder.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithIfExpressionSurrounder.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithIfExpressionSurrounder.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithIfSurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithIfSurrounder.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithIfSurrounder.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithIfSurrounder.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithNotInstanceofSurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithNotInstanceofSurrounder.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithNotInstanceofSurrounder.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithNotInstanceofSurrounder.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithNotSurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithNotSurrounder.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithNotSurrounder.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithNotSurrounder.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithParenthesesSurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithParenthesesSurrounder.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithParenthesesSurrounder.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithParenthesesSurrounder.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithRunnableSurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithRunnableSurrounder.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithRunnableSurrounder.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithRunnableSurrounder.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithSynchronizedSurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithSynchronizedSurrounder.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithSynchronizedSurrounder.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithSynchronizedSurrounder.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithTryCatchFinallySurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithTryCatchFinallySurrounder.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithTryCatchFinallySurrounder.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithTryCatchFinallySurrounder.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithTryCatchSurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithTryCatchSurrounder.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithTryCatchSurrounder.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithTryCatchSurrounder.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithTryFinallySurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithTryFinallySurrounder.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithTryFinallySurrounder.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithTryFinallySurrounder.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithWhileSurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithWhileSurrounder.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/JavaWithWhileSurrounder.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithWhileSurrounder.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/SurroundWithUtil.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/SurroundWithUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/SurroundWithUtil.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/SurroundWithUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/XmlSurroundWithRangeAdjuster.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/XmlSurroundWithRangeAdjuster.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/surroundWith/XmlSurroundWithRangeAdjuster.java rename to java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/XmlSurroundWithRangeAdjuster.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/ui/GenerateEqualsWizard.java b/java/java-impl/src/com/intellij/codeInsight/generation/ui/GenerateEqualsWizard.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/ui/GenerateEqualsWizard.java rename to java/java-impl/src/com/intellij/codeInsight/generation/ui/GenerateEqualsWizard.java diff --git a/codeInsight/impl/com/intellij/codeInsight/generation/ui/SimpleFieldChooser.java b/java/java-impl/src/com/intellij/codeInsight/generation/ui/SimpleFieldChooser.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/generation/ui/SimpleFieldChooser.java rename to java/java-impl/src/com/intellij/codeInsight/generation/ui/SimpleFieldChooser.java diff --git a/codeInsight/impl/com/intellij/codeInsight/guess/GuessManager.java b/java/java-impl/src/com/intellij/codeInsight/guess/GuessManager.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/guess/GuessManager.java rename to java/java-impl/src/com/intellij/codeInsight/guess/GuessManager.java diff --git a/codeInsight/impl/com/intellij/codeInsight/guess/impl/DfaInstanceofValue.java b/java/java-impl/src/com/intellij/codeInsight/guess/impl/DfaInstanceofValue.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/guess/impl/DfaInstanceofValue.java rename to java/java-impl/src/com/intellij/codeInsight/guess/impl/DfaInstanceofValue.java diff --git a/codeInsight/impl/com/intellij/codeInsight/guess/impl/ExpressionTypeMemoryState.java b/java/java-impl/src/com/intellij/codeInsight/guess/impl/ExpressionTypeMemoryState.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/guess/impl/ExpressionTypeMemoryState.java rename to java/java-impl/src/com/intellij/codeInsight/guess/impl/ExpressionTypeMemoryState.java diff --git a/codeInsight/impl/com/intellij/codeInsight/guess/impl/GuessManagerImpl.java b/java/java-impl/src/com/intellij/codeInsight/guess/impl/GuessManagerImpl.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/guess/impl/GuessManagerImpl.java rename to java/java-impl/src/com/intellij/codeInsight/guess/impl/GuessManagerImpl.java diff --git a/codeInsight/impl/com/intellij/codeInsight/guess/impl/MethodPattern.java b/java/java-impl/src/com/intellij/codeInsight/guess/impl/MethodPattern.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/guess/impl/MethodPattern.java rename to java/java-impl/src/com/intellij/codeInsight/guess/impl/MethodPattern.java diff --git a/codeInsight/impl/com/intellij/codeInsight/guess/impl/MethodPatternMap.java b/java/java-impl/src/com/intellij/codeInsight/guess/impl/MethodPatternMap.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/guess/impl/MethodPatternMap.java rename to java/java-impl/src/com/intellij/codeInsight/guess/impl/MethodPatternMap.java diff --git a/codeInsight/impl/com/intellij/codeInsight/highlighting/ChooseClassAndDoHighlightRunnable.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/ChooseClassAndDoHighlightRunnable.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/highlighting/ChooseClassAndDoHighlightRunnable.java rename to java/java-impl/src/com/intellij/codeInsight/highlighting/ChooseClassAndDoHighlightRunnable.java diff --git a/codeInsight/impl/com/intellij/codeInsight/highlighting/HighlightExceptionsHandler.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightExceptionsHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/highlighting/HighlightExceptionsHandler.java rename to java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightExceptionsHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/highlighting/HighlightExceptionsHandlerFactory.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightExceptionsHandlerFactory.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/highlighting/HighlightExceptionsHandlerFactory.java rename to java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightExceptionsHandlerFactory.java diff --git a/codeInsight/impl/com/intellij/codeInsight/highlighting/HighlightExitPointsHandler.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightExitPointsHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/highlighting/HighlightExitPointsHandler.java rename to java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightExitPointsHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/highlighting/HighlightExitPointsHandlerFactory.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightExitPointsHandlerFactory.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/highlighting/HighlightExitPointsHandlerFactory.java rename to java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightExitPointsHandlerFactory.java diff --git a/codeInsight/impl/com/intellij/codeInsight/highlighting/HighlightOverridingMethodsHandler.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightOverridingMethodsHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/highlighting/HighlightOverridingMethodsHandler.java rename to java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightOverridingMethodsHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/highlighting/HighlightOverridingMethodsHandlerFactory.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightOverridingMethodsHandlerFactory.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/highlighting/HighlightOverridingMethodsHandlerFactory.java rename to java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightOverridingMethodsHandlerFactory.java diff --git a/codeInsight/impl/com/intellij/codeInsight/highlighting/HighlightSuppressedWarningsFactory.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightSuppressedWarningsFactory.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/highlighting/HighlightSuppressedWarningsFactory.java rename to java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightSuppressedWarningsFactory.java diff --git a/codeInsight/impl/com/intellij/codeInsight/highlighting/HighlightSuppressedWarningsHandler.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightSuppressedWarningsHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/highlighting/HighlightSuppressedWarningsHandler.java rename to java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightSuppressedWarningsHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/highlighting/JavaBraceMatcher.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaBraceMatcher.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/highlighting/JavaBraceMatcher.java rename to java/java-impl/src/com/intellij/codeInsight/highlighting/JavaBraceMatcher.java diff --git a/codeInsight/impl/com/intellij/codeInsight/highlighting/JavaHighlightUsagesDescriptionProvider.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaHighlightUsagesDescriptionProvider.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/highlighting/JavaHighlightUsagesDescriptionProvider.java rename to java/java-impl/src/com/intellij/codeInsight/highlighting/JavaHighlightUsagesDescriptionProvider.java diff --git a/codeInsight/impl/com/intellij/codeInsight/highlighting/JavaReadWriteAccessDetector.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaReadWriteAccessDetector.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/highlighting/JavaReadWriteAccessDetector.java rename to java/java-impl/src/com/intellij/codeInsight/highlighting/JavaReadWriteAccessDetector.java diff --git a/codeInsight/impl/com/intellij/codeInsight/hint/ClassDeclarationRangeHandler.java b/java/java-impl/src/com/intellij/codeInsight/hint/ClassDeclarationRangeHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/hint/ClassDeclarationRangeHandler.java rename to java/java-impl/src/com/intellij/codeInsight/hint/ClassDeclarationRangeHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/hint/ClassInitializerDeclarationRangeHandler.java b/java/java-impl/src/com/intellij/codeInsight/hint/ClassInitializerDeclarationRangeHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/hint/ClassInitializerDeclarationRangeHandler.java rename to java/java-impl/src/com/intellij/codeInsight/hint/ClassInitializerDeclarationRangeHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/hint/JavaImplementationTextSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/hint/JavaImplementationTextSelectioner.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/hint/JavaImplementationTextSelectioner.java rename to java/java-impl/src/com/intellij/codeInsight/hint/JavaImplementationTextSelectioner.java diff --git a/codeInsight/impl/com/intellij/codeInsight/hint/MethodDeclarationRangeHandler.java b/java/java-impl/src/com/intellij/codeInsight/hint/MethodDeclarationRangeHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/hint/MethodDeclarationRangeHandler.java rename to java/java-impl/src/com/intellij/codeInsight/hint/MethodDeclarationRangeHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/hint/ShowContainerInfoHandler.java b/java/java-impl/src/com/intellij/codeInsight/hint/ShowContainerInfoHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/hint/ShowContainerInfoHandler.java rename to java/java-impl/src/com/intellij/codeInsight/hint/ShowContainerInfoHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/hint/actions/ShowContainerInfoAction.java b/java/java-impl/src/com/intellij/codeInsight/hint/actions/ShowContainerInfoAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/hint/actions/ShowContainerInfoAction.java rename to java/java-impl/src/com/intellij/codeInsight/hint/actions/ShowContainerInfoAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/hint/api/impls/AnnotationParameterInfoHandler.java b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/AnnotationParameterInfoHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/hint/api/impls/AnnotationParameterInfoHandler.java rename to java/java-impl/src/com/intellij/codeInsight/hint/api/impls/AnnotationParameterInfoHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java rename to java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/hint/api/impls/ReferenceParameterInfoHandler.java b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/ReferenceParameterInfoHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/hint/api/impls/ReferenceParameterInfoHandler.java rename to java/java-impl/src/com/intellij/codeInsight/hint/api/impls/ReferenceParameterInfoHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/AddDeprecationAnnotationFix.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddDeprecationAnnotationFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/AddDeprecationAnnotationFix.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/AddDeprecationAnnotationFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/AddNotNullAnnotationFix.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddNotNullAnnotationFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/AddNotNullAnnotationFix.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/AddNotNullAnnotationFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/AddNullableAnnotationFix.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddNullableAnnotationFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/AddNullableAnnotationFix.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/AddNullableAnnotationFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/AddNullableNotNullAnnotationFix.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddNullableNotNullAnnotationFix.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/AddNullableNotNullAnnotationFix.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/AddNullableNotNullAnnotationFix.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/AddOverrideAnnotationAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOverrideAnnotationAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/AddOverrideAnnotationAction.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOverrideAnnotationAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/AssignFieldFromParameterAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AssignFieldFromParameterAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/AssignFieldFromParameterAction.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/AssignFieldFromParameterAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/ColorChooserIntentionAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ColorChooserIntentionAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/ColorChooserIntentionAction.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/ColorChooserIntentionAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/ConcatenationToMessageFormatAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConcatenationToMessageFormatAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/ConcatenationToMessageFormatAction.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/ConcatenationToMessageFormatAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationAction.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationHandler.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationHandler.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/CreateClassDialog.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateClassDialog.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/CreateClassDialog.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateClassDialog.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterAction.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterDialog.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterDialog.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterDialog.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateFieldFromParameterDialog.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/CreateSubclassAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSubclassAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/CreateSubclassAction.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSubclassAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/DeannotateIntentionAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/DeannotateIntentionAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/DeannotateIntentionAction.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/DeannotateIntentionAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodAction.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/InvertIfConditionAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/MakeTypeGenericAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/MakeTypeGenericAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/MakeTypeGenericAction.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/MakeTypeGenericAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/MoveFieldAssignmentToInitializerAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/MoveFieldAssignmentToInitializerAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/MoveFieldAssignmentToInitializerAction.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/MoveFieldAssignmentToInitializerAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/MoveInitializerToConstructorAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/MoveInitializerToConstructorAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/MoveInitializerToConstructorAction.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/MoveInitializerToConstructorAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/SimplifyBooleanExpressionAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SimplifyBooleanExpressionAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/SimplifyBooleanExpressionAction.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/SimplifyBooleanExpressionAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitDeclarationAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/SplitIfAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitIfAction.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/SplitIfAction.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/SplitIfAction.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/TypeExpression.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/TypeExpression.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/TypeExpression.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/TypeExpression.java diff --git a/codeInsight/impl/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java diff --git a/codeInsight/impl/com/intellij/codeInsight/javadoc/ColorUtil.java b/java/java-impl/src/com/intellij/codeInsight/javadoc/ColorUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/javadoc/ColorUtil.java rename to java/java-impl/src/com/intellij/codeInsight/javadoc/ColorUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/javadoc/JavaDocExternalFilter.java b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocExternalFilter.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/javadoc/JavaDocExternalFilter.java rename to java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocExternalFilter.java diff --git a/codeInsight/impl/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java rename to java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java diff --git a/codeInsight/impl/com/intellij/codeInsight/javadoc/JavaDocUtil.java b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/javadoc/JavaDocUtil.java rename to java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/lookup/ExpressionLookupItem.java b/java/java-impl/src/com/intellij/codeInsight/lookup/ExpressionLookupItem.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/lookup/ExpressionLookupItem.java rename to java/java-impl/src/com/intellij/codeInsight/lookup/ExpressionLookupItem.java diff --git a/codeInsight/impl/com/intellij/codeInsight/lookup/KeywordLookupItem.java b/java/java-impl/src/com/intellij/codeInsight/lookup/KeywordLookupItem.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/lookup/KeywordLookupItem.java rename to java/java-impl/src/com/intellij/codeInsight/lookup/KeywordLookupItem.java diff --git a/codeInsight/impl/com/intellij/codeInsight/lookup/LookupItemUtil.java b/java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/lookup/LookupItemUtil.java rename to java/java-impl/src/com/intellij/codeInsight/lookup/LookupItemUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/lookup/PsiTypeLookupItem.java b/java/java-impl/src/com/intellij/codeInsight/lookup/PsiTypeLookupItem.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/lookup/PsiTypeLookupItem.java rename to java/java-impl/src/com/intellij/codeInsight/lookup/PsiTypeLookupItem.java diff --git a/codeInsight/impl/com/intellij/codeInsight/lookup/TypedLookupItem.java b/java/java-impl/src/com/intellij/codeInsight/lookup/TypedLookupItem.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/lookup/TypedLookupItem.java rename to java/java-impl/src/com/intellij/codeInsight/lookup/TypedLookupItem.java diff --git a/codeInsight/impl/com/intellij/codeInsight/navigation/ClassImplementationsSearch.java b/java/java-impl/src/com/intellij/codeInsight/navigation/ClassImplementationsSearch.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/navigation/ClassImplementationsSearch.java rename to java/java-impl/src/com/intellij/codeInsight/navigation/ClassImplementationsSearch.java diff --git a/codeInsight/impl/com/intellij/codeInsight/navigation/JavaGotoSuperHandler.java b/java/java-impl/src/com/intellij/codeInsight/navigation/JavaGotoSuperHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/navigation/JavaGotoSuperHandler.java rename to java/java-impl/src/com/intellij/codeInsight/navigation/JavaGotoSuperHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/navigation/JavaMethodNavigationOffsetProvider.java b/java/java-impl/src/com/intellij/codeInsight/navigation/JavaMethodNavigationOffsetProvider.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/navigation/JavaMethodNavigationOffsetProvider.java rename to java/java-impl/src/com/intellij/codeInsight/navigation/JavaMethodNavigationOffsetProvider.java diff --git a/codeInsight/impl/com/intellij/codeInsight/navigation/MethodImplementationsSearch.java b/java/java-impl/src/com/intellij/codeInsight/navigation/MethodImplementationsSearch.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/navigation/MethodImplementationsSearch.java rename to java/java-impl/src/com/intellij/codeInsight/navigation/MethodImplementationsSearch.java diff --git a/codeInsight/impl/com/intellij/codeInsight/navigation/actions/GotoBreakContinueHandler.java b/java/java-impl/src/com/intellij/codeInsight/navigation/actions/GotoBreakContinueHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/navigation/actions/GotoBreakContinueHandler.java rename to java/java-impl/src/com/intellij/codeInsight/navigation/actions/GotoBreakContinueHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/navigation/actions/JavaTypeDeclarationProvider.java b/java/java-impl/src/com/intellij/codeInsight/navigation/actions/JavaTypeDeclarationProvider.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/navigation/actions/JavaTypeDeclarationProvider.java rename to java/java-impl/src/com/intellij/codeInsight/navigation/actions/JavaTypeDeclarationProvider.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/ExpressionUtil.java b/java/java-impl/src/com/intellij/codeInsight/template/ExpressionUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/ExpressionUtil.java rename to java/java-impl/src/com/intellij/codeInsight/template/ExpressionUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/JavaCodeContextType.java b/java/java-impl/src/com/intellij/codeInsight/template/JavaCodeContextType.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/JavaCodeContextType.java rename to java/java-impl/src/com/intellij/codeInsight/template/JavaCodeContextType.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/JavaCommentContextType.java b/java/java-impl/src/com/intellij/codeInsight/template/JavaCommentContextType.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/JavaCommentContextType.java rename to java/java-impl/src/com/intellij/codeInsight/template/JavaCommentContextType.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/JavaPsiElementResult.java b/java/java-impl/src/com/intellij/codeInsight/template/JavaPsiElementResult.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/JavaPsiElementResult.java rename to java/java-impl/src/com/intellij/codeInsight/template/JavaPsiElementResult.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/JavaStringContextType.java b/java/java-impl/src/com/intellij/codeInsight/template/JavaStringContextType.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/JavaStringContextType.java rename to java/java-impl/src/com/intellij/codeInsight/template/JavaStringContextType.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/PsiTypeResult.java b/java/java-impl/src/com/intellij/codeInsight/template/PsiTypeResult.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/PsiTypeResult.java rename to java/java-impl/src/com/intellij/codeInsight/template/PsiTypeResult.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/SmartCompletionContextType.java b/java/java-impl/src/com/intellij/codeInsight/template/SmartCompletionContextType.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/SmartCompletionContextType.java rename to java/java-impl/src/com/intellij/codeInsight/template/SmartCompletionContextType.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/impl/JavaTemplateLookupSelectionHandler.java b/java/java-impl/src/com/intellij/codeInsight/template/impl/JavaTemplateLookupSelectionHandler.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/impl/JavaTemplateLookupSelectionHandler.java rename to java/java-impl/src/com/intellij/codeInsight/template/impl/JavaTemplateLookupSelectionHandler.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/impl/JavaTemplateUtil.java b/java/java-impl/src/com/intellij/codeInsight/template/impl/JavaTemplateUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/impl/JavaTemplateUtil.java rename to java/java-impl/src/com/intellij/codeInsight/template/impl/JavaTemplateUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/impl/ShortenFQNamesProcessor.java b/java/java-impl/src/com/intellij/codeInsight/template/impl/ShortenFQNamesProcessor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/impl/ShortenFQNamesProcessor.java rename to java/java-impl/src/com/intellij/codeInsight/template/impl/ShortenFQNamesProcessor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/impl/TextExpression.java b/java/java-impl/src/com/intellij/codeInsight/template/impl/TextExpression.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/impl/TextExpression.java rename to java/java-impl/src/com/intellij/codeInsight/template/impl/TextExpression.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/AnnotatedMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/AnnotatedMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/AnnotatedMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/AnnotatedMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/ArrayVariableMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/ArrayVariableMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/ArrayVariableMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/ArrayVariableMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/CastToLeftSideTypeMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/CastToLeftSideTypeMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/CastToLeftSideTypeMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/CastToLeftSideTypeMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/ClassNameMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/ClassNameMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/ClassNameMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/ClassNameMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/ComponentTypeOfMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/ComponentTypeOfMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/ComponentTypeOfMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/ComponentTypeOfMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/CurrentPackageMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/CurrentPackageMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/CurrentPackageMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/CurrentPackageMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/DescendantClassesEnumMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/DescendantClassesEnumMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/DescendantClassesEnumMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/DescendantClassesEnumMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/EnumMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/EnumMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/EnumMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/EnumMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/ExpectedTypeMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/ExpectedTypeMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/ExpectedTypeMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/ExpectedTypeMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/GroovyScriptMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/GroovyScriptMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/GroovyScriptMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/GroovyScriptMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/GuessElementTypeMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/GuessElementTypeMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/GuessElementTypeMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/GuessElementTypeMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/IterableComponentTypeMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/IterableComponentTypeMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/IterableComponentTypeMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/IterableComponentTypeMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/IterableVariableMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/IterableVariableMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/IterableVariableMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/IterableVariableMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/JavaTemplateCompletionProcessor.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/JavaTemplateCompletionProcessor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/JavaTemplateCompletionProcessor.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/JavaTemplateCompletionProcessor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/MacroUtil.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/MacroUtil.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/MacroUtil.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/MacroUtil.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/MethodNameMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/MethodNameMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/MethodNameMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/MethodNameMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/MethodReturnTypeMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/MethodReturnTypeMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/MethodReturnTypeMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/MethodReturnTypeMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/QualifiedClassNameMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/QualifiedClassNameMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/QualifiedClassNameMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/QualifiedClassNameMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/RightSideTypeMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/RightSideTypeMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/RightSideTypeMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/RightSideTypeMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/SubtypesMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/SubtypesMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/SubtypesMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/SubtypesMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/SuggestIndexNameMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/SuggestIndexNameMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/SuggestIndexNameMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/SuggestIndexNameMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/SuggestVariableNameMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/SuggestVariableNameMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/SuggestVariableNameMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/SuggestVariableNameMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/TypeOfVariableMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/TypeOfVariableMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/TypeOfVariableMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/TypeOfVariableMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/VariableOfTypeMacro.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/VariableOfTypeMacro.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/VariableOfTypeMacro.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/VariableOfTypeMacro.java diff --git a/codeInsight/impl/com/intellij/codeInsight/template/macro/VariableTypeMacroBase.java b/java/java-impl/src/com/intellij/codeInsight/template/macro/VariableTypeMacroBase.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/template/macro/VariableTypeMacroBase.java rename to java/java-impl/src/com/intellij/codeInsight/template/macro/VariableTypeMacroBase.java diff --git a/codeInsight/impl/com/intellij/codeInsight/unwrap/JavaAnonymousUnwrapper.java b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaAnonymousUnwrapper.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/unwrap/JavaAnonymousUnwrapper.java rename to java/java-impl/src/com/intellij/codeInsight/unwrap/JavaAnonymousUnwrapper.java diff --git a/codeInsight/impl/com/intellij/codeInsight/unwrap/JavaBracesUnwrapper.java b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaBracesUnwrapper.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/unwrap/JavaBracesUnwrapper.java rename to java/java-impl/src/com/intellij/codeInsight/unwrap/JavaBracesUnwrapper.java diff --git a/codeInsight/impl/com/intellij/codeInsight/unwrap/JavaCatchRemover.java b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaCatchRemover.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/unwrap/JavaCatchRemover.java rename to java/java-impl/src/com/intellij/codeInsight/unwrap/JavaCatchRemover.java diff --git a/codeInsight/impl/com/intellij/codeInsight/unwrap/JavaElseRemover.java b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaElseRemover.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/unwrap/JavaElseRemover.java rename to java/java-impl/src/com/intellij/codeInsight/unwrap/JavaElseRemover.java diff --git a/codeInsight/impl/com/intellij/codeInsight/unwrap/JavaElseUnwrapper.java b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaElseUnwrapper.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/unwrap/JavaElseUnwrapper.java rename to java/java-impl/src/com/intellij/codeInsight/unwrap/JavaElseUnwrapper.java diff --git a/codeInsight/impl/com/intellij/codeInsight/unwrap/JavaElseUnwrapperBase.java b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaElseUnwrapperBase.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/unwrap/JavaElseUnwrapperBase.java rename to java/java-impl/src/com/intellij/codeInsight/unwrap/JavaElseUnwrapperBase.java diff --git a/codeInsight/impl/com/intellij/codeInsight/unwrap/JavaForUnwrapper.java b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaForUnwrapper.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/unwrap/JavaForUnwrapper.java rename to java/java-impl/src/com/intellij/codeInsight/unwrap/JavaForUnwrapper.java diff --git a/codeInsight/impl/com/intellij/codeInsight/unwrap/JavaIfUnwrapper.java b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaIfUnwrapper.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/unwrap/JavaIfUnwrapper.java rename to java/java-impl/src/com/intellij/codeInsight/unwrap/JavaIfUnwrapper.java diff --git a/codeInsight/impl/com/intellij/codeInsight/unwrap/JavaMethodParameterUnwrapper.java b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaMethodParameterUnwrapper.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/unwrap/JavaMethodParameterUnwrapper.java rename to java/java-impl/src/com/intellij/codeInsight/unwrap/JavaMethodParameterUnwrapper.java diff --git a/codeInsight/impl/com/intellij/codeInsight/unwrap/JavaSynchronizedUnwrapper.java b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaSynchronizedUnwrapper.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/unwrap/JavaSynchronizedUnwrapper.java rename to java/java-impl/src/com/intellij/codeInsight/unwrap/JavaSynchronizedUnwrapper.java diff --git a/codeInsight/impl/com/intellij/codeInsight/unwrap/JavaTryUnwrapper.java b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaTryUnwrapper.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/unwrap/JavaTryUnwrapper.java rename to java/java-impl/src/com/intellij/codeInsight/unwrap/JavaTryUnwrapper.java diff --git a/codeInsight/impl/com/intellij/codeInsight/unwrap/JavaUnwrapDescriptor.java b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaUnwrapDescriptor.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/unwrap/JavaUnwrapDescriptor.java rename to java/java-impl/src/com/intellij/codeInsight/unwrap/JavaUnwrapDescriptor.java diff --git a/codeInsight/impl/com/intellij/codeInsight/unwrap/JavaUnwrapper.java b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaUnwrapper.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/unwrap/JavaUnwrapper.java rename to java/java-impl/src/com/intellij/codeInsight/unwrap/JavaUnwrapper.java diff --git a/codeInsight/impl/com/intellij/codeInsight/unwrap/JavaWhileUnwrapper.java b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaWhileUnwrapper.java similarity index 100% rename from codeInsight/impl/com/intellij/codeInsight/unwrap/JavaWhileUnwrapper.java rename to java/java-impl/src/com/intellij/codeInsight/unwrap/JavaWhileUnwrapper.java diff --git a/codeInsight/impl/com/intellij/ide/actions/JavaQualifiedNameProvider.java b/java/java-impl/src/com/intellij/ide/actions/JavaQualifiedNameProvider.java similarity index 100% rename from codeInsight/impl/com/intellij/ide/actions/JavaQualifiedNameProvider.java rename to java/java-impl/src/com/intellij/ide/actions/JavaQualifiedNameProvider.java diff --git a/codeInsight/impl/com/intellij/psi/AbstractQualifiedReference.java b/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java similarity index 100% rename from codeInsight/impl/com/intellij/psi/AbstractQualifiedReference.java rename to java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java diff --git a/codeInsight/impl/com/intellij/psi/filters/getters/CastTypeGetter.java b/java/java-impl/src/com/intellij/psi/filters/getters/CastTypeGetter.java similarity index 100% rename from codeInsight/impl/com/intellij/psi/filters/getters/CastTypeGetter.java rename to java/java-impl/src/com/intellij/psi/filters/getters/CastTypeGetter.java diff --git a/codeInsight/impl/com/intellij/psi/filters/getters/ClassLiteralGetter.java b/java/java-impl/src/com/intellij/psi/filters/getters/ClassLiteralGetter.java similarity index 100% rename from codeInsight/impl/com/intellij/psi/filters/getters/ClassLiteralGetter.java rename to java/java-impl/src/com/intellij/psi/filters/getters/ClassLiteralGetter.java diff --git a/codeInsight/impl/com/intellij/psi/filters/getters/ClassLiteralLookupElement.java b/java/java-impl/src/com/intellij/psi/filters/getters/ClassLiteralLookupElement.java similarity index 100% rename from codeInsight/impl/com/intellij/psi/filters/getters/ClassLiteralLookupElement.java rename to java/java-impl/src/com/intellij/psi/filters/getters/ClassLiteralLookupElement.java diff --git a/codeInsight/impl/com/intellij/psi/filters/getters/ExpectedTypesGetter.java b/java/java-impl/src/com/intellij/psi/filters/getters/ExpectedTypesGetter.java similarity index 100% rename from codeInsight/impl/com/intellij/psi/filters/getters/ExpectedTypesGetter.java rename to java/java-impl/src/com/intellij/psi/filters/getters/ExpectedTypesGetter.java diff --git a/codeInsight/impl/com/intellij/psi/filters/getters/FilterGetter.java b/java/java-impl/src/com/intellij/psi/filters/getters/FilterGetter.java similarity index 100% rename from codeInsight/impl/com/intellij/psi/filters/getters/FilterGetter.java rename to java/java-impl/src/com/intellij/psi/filters/getters/FilterGetter.java diff --git a/codeInsight/impl/com/intellij/psi/filters/getters/InstanceOfLeftPartTypeGetter.java b/java/java-impl/src/com/intellij/psi/filters/getters/InstanceOfLeftPartTypeGetter.java similarity index 100% rename from codeInsight/impl/com/intellij/psi/filters/getters/InstanceOfLeftPartTypeGetter.java rename to java/java-impl/src/com/intellij/psi/filters/getters/InstanceOfLeftPartTypeGetter.java diff --git a/codeInsight/impl/com/intellij/psi/filters/getters/MembersGetter.java b/java/java-impl/src/com/intellij/psi/filters/getters/MembersGetter.java similarity index 100% rename from codeInsight/impl/com/intellij/psi/filters/getters/MembersGetter.java rename to java/java-impl/src/com/intellij/psi/filters/getters/MembersGetter.java diff --git a/codeInsight/impl/com/intellij/psi/filters/getters/TemplatesGetter.java b/java/java-impl/src/com/intellij/psi/filters/getters/TemplatesGetter.java similarity index 100% rename from codeInsight/impl/com/intellij/psi/filters/getters/TemplatesGetter.java rename to java/java-impl/src/com/intellij/psi/filters/getters/TemplatesGetter.java diff --git a/codeInsight/impl/com/intellij/psi/filters/getters/ThisGetter.java b/java/java-impl/src/com/intellij/psi/filters/getters/ThisGetter.java similarity index 100% rename from codeInsight/impl/com/intellij/psi/filters/getters/ThisGetter.java rename to java/java-impl/src/com/intellij/psi/filters/getters/ThisGetter.java diff --git a/codeInsight/impl/com/intellij/psi/filters/getters/ThrowsListGetter.java b/java/java-impl/src/com/intellij/psi/filters/getters/ThrowsListGetter.java similarity index 100% rename from codeInsight/impl/com/intellij/psi/filters/getters/ThrowsListGetter.java rename to java/java-impl/src/com/intellij/psi/filters/getters/ThrowsListGetter.java diff --git a/codeInsight/impl/com/intellij/psi/impl/source/tree/injected/MyTestInjector.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/injected/MyTestInjector.java similarity index 100% rename from codeInsight/impl/com/intellij/psi/impl/source/tree/injected/MyTestInjector.java rename to java/java-impl/src/com/intellij/psi/impl/source/tree/injected/MyTestInjector.java