diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/BooleanLiteralEqualityPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/BooleanLiteralEqualityPredicate.java
index 7b0cdfd17c17..090e8f4ac904 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/BooleanLiteralEqualityPredicate.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/BooleanLiteralEqualityPredicate.java
@@ -2,7 +2,8 @@ package com.siyeh.ipp.bool;
 
 import com.intellij.psi.*;
 import com.intellij.psi.tree.IElementType;
-import com.siyeh.ipp.PsiElementPredicate;
+import com.siyeh.ipp.base.PsiElementPredicate;
+import com.siyeh.ipp.base.PsiElementPredicate;
 import com.siyeh.ipp.psiutils.BoolUtils;
 
 class BooleanLiteralEqualityPredicate implements PsiElementPredicate
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/ComparisonPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/ComparisonPredicate.java
index ca4371bbee2f..5190fcd891ec 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/ComparisonPredicate.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/ComparisonPredicate.java
@@ -1,7 +1,9 @@
 package com.siyeh.ipp.bool;
 
-import com.intellij.psi.*;
-import com.siyeh.ipp.PsiElementPredicate;
+import com.intellij.psi.PsiBinaryExpression;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiExpression;
+import com.siyeh.ipp.base.PsiElementPredicate;
 import com.siyeh.ipp.psiutils.ComparisonUtils;
 
 class ComparisonPredicate implements PsiElementPredicate
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/ConjunctionPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/ConjunctionPredicate.java
index b6bd3fcaa9ab..992d384491d5 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/ConjunctionPredicate.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/ConjunctionPredicate.java
@@ -2,7 +2,7 @@ package com.siyeh.ipp.bool;
 
 import com.intellij.psi.*;
 import com.intellij.psi.tree.IElementType;
-import com.siyeh.ipp.PsiElementPredicate;
+import com.siyeh.ipp.base.PsiElementPredicate;
 
 class ConjunctionPredicate implements PsiElementPredicate
 {
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/DemorgansIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/DemorgansIntention.java
index e5846acb56b8..c5c856cda904 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/DemorgansIntention.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/DemorgansIntention.java
@@ -6,14 +6,12 @@ import com.intellij.psi.*;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.IncorrectOperationException;
 import com.siyeh.ipp.*;
+import com.siyeh.ipp.base.MutablyNamedIntention;
+import com.siyeh.ipp.base.PsiElementPredicate;
 import com.siyeh.ipp.psiutils.*;
 
 public class DemorgansIntention extends MutablyNamedIntention
 {
-    public DemorgansIntention(Project project)
-    {
-        super(project);
-    }
 
     protected String getTextForElement(PsiElement element)
     {
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/FlipComparisonIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/FlipComparisonIntention.java
index 077f88e7f22b..eac40cc5b0cf 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/FlipComparisonIntention.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/FlipComparisonIntention.java
@@ -4,15 +4,12 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.util.IncorrectOperationException;
-import com.siyeh.ipp.*;
+import com.siyeh.ipp.base.MutablyNamedIntention;
+import com.siyeh.ipp.base.PsiElementPredicate;
 import com.siyeh.ipp.psiutils.ComparisonUtils;
 
 public class FlipComparisonIntention extends MutablyNamedIntention
 {
-    public FlipComparisonIntention(Project project)
-    {
-        super(project);
-    }
 
     public String getTextForElement(PsiElement element)
     {
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/FlipConjunctionIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/FlipConjunctionIntention.java
index e0afb708116f..3e6ccb8a8c64 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/FlipConjunctionIntention.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/FlipConjunctionIntention.java
@@ -6,13 +6,11 @@ import com.intellij.psi.*;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.IncorrectOperationException;
 import com.siyeh.ipp.*;
+import com.siyeh.ipp.base.MutablyNamedIntention;
+import com.siyeh.ipp.base.PsiElementPredicate;
 
 public class FlipConjunctionIntention extends MutablyNamedIntention
 {
-    public FlipConjunctionIntention(Project project)
-    {
-        super(project);
-    }
 
     protected String getTextForElement(PsiElement element)
     {
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/NegateComparisonIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/NegateComparisonIntention.java
index 548485a01ed1..ed23a50461b3 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/NegateComparisonIntention.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/NegateComparisonIntention.java
@@ -5,14 +5,12 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.util.IncorrectOperationException;
 import com.siyeh.ipp.*;
+import com.siyeh.ipp.base.MutablyNamedIntention;
+import com.siyeh.ipp.base.PsiElementPredicate;
 import com.siyeh.ipp.psiutils.ComparisonUtils;
 
 public class NegateComparisonIntention extends MutablyNamedIntention
 {
-    public NegateComparisonIntention(Project project)
-    {
-        super(project);
-    }
 
     public String getTextForElement(PsiElement element)
     {
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/RemoveBooleanEqualityIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/RemoveBooleanEqualityIntention.java
index 75825527af2f..4d3b3d5871c1 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/RemoveBooleanEqualityIntention.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/bool/RemoveBooleanEqualityIntention.java
@@ -5,13 +5,11 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.util.IncorrectOperationException;
 import com.siyeh.ipp.*;
+import com.siyeh.ipp.base.MutablyNamedIntention;
+import com.siyeh.ipp.base.PsiElementPredicate;
 
 public class RemoveBooleanEqualityIntention extends MutablyNamedIntention
 {
-    public RemoveBooleanEqualityIntention(Project project)
-    {
-        super(project);
-    }
 
     protected String getTextForElement(PsiElement element)
     {