diff --git a/java/java-impl/java-impl.iml b/java/java-impl/java-impl.iml
index 0f4b02ae18cd..3aeb0001d966 100644
--- a/java/java-impl/java-impl.iml
+++ b/java/java-impl/java-impl.iml
@@ -11,7 +11,6 @@
-
diff --git a/inspections/impl/com/intellij/codeInsight/daemon/JavaAwareInspectionProfileCoverter.java b/java/java-impl/src/com/intellij/codeInsight/daemon/JavaAwareInspectionProfileCoverter.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInsight/daemon/JavaAwareInspectionProfileCoverter.java
rename to java/java-impl/src/com/intellij/codeInsight/daemon/JavaAwareInspectionProfileCoverter.java
diff --git a/inspections/impl/com/intellij/codeInspection/AddAssertStatementFix.java b/java/java-impl/src/com/intellij/codeInspection/AddAssertStatementFix.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/AddAssertStatementFix.java
rename to java/java-impl/src/com/intellij/codeInspection/AddAssertStatementFix.java
diff --git a/inspections/impl/com/intellij/codeInspection/AnnotateMethodFix.java b/java/java-impl/src/com/intellij/codeInspection/AnnotateMethodFix.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/AnnotateMethodFix.java
rename to java/java-impl/src/com/intellij/codeInspection/AnnotateMethodFix.java
diff --git a/inspections/impl/com/intellij/codeInspection/DeleteThrowsFix.java b/java/java-impl/src/com/intellij/codeInspection/DeleteThrowsFix.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/DeleteThrowsFix.java
rename to java/java-impl/src/com/intellij/codeInspection/DeleteThrowsFix.java
diff --git a/inspections/impl/com/intellij/codeInspection/LossyEncodingInspection.java b/java/java-impl/src/com/intellij/codeInspection/LossyEncodingInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/LossyEncodingInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/LossyEncodingInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/MoveToPackageFix.java b/java/java-impl/src/com/intellij/codeInspection/MoveToPackageFix.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/MoveToPackageFix.java
rename to java/java-impl/src/com/intellij/codeInspection/MoveToPackageFix.java
diff --git a/inspections/impl/com/intellij/codeInspection/RedundantSuppressInspection.java b/java/java-impl/src/com/intellij/codeInspection/RedundantSuppressInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/RedundantSuppressInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/RedundantSuppressInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/RemoveAnnotationQuickFix.java b/java/java-impl/src/com/intellij/codeInspection/RemoveAnnotationQuickFix.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/RemoveAnnotationQuickFix.java
rename to java/java-impl/src/com/intellij/codeInspection/RemoveAnnotationQuickFix.java
diff --git a/inspections/impl/com/intellij/codeInspection/SuppressManagerImpl.java b/java/java-impl/src/com/intellij/codeInspection/SuppressManagerImpl.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/SuppressManagerImpl.java
rename to java/java-impl/src/com/intellij/codeInspection/SuppressManagerImpl.java
diff --git a/inspections/impl/com/intellij/codeInspection/SurroundWithIfFix.java b/java/java-impl/src/com/intellij/codeInspection/SurroundWithIfFix.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/SurroundWithIfFix.java
rename to java/java-impl/src/com/intellij/codeInspection/SurroundWithIfFix.java
diff --git a/inspections/impl/com/intellij/codeInspection/accessStaticViaInstance/AccessStaticViaInstance.java b/java/java-impl/src/com/intellij/codeInspection/accessStaticViaInstance/AccessStaticViaInstance.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/accessStaticViaInstance/AccessStaticViaInstance.java
rename to java/java-impl/src/com/intellij/codeInspection/accessStaticViaInstance/AccessStaticViaInstance.java
diff --git a/inspections/impl/com/intellij/codeInspection/actions/UnimplementInterfaceAction.java b/java/java-impl/src/com/intellij/codeInspection/actions/UnimplementInterfaceAction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/actions/UnimplementInterfaceAction.java
rename to java/java-impl/src/com/intellij/codeInspection/actions/UnimplementInterfaceAction.java
diff --git a/inspections/impl/com/intellij/codeInspection/canBeFinal/CanBeFinalAnnotator.java b/java/java-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalAnnotator.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/canBeFinal/CanBeFinalAnnotator.java
rename to java/java-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalAnnotator.java
diff --git a/inspections/impl/com/intellij/codeInspection/canBeFinal/CanBeFinalInspection.java b/java/java-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/canBeFinal/CanBeFinalInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/AnnotationsAwareDataFlowRunner.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/AnnotationsAwareDataFlowRunner.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/AnnotationsAwareDataFlowRunner.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/AnnotationsAwareDataFlowRunner.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/ControlFlow.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlow.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/ControlFlow.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlow.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlowAnalyzer.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/DataFlowInspection.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/DataFlowInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/DataFlowRunner.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/DataFlowRunner.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/DataFlowRunner.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/DataFlowRunner.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/DelegatingInstructionVisitor.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/DelegatingInstructionVisitor.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/DelegatingInstructionVisitor.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/DelegatingInstructionVisitor.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/DfaInstructionState.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/DfaInstructionState.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/DfaInstructionState.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/DfaInstructionState.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/DfaMemoryState.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/DfaMemoryState.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/DfaMemoryState.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/DfaMemoryState.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/DfaMemoryStateImpl.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/DfaMemoryStateImpl.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/DfaMemoryStateImpl.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/DfaMemoryStateImpl.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/DfaUtil.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/DfaUtil.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/DfaUtil.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/DfaUtil.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/DfaVariableState.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/DfaVariableState.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/DfaVariableState.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/DfaVariableState.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/InstructionFactory.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/InstructionFactory.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/InstructionFactory.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/InstructionFactory.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/InstructionHandler.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/InstructionHandler.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/InstructionHandler.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/InstructionHandler.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/InstructionVisitor.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/InstructionVisitor.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/InstructionVisitor.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/InstructionVisitor.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/RunnerResult.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/RunnerResult.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/RunnerResult.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/RunnerResult.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/SortedIntSet.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/SortedIntSet.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/SortedIntSet.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/SortedIntSet.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/StandardDataFlowRunner.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/StandardDataFlowRunner.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/StandardDataFlowRunner.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/StandardDataFlowRunner.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/StandardInstructionVisitor.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/StandardInstructionVisitor.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/StandardInstructionVisitor.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/StandardInstructionVisitor.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/ValuableDataFlowRunner.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/ValuableDataFlowRunner.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/ValuableDataFlowRunner.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/ValuableDataFlowRunner.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/AssignInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/AssignInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/AssignInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/AssignInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/BinopInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/BinopInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/BinopInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/BinopInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/BranchingInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/BranchingInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/BranchingInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/BranchingInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/CheckReturnValueInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/CheckReturnValueInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/CheckReturnValueInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/CheckReturnValueInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/ConditionalGotoInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/ConditionalGotoInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/ConditionalGotoInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/ConditionalGotoInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/DupInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/DupInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/DupInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/DupInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/EmptyInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/EmptyInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/EmptyInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/EmptyInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/EmptyStackInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/EmptyStackInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/EmptyStackInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/EmptyStackInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/FieldReferenceInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/FieldReferenceInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/FieldReferenceInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/FieldReferenceInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/FlushVariableInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/FlushVariableInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/FlushVariableInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/FlushVariableInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/GosubInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/GosubInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/GosubInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/GosubInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/GotoInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/GotoInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/GotoInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/GotoInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/InstanceofInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/InstanceofInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/InstanceofInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/InstanceofInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/Instruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/Instruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/Instruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/Instruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/MethodCallInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/MethodCallInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/MethodCallInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/MethodCallInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/NotInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/NotInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/NotInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/NotInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/PopInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/PopInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/PopInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/PopInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/PushInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/PushInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/PushInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/PushInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/ReturnFromSubInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/ReturnFromSubInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/ReturnFromSubInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/ReturnFromSubInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/ReturnInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/ReturnInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/ReturnInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/ReturnInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/SwapInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/SwapInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/SwapInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/SwapInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/instructions/TypeCastInstruction.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/TypeCastInstruction.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/instructions/TypeCastInstruction.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/instructions/TypeCastInstruction.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaBoxedValue.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaBoxedValue.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaBoxedValue.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaBoxedValue.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaConstValue.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaConstValue.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaConstValue.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaConstValue.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaNotNullValue.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaNotNullValue.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaNotNullValue.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaNotNullValue.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaRelationValue.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaRelationValue.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaRelationValue.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaRelationValue.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaTypeValue.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaTypeValue.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaTypeValue.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaTypeValue.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaUnboxedValue.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaUnboxedValue.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaUnboxedValue.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaUnboxedValue.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaUnknownValue.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaUnknownValue.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaUnknownValue.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaUnknownValue.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaValue.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaValue.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaValue.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaValue.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaValueFactory.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaValueFactory.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaValueFactory.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaValueFactory.java
diff --git a/inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaVariableValue.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaVariableValue.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dataFlow/value/DfaVariableValue.java
rename to java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaVariableValue.java
diff --git a/inspections/impl/com/intellij/codeInspection/deadCode/DeadCodeInspection.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/DeadCodeInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/deadCode/DeadCodeInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/deadCode/DeadCodeInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/deadCode/DeadHTMLComposer.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/DeadHTMLComposer.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/deadCode/DeadHTMLComposer.java
rename to java/java-impl/src/com/intellij/codeInspection/deadCode/DeadHTMLComposer.java
diff --git a/inspections/impl/com/intellij/codeInspection/deadCode/DummyEntryPointsTool.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/DummyEntryPointsTool.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/deadCode/DummyEntryPointsTool.java
rename to java/java-impl/src/com/intellij/codeInspection/deadCode/DummyEntryPointsTool.java
diff --git a/inspections/impl/com/intellij/codeInspection/deadCode/RefEntryPointFilter.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/RefEntryPointFilter.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/deadCode/RefEntryPointFilter.java
rename to java/java-impl/src/com/intellij/codeInspection/deadCode/RefEntryPointFilter.java
diff --git a/inspections/impl/com/intellij/codeInspection/deadCode/RefUnreachableFilter.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/RefUnreachableFilter.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/deadCode/RefUnreachableFilter.java
rename to java/java-impl/src/com/intellij/codeInspection/deadCode/RefUnreachableFilter.java
diff --git a/inspections/impl/com/intellij/codeInspection/deadCode/UnreferencedFilter.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnreferencedFilter.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/deadCode/UnreferencedFilter.java
rename to java/java-impl/src/com/intellij/codeInspection/deadCode/UnreferencedFilter.java
diff --git a/inspections/impl/com/intellij/codeInspection/defUse/DefUseInspection.java b/java/java-impl/src/com/intellij/codeInspection/defUse/DefUseInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/defUse/DefUseInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/defUse/DefUseInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/defaultFileTemplateUsage/CatchBodyVisitor.java b/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/CatchBodyVisitor.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/defaultFileTemplateUsage/CatchBodyVisitor.java
rename to java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/CatchBodyVisitor.java
diff --git a/inspections/impl/com/intellij/codeInspection/defaultFileTemplateUsage/DefaultFileTemplateUsageInspection.java b/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/DefaultFileTemplateUsageInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/defaultFileTemplateUsage/DefaultFileTemplateUsageInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/DefaultFileTemplateUsageInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/defaultFileTemplateUsage/FileHeaderChecker.java b/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/FileHeaderChecker.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/defaultFileTemplateUsage/FileHeaderChecker.java
rename to java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/FileHeaderChecker.java
diff --git a/inspections/impl/com/intellij/codeInspection/defaultFileTemplateUsage/InspectionOptions.form b/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/InspectionOptions.form
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/defaultFileTemplateUsage/InspectionOptions.form
rename to java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/InspectionOptions.form
diff --git a/inspections/impl/com/intellij/codeInspection/defaultFileTemplateUsage/InspectionOptions.java b/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/InspectionOptions.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/defaultFileTemplateUsage/InspectionOptions.java
rename to java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/InspectionOptions.java
diff --git a/inspections/impl/com/intellij/codeInspection/defaultFileTemplateUsage/MethodBodyChecker.java b/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/MethodBodyChecker.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/defaultFileTemplateUsage/MethodBodyChecker.java
rename to java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/MethodBodyChecker.java
diff --git a/inspections/impl/com/intellij/codeInspection/defaultFileTemplateUsage/ReplaceWithFileTemplateFix.java b/java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/ReplaceWithFileTemplateFix.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/defaultFileTemplateUsage/ReplaceWithFileTemplateFix.java
rename to java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/ReplaceWithFileTemplateFix.java
diff --git a/inspections/impl/com/intellij/codeInspection/dependencyViolation/DependencyInspection.java b/java/java-impl/src/com/intellij/codeInspection/dependencyViolation/DependencyInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/dependencyViolation/DependencyInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/dependencyViolation/DependencyInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/deprecation/DeprecationInspection.java b/java/java-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/deprecation/DeprecationInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/duplicateThrows/DuplicateThrowsInspection.java b/java/java-impl/src/com/intellij/codeInspection/duplicateThrows/DuplicateThrowsInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/duplicateThrows/DuplicateThrowsInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/duplicateThrows/DuplicateThrowsInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java b/java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/emptyMethod/EmptyMethodInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/equalsAndHashcode/EqualsAndHashcode.java b/java/java-impl/src/com/intellij/codeInspection/equalsAndHashcode/EqualsAndHashcode.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/equalsAndHashcode/EqualsAndHashcode.java
rename to java/java-impl/src/com/intellij/codeInspection/equalsAndHashcode/EqualsAndHashcode.java
diff --git a/inspections/impl/com/intellij/codeInspection/ex/BaseLocalInspectionTool.java b/java/java-impl/src/com/intellij/codeInspection/ex/BaseLocalInspectionTool.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/ex/BaseLocalInspectionTool.java
rename to java/java-impl/src/com/intellij/codeInspection/ex/BaseLocalInspectionTool.java
diff --git a/inspections/impl/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java b/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java
rename to java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java
diff --git a/inspections/impl/com/intellij/codeInspection/ex/FilteringInspectionTool.java b/java/java-impl/src/com/intellij/codeInspection/ex/FilteringInspectionTool.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/ex/FilteringInspectionTool.java
rename to java/java-impl/src/com/intellij/codeInspection/ex/FilteringInspectionTool.java
diff --git a/inspections/impl/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java b/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java
rename to java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java
diff --git a/inspections/impl/com/intellij/codeInspection/ex/HTMLJavaHTMLComposerImpl.java b/java/java-impl/src/com/intellij/codeInspection/ex/HTMLJavaHTMLComposerImpl.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/ex/HTMLJavaHTMLComposerImpl.java
rename to java/java-impl/src/com/intellij/codeInspection/ex/HTMLJavaHTMLComposerImpl.java
diff --git a/inspections/impl/com/intellij/codeInspection/ex/JavaInspectionExtensionsFactory.java b/java/java-impl/src/com/intellij/codeInspection/ex/JavaInspectionExtensionsFactory.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/ex/JavaInspectionExtensionsFactory.java
rename to java/java-impl/src/com/intellij/codeInspection/ex/JavaInspectionExtensionsFactory.java
diff --git a/inspections/impl/com/intellij/codeInspection/ex/StandardInspectionToolsProvider.java b/java/java-impl/src/com/intellij/codeInspection/ex/StandardInspectionToolsProvider.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/ex/StandardInspectionToolsProvider.java
rename to java/java-impl/src/com/intellij/codeInspection/ex/StandardInspectionToolsProvider.java
diff --git a/inspections/impl/com/intellij/codeInspection/java15api/ForbiddenApiChooser.form b/java/java-impl/src/com/intellij/codeInspection/java15api/ForbiddenApiChooser.form
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/java15api/ForbiddenApiChooser.form
rename to java/java-impl/src/com/intellij/codeInspection/java15api/ForbiddenApiChooser.form
diff --git a/inspections/impl/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java b/java/java-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/java15api/api16List.txt b/java/java-impl/src/com/intellij/codeInspection/java15api/api16List.txt
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/java15api/api16List.txt
rename to java/java-impl/src/com/intellij/codeInspection/java15api/api16List.txt
diff --git a/inspections/impl/com/intellij/codeInspection/java15api/apiList.txt b/java/java-impl/src/com/intellij/codeInspection/java15api/apiList.txt
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/java15api/apiList.txt
rename to java/java-impl/src/com/intellij/codeInspection/java15api/apiList.txt
diff --git a/inspections/impl/com/intellij/codeInspection/java15api/ignore16List.txt b/java/java-impl/src/com/intellij/codeInspection/java15api/ignore16List.txt
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/java15api/ignore16List.txt
rename to java/java-impl/src/com/intellij/codeInspection/java15api/ignore16List.txt
diff --git a/inspections/impl/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/localCanBeFinal/LocalCanBeFinal.java b/java/java-impl/src/com/intellij/codeInspection/localCanBeFinal/LocalCanBeFinal.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/localCanBeFinal/LocalCanBeFinal.java
rename to java/java-impl/src/com/intellij/codeInspection/localCanBeFinal/LocalCanBeFinal.java
diff --git a/inspections/impl/com/intellij/codeInspection/miscGenerics/GenericsInspectionToolBase.java b/java/java-impl/src/com/intellij/codeInspection/miscGenerics/GenericsInspectionToolBase.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/miscGenerics/GenericsInspectionToolBase.java
rename to java/java-impl/src/com/intellij/codeInspection/miscGenerics/GenericsInspectionToolBase.java
diff --git a/inspections/impl/com/intellij/codeInspection/miscGenerics/RedundantArrayForVarargsCallInspection.java b/java/java-impl/src/com/intellij/codeInspection/miscGenerics/RedundantArrayForVarargsCallInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/miscGenerics/RedundantArrayForVarargsCallInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/miscGenerics/RedundantArrayForVarargsCallInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/miscGenerics/RedundantTypeArgsInspection.java b/java/java-impl/src/com/intellij/codeInspection/miscGenerics/RedundantTypeArgsInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/miscGenerics/RedundantTypeArgsInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/miscGenerics/RedundantTypeArgsInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/miscGenerics/SuspiciousCollectionsMethodCallsInspection.java b/java/java-impl/src/com/intellij/codeInspection/miscGenerics/SuspiciousCollectionsMethodCallsInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/miscGenerics/SuspiciousCollectionsMethodCallsInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/miscGenerics/SuspiciousCollectionsMethodCallsInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/miscGenerics/SuspiciousCollectionsMethodCallsInspectionForm.form b/java/java-impl/src/com/intellij/codeInspection/miscGenerics/SuspiciousCollectionsMethodCallsInspectionForm.form
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/miscGenerics/SuspiciousCollectionsMethodCallsInspectionForm.form
rename to java/java-impl/src/com/intellij/codeInspection/miscGenerics/SuspiciousCollectionsMethodCallsInspectionForm.form
diff --git a/inspections/impl/com/intellij/codeInspection/nullable/AnnotateOverriddenMethodParameterFix.java b/java/java-impl/src/com/intellij/codeInspection/nullable/AnnotateOverriddenMethodParameterFix.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/nullable/AnnotateOverriddenMethodParameterFix.java
rename to java/java-impl/src/com/intellij/codeInspection/nullable/AnnotateOverriddenMethodParameterFix.java
diff --git a/inspections/impl/com/intellij/codeInspection/nullable/NullableStuffInspection.java b/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/nullable/NullableStuffInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/nullable/OptionsPanel.form b/java/java-impl/src/com/intellij/codeInspection/nullable/OptionsPanel.form
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/nullable/OptionsPanel.form
rename to java/java-impl/src/com/intellij/codeInspection/nullable/OptionsPanel.form
diff --git a/inspections/impl/com/intellij/codeInspection/redundantCast/RedundantCastInspection.java b/java/java-impl/src/com/intellij/codeInspection/redundantCast/RedundantCastInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/redundantCast/RedundantCastInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/redundantCast/RedundantCastInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/reference/RefClassImpl.java b/java/java-impl/src/com/intellij/codeInspection/reference/RefClassImpl.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/reference/RefClassImpl.java
rename to java/java-impl/src/com/intellij/codeInspection/reference/RefClassImpl.java
diff --git a/inspections/impl/com/intellij/codeInspection/reference/RefFieldImpl.java b/java/java-impl/src/com/intellij/codeInspection/reference/RefFieldImpl.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/reference/RefFieldImpl.java
rename to java/java-impl/src/com/intellij/codeInspection/reference/RefFieldImpl.java
diff --git a/inspections/impl/com/intellij/codeInspection/reference/RefImplicitConstructorImpl.java b/java/java-impl/src/com/intellij/codeInspection/reference/RefImplicitConstructorImpl.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/reference/RefImplicitConstructorImpl.java
rename to java/java-impl/src/com/intellij/codeInspection/reference/RefImplicitConstructorImpl.java
diff --git a/inspections/impl/com/intellij/codeInspection/reference/RefJavaElementImpl.java b/java/java-impl/src/com/intellij/codeInspection/reference/RefJavaElementImpl.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/reference/RefJavaElementImpl.java
rename to java/java-impl/src/com/intellij/codeInspection/reference/RefJavaElementImpl.java
diff --git a/inspections/impl/com/intellij/codeInspection/reference/RefJavaFileImpl.java b/java/java-impl/src/com/intellij/codeInspection/reference/RefJavaFileImpl.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/reference/RefJavaFileImpl.java
rename to java/java-impl/src/com/intellij/codeInspection/reference/RefJavaFileImpl.java
diff --git a/inspections/impl/com/intellij/codeInspection/reference/RefJavaManagerImpl.java b/java/java-impl/src/com/intellij/codeInspection/reference/RefJavaManagerImpl.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/reference/RefJavaManagerImpl.java
rename to java/java-impl/src/com/intellij/codeInspection/reference/RefJavaManagerImpl.java
diff --git a/inspections/impl/com/intellij/codeInspection/reference/RefJavaUtilImpl.java b/java/java-impl/src/com/intellij/codeInspection/reference/RefJavaUtilImpl.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/reference/RefJavaUtilImpl.java
rename to java/java-impl/src/com/intellij/codeInspection/reference/RefJavaUtilImpl.java
diff --git a/inspections/impl/com/intellij/codeInspection/reference/RefMethodImpl.java b/java/java-impl/src/com/intellij/codeInspection/reference/RefMethodImpl.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/reference/RefMethodImpl.java
rename to java/java-impl/src/com/intellij/codeInspection/reference/RefMethodImpl.java
diff --git a/inspections/impl/com/intellij/codeInspection/reference/RefPackageImpl.java b/java/java-impl/src/com/intellij/codeInspection/reference/RefPackageImpl.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/reference/RefPackageImpl.java
rename to java/java-impl/src/com/intellij/codeInspection/reference/RefPackageImpl.java
diff --git a/inspections/impl/com/intellij/codeInspection/reference/RefParameterImpl.java b/java/java-impl/src/com/intellij/codeInspection/reference/RefParameterImpl.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/reference/RefParameterImpl.java
rename to java/java-impl/src/com/intellij/codeInspection/reference/RefParameterImpl.java
diff --git a/inspections/impl/com/intellij/codeInspection/sameParameterValue/SameParameterValueInspection.java b/java/java-impl/src/com/intellij/codeInspection/sameParameterValue/SameParameterValueInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/sameParameterValue/SameParameterValueInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/sameParameterValue/SameParameterValueInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/sameReturnValue/SameReturnValueInspection.java b/java/java-impl/src/com/intellij/codeInspection/sameReturnValue/SameReturnValueInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/sameReturnValue/SameReturnValueInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/sameReturnValue/SameReturnValueInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/sillyAssignment/SillyAssignmentInspection.java b/java/java-impl/src/com/intellij/codeInspection/sillyAssignment/SillyAssignmentInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/sillyAssignment/SillyAssignmentInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/sillyAssignment/SillyAssignmentInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/suspiciousNameCombination/SuspiciousNameCombinationInspection.java b/java/java-impl/src/com/intellij/codeInspection/suspiciousNameCombination/SuspiciousNameCombinationInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/suspiciousNameCombination/SuspiciousNameCombinationInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/suspiciousNameCombination/SuspiciousNameCombinationInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/testOnly/TestOnlyInspection.java b/java/java-impl/src/com/intellij/codeInspection/testOnly/TestOnlyInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/testOnly/TestOnlyInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/testOnly/TestOnlyInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/ui/EntryPointsNode.java b/java/java-impl/src/com/intellij/codeInspection/ui/EntryPointsNode.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/ui/EntryPointsNode.java
rename to java/java-impl/src/com/intellij/codeInspection/ui/EntryPointsNode.java
diff --git a/inspections/impl/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspection.java b/java/java-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/unnecessaryModuleDependency/UnnecessaryModuleDependencyAnnotator.java b/java/java-impl/src/com/intellij/codeInspection/unnecessaryModuleDependency/UnnecessaryModuleDependencyAnnotator.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/unnecessaryModuleDependency/UnnecessaryModuleDependencyAnnotator.java
rename to java/java-impl/src/com/intellij/codeInspection/unnecessaryModuleDependency/UnnecessaryModuleDependencyAnnotator.java
diff --git a/inspections/impl/com/intellij/codeInspection/unnecessaryModuleDependency/UnnecessaryModuleDependencyInspection.java b/java/java-impl/src/com/intellij/codeInspection/unnecessaryModuleDependency/UnnecessaryModuleDependencyInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/unnecessaryModuleDependency/UnnecessaryModuleDependencyInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/unnecessaryModuleDependency/UnnecessaryModuleDependencyInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/unneededThrows/RedundantThrows.java b/java/java-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrows.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/unneededThrows/RedundantThrows.java
rename to java/java-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrows.java
diff --git a/inspections/impl/com/intellij/codeInspection/unneededThrows/RedundantThrowsDeclaration.java b/java/java-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrowsDeclaration.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/unneededThrows/RedundantThrowsDeclaration.java
rename to java/java-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrowsDeclaration.java
diff --git a/inspections/impl/com/intellij/codeInspection/unusedImport/UnusedImportLocalInspection.java b/java/java-impl/src/com/intellij/codeInspection/unusedImport/UnusedImportLocalInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/unusedImport/UnusedImportLocalInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/unusedImport/UnusedImportLocalInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/unusedLibraries/UnusedLibrariesInspection.java b/java/java-impl/src/com/intellij/codeInspection/unusedLibraries/UnusedLibrariesInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/unusedLibraries/UnusedLibrariesInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/unusedLibraries/UnusedLibrariesInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java b/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java b/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java
rename to java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java
diff --git a/inspections/impl/com/intellij/codeInspection/unusedSymbol/OptionsPanel.form b/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/OptionsPanel.form
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/unusedSymbol/OptionsPanel.form
rename to java/java-impl/src/com/intellij/codeInspection/unusedSymbol/OptionsPanel.form
diff --git a/inspections/impl/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspection.java b/java/java-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/unusedSymbol/UnusedSymbolLocalInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/util/IgnorableRefFilter.java b/java/java-impl/src/com/intellij/codeInspection/util/IgnorableRefFilter.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/util/IgnorableRefFilter.java
rename to java/java-impl/src/com/intellij/codeInspection/util/IgnorableRefFilter.java
diff --git a/inspections/impl/com/intellij/codeInspection/util/RefFilter.java b/java/java-impl/src/com/intellij/codeInspection/util/RefFilter.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/util/RefFilter.java
rename to java/java-impl/src/com/intellij/codeInspection/util/RefFilter.java
diff --git a/inspections/impl/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java b/java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java
rename to java/java-impl/src/com/intellij/codeInspection/util/SpecialAnnotationsUtil.java
diff --git a/inspections/impl/com/intellij/codeInspection/util/XMLExportUtl.java b/java/java-impl/src/com/intellij/codeInspection/util/XMLExportUtl.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/util/XMLExportUtl.java
rename to java/java-impl/src/com/intellij/codeInspection/util/XMLExportUtl.java
diff --git a/inspections/impl/com/intellij/codeInspection/varScopeCanBeNarrowed/FieldCanBeLocalInspection.java b/java/java-impl/src/com/intellij/codeInspection/varScopeCanBeNarrowed/FieldCanBeLocalInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/varScopeCanBeNarrowed/FieldCanBeLocalInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/varScopeCanBeNarrowed/FieldCanBeLocalInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/visibility/VisibilityExtension.java b/java/java-impl/src/com/intellij/codeInspection/visibility/VisibilityExtension.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/visibility/VisibilityExtension.java
rename to java/java-impl/src/com/intellij/codeInspection/visibility/VisibilityExtension.java
diff --git a/inspections/impl/com/intellij/codeInspection/visibility/VisibilityInspection.java b/java/java-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/visibility/VisibilityInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java
diff --git a/inspections/impl/com/intellij/codeInspection/wrongPackageStatement/AdjustPackageNameFix.java b/java/java-impl/src/com/intellij/codeInspection/wrongPackageStatement/AdjustPackageNameFix.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/wrongPackageStatement/AdjustPackageNameFix.java
rename to java/java-impl/src/com/intellij/codeInspection/wrongPackageStatement/AdjustPackageNameFix.java
diff --git a/inspections/impl/com/intellij/codeInspection/wrongPackageStatement/WrongPackageStatementInspection.java b/java/java-impl/src/com/intellij/codeInspection/wrongPackageStatement/WrongPackageStatementInspection.java
similarity index 100%
rename from inspections/impl/com/intellij/codeInspection/wrongPackageStatement/WrongPackageStatementInspection.java
rename to java/java-impl/src/com/intellij/codeInspection/wrongPackageStatement/WrongPackageStatementInspection.java
diff --git a/inspections/impl/com/intellij/profile/codeInspection/JavaAwareInspectionProfileManager.java b/java/java-impl/src/com/intellij/profile/codeInspection/JavaAwareInspectionProfileManager.java
similarity index 100%
rename from inspections/impl/com/intellij/profile/codeInspection/JavaAwareInspectionProfileManager.java
rename to java/java-impl/src/com/intellij/profile/codeInspection/JavaAwareInspectionProfileManager.java
diff --git a/java/testFramework/testFramework-java.iml b/java/testFramework/testFramework-java.iml
index 542e592c28b8..ba41d7e5ef37 100644
--- a/java/testFramework/testFramework-java.iml
+++ b/java/testFramework/testFramework-java.iml
@@ -15,7 +15,6 @@
-
diff --git a/ui-designer/impl/ui-designer-impl.iml b/ui-designer/impl/ui-designer-impl.iml
index 2d3564da6c4d..12b45cd0e3bd 100644
--- a/ui-designer/impl/ui-designer-impl.iml
+++ b/ui-designer/impl/ui-designer-impl.iml
@@ -16,7 +16,6 @@
-