diff --git a/java/java-impl/src/com/siyeh/ig/controlflow/ConditionCoveredByFurtherConditionInspection.java b/java/java-impl-inspections/src/com/siyeh/ig/controlflow/ConditionCoveredByFurtherConditionInspection.java
similarity index 100%
rename from java/java-impl/src/com/siyeh/ig/controlflow/ConditionCoveredByFurtherConditionInspection.java
rename to java/java-impl-inspections/src/com/siyeh/ig/controlflow/ConditionCoveredByFurtherConditionInspection.java
diff --git a/java/java-impl/src/com/siyeh/ig/controlflow/ConditionalExpressionInspection.java b/java/java-impl-inspections/src/com/siyeh/ig/controlflow/ConditionalExpressionInspection.java
similarity index 100%
rename from java/java-impl/src/com/siyeh/ig/controlflow/ConditionalExpressionInspection.java
rename to java/java-impl-inspections/src/com/siyeh/ig/controlflow/ConditionalExpressionInspection.java
diff --git a/java/java-impl/src/com/siyeh/ig/controlflow/EnumSwitchStatementWhichMissesCasesInspection.java b/java/java-impl-inspections/src/com/siyeh/ig/controlflow/EnumSwitchStatementWhichMissesCasesInspection.java
similarity index 100%
rename from java/java-impl/src/com/siyeh/ig/controlflow/EnumSwitchStatementWhichMissesCasesInspection.java
rename to java/java-impl-inspections/src/com/siyeh/ig/controlflow/EnumSwitchStatementWhichMissesCasesInspection.java
diff --git a/java/java-impl/src/com/siyeh/ig/controlflow/ExcessiveRangeCheckInspection.java b/java/java-impl-inspections/src/com/siyeh/ig/controlflow/ExcessiveRangeCheckInspection.java
similarity index 100%
rename from java/java-impl/src/com/siyeh/ig/controlflow/ExcessiveRangeCheckInspection.java
rename to java/java-impl-inspections/src/com/siyeh/ig/controlflow/ExcessiveRangeCheckInspection.java
diff --git a/java/java-impl/src/com/siyeh/ig/controlflow/NonStrictComparisonCanBeEqualityInspection.java b/java/java-impl-inspections/src/com/siyeh/ig/controlflow/NonStrictComparisonCanBeEqualityInspection.java
similarity index 100%
rename from java/java-impl/src/com/siyeh/ig/controlflow/NonStrictComparisonCanBeEqualityInspection.java
rename to java/java-impl-inspections/src/com/siyeh/ig/controlflow/NonStrictComparisonCanBeEqualityInspection.java
diff --git a/java/java-impl/src/com/siyeh/ig/controlflow/OverlyComplexBooleanExpressionInspection.java b/java/java-impl-inspections/src/com/siyeh/ig/controlflow/OverlyComplexBooleanExpressionInspection.java
similarity index 100%
rename from java/java-impl/src/com/siyeh/ig/controlflow/OverlyComplexBooleanExpressionInspection.java
rename to java/java-impl-inspections/src/com/siyeh/ig/controlflow/OverlyComplexBooleanExpressionInspection.java
diff --git a/java/java-impl/src/com/siyeh/ig/controlflow/PointlessBooleanExpressionInspection.java b/java/java-impl-inspections/src/com/siyeh/ig/controlflow/PointlessBooleanExpressionInspection.java
similarity index 100%
rename from java/java-impl/src/com/siyeh/ig/controlflow/PointlessBooleanExpressionInspection.java
rename to java/java-impl-inspections/src/com/siyeh/ig/controlflow/PointlessBooleanExpressionInspection.java
diff --git a/java/java-impl/src/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspection.java b/java/java-impl-inspections/src/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspection.java
similarity index 100%
rename from java/java-impl/src/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspection.java
rename to java/java-impl-inspections/src/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspection.java
diff --git a/java/java-impl/src/com/siyeh/ig/controlflow/SwitchStatementsWithoutDefaultInspection.java b/java/java-impl-inspections/src/com/siyeh/ig/controlflow/SwitchStatementsWithoutDefaultInspection.java
similarity index 100%
rename from java/java-impl/src/com/siyeh/ig/controlflow/SwitchStatementsWithoutDefaultInspection.java
rename to java/java-impl-inspections/src/com/siyeh/ig/controlflow/SwitchStatementsWithoutDefaultInspection.java
diff --git a/java/java-impl/src/com/siyeh/ig/controlflow/UnnecessaryDefaultInspection.java b/java/java-impl/src/com/siyeh/ig/controlflow/UnnecessaryDefaultInspection.java
index 66e3bf223a3e..d7c7f39f0201 100644
--- a/java/java-impl/src/com/siyeh/ig/controlflow/UnnecessaryDefaultInspection.java
+++ b/java/java-impl/src/com/siyeh/ig/controlflow/UnnecessaryDefaultInspection.java
@@ -87,6 +87,8 @@ import static com.intellij.codeInspection.options.OptPane.pane;
 import static com.siyeh.ig.psiutils.SwitchUtils.SwitchExhaustivenessState;
 import static com.siyeh.ig.psiutils.SwitchUtils.evaluateSwitchCompleteness;
 
+// TODO(bartekpacia): Move to the "intelij.java.impl.inspections" module
+//  once the situation with QuickFixFactoryImpl in "intellij.java.impl" depending on this class is resolved.
 public final class UnnecessaryDefaultInspection extends BaseInspection {
 
   public boolean onlyReportSwitchExpressions = true;