diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java
index d9838299f5d..c10962ecd42 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java
@@ -18,6 +18,7 @@ package org.jetbrains.jet.plugin.quickfix;
 
 import org.jetbrains.jet.lang.psi.JetClass;
 import org.jetbrains.jet.plugin.codeInsight.ImplementMethodsHandler;
+import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFunctionFromUsageFix;
 
 import static org.jetbrains.jet.lang.diagnostics.Errors.*;
 import static org.jetbrains.jet.lexer.JetTokens.*;
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java
index 94beb6bdea1..981dce36286 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java
@@ -40,6 +40,7 @@ import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.presentation.JetClassPresenter;
+import org.jetbrains.jet.plugin.quickfix.createFromUsage.ClassCandidate;
 import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver;
 
 import javax.swing.*;
@@ -200,7 +201,7 @@ public class QuickFixUtil {
         return usedParameters;
     }
 
-    static class ClassCandidateListCellRenderer extends PsiElementListCellRenderer<JetClass> {
+    public static class ClassCandidateListCellRenderer extends PsiElementListCellRenderer<JetClass> {
         private final JetClassPresenter presenter = new JetClassPresenter();
 
         @Override
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/CreateFromUsageFixBase.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateFromUsageFixBase.kt
similarity index 88%
rename from idea/src/org/jetbrains/jet/plugin/quickfix/CreateFromUsageFixBase.kt
rename to idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateFromUsageFixBase.kt
index 6493f0dbf92..f3c5db11268 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/CreateFromUsageFixBase.kt
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateFromUsageFixBase.kt
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.quickfix
+package org.jetbrains.jet.plugin.quickfix.createFromUsage
 
 import com.intellij.psi.PsiElement
 import org.jetbrains.jet.plugin.JetBundle
+import org.jetbrains.jet.plugin.quickfix.JetIntentionAction
 
 public abstract class CreateFromUsageFixBase(element: PsiElement) : JetIntentionAction<PsiElement>(element) {
     override fun getFamilyName(): String = JetBundle.message("create.from.usage.family")
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/CreateFunctionFromUsageFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateFunctionFromUsageFix.kt
similarity index 99%
rename from idea/src/org/jetbrains/jet/plugin/quickfix/CreateFunctionFromUsageFix.kt
rename to idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateFunctionFromUsageFix.kt
index 4e3ea9b1708..95aa5804a34 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/CreateFunctionFromUsageFix.kt
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateFunctionFromUsageFix.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.plugin.quickfix
+package org.jetbrains.jet.plugin.quickfix.createFromUsage
 
 import com.intellij.codeInsight.intention.IntentionAction
 import com.intellij.codeInsight.lookup.LookupElement
@@ -72,6 +72,8 @@ import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory
 import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils
 import org.jetbrains.jet.lang.resolve.dataClassUtils.isComponentLike
 import org.jetbrains.jet.lang.resolve.dataClassUtils.getComponentIndex
+import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory
+import org.jetbrains.jet.plugin.quickfix.QuickFixUtil
 
 private val TYPE_PARAMETER_LIST_VARIABLE_NAME = "typeParameterList"
 private val TEMPLATE_FROM_USAGE_FUNCTION_BODY = "New Kotlin Function Body.kt"