diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/AddSerialVersionUIDFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/AddSerialVersionUIDFix.java
similarity index 100%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/fixes/AddSerialVersionUIDFix.java
rename to plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/AddSerialVersionUIDFix.java
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/AddThisQualifierFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/AddThisQualifierFix.java
similarity index 100%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/fixes/AddThisQualifierFix.java
rename to plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/AddThisQualifierFix.java
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ChangeModifierFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ChangeModifierFix.java
similarity index 100%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ChangeModifierFix.java
rename to plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ChangeModifierFix.java
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/DeleteImportFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteImportFix.java
similarity index 100%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/fixes/DeleteImportFix.java
rename to plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteImportFix.java
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/DeleteUnnecessaryStatementFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteUnnecessaryStatementFix.java
similarity index 100%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/fixes/DeleteUnnecessaryStatementFix.java
rename to plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/DeleteUnnecessaryStatementFix.java
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/EqualityToEqualsFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualityToEqualsFix.java
similarity index 100%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/fixes/EqualityToEqualsFix.java
rename to plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/EqualityToEqualsFix.java
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ExtractParameterAsLocalVariableFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ExtractParameterAsLocalVariableFix.java
similarity index 100%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ExtractParameterAsLocalVariableFix.java
rename to plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ExtractParameterAsLocalVariableFix.java
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeCloneableFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeCloneableFix.java
similarity index 100%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeCloneableFix.java
rename to plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeCloneableFix.java
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeFieldFinalFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldFinalFix.java
similarity index 100%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeFieldFinalFix.java
rename to plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldFinalFix.java
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeFieldStaticFinalFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldStaticFinalFix.java
similarity index 100%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeFieldStaticFinalFix.java
rename to plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeFieldStaticFinalFix.java
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeInitializerExplicitFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeInitializerExplicitFix.java
similarity index 100%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeInitializerExplicitFix.java
rename to plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeInitializerExplicitFix.java
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeSerializableFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeSerializableFix.java
similarity index 100%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeSerializableFix.java
rename to plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MakeSerializableFix.java
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MemberSignature.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MemberSignature.java
similarity index 100%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MemberSignature.java
rename to plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/MemberSignature.java
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java
similarity index 100%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java
rename to plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RemoveModifierFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/RemoveModifierFix.java
similarity index 100%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RemoveModifierFix.java
rename to plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/RemoveModifierFix.java
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/SerialVersionUIDBuilder.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/SerialVersionUIDBuilder.java
similarity index 100%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/fixes/SerialVersionUIDBuilder.java
rename to plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/SerialVersionUIDBuilder.java
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/ui/ExternalizableStringSet.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/ui/ExternalizableStringSet.java
similarity index 100%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/ui/ExternalizableStringSet.java
rename to plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/ui/ExternalizableStringSet.java