diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
index bd8478bf981..e212d11fa00 100644
--- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
+++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
@@ -24,7 +24,6 @@ import com.intellij.testFramework.UsefulTestCase;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.OutputFileCollection;
 import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.codegen.CodegenTestFiles;
@@ -33,6 +32,7 @@ import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.plugin.JetFileType;
 import org.jetbrains.jet.utils.Printer;
+import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
 import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil;
 import org.junit.Assert;
 
diff --git a/compiler/backend-common/src/output.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/output/output.kt
similarity index 92%
rename from compiler/backend-common/src/output.kt
rename to compiler/backend-common/src/org/jetbrains/kotlin/backend/common/output/output.kt
index 14da1d46dd3..b14b6392dd2 100644
--- a/compiler/backend-common/src/output.kt
+++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/output/output.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet
+package org.jetbrains.kotlin.backend.common.output
 
 import java.io.File
 
@@ -37,7 +37,7 @@ public trait OutputFile {
     override fun toString() = "$relativePath (compiled from $sourceFiles)"
 }
 
-class SimpleOutputFile(
+public class SimpleOutputFile(
         override val sourceFiles: List<File>,
         override val relativePath: String,
         private val content: String
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java b/compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java
index b26393e66ae..b4f657c001e 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/ClassFileFactory.java
@@ -24,12 +24,12 @@ import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
-import org.jetbrains.jet.OutputFile;
-import org.jetbrains.jet.OutputFileCollection;
 import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin;
 import org.jetbrains.jet.lang.resolve.name.FqName;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
+import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
 import org.jetbrains.org.objectweb.asm.Type;
 
 import java.io.File;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/GeneratedClassLoader.java b/compiler/backend/src/org/jetbrains/jet/codegen/GeneratedClassLoader.java
index 70e6627821a..7cb0affe6d9 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/GeneratedClassLoader.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/GeneratedClassLoader.java
@@ -17,7 +17,7 @@
 package org.jetbrains.jet.codegen;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.OutputFile;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
 
 import java.net.URL;
 import java.net.URLClassLoader;
diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java
index 57d05dc30af..0fb7cf24a70 100644
--- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java
+++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java
@@ -23,7 +23,6 @@ import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
-import org.jetbrains.jet.OutputFile;
 import org.jetbrains.jet.codegen.binding.CodegenBinding;
 import org.jetbrains.jet.codegen.context.CodegenContext;
 import org.jetbrains.jet.codegen.context.PackageContext;
@@ -44,6 +43,7 @@ import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils;
 import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
 import org.jetbrains.org.objectweb.asm.*;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
 import org.jetbrains.org.objectweb.asm.tree.*;
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/output/outputUtils.kt b/compiler/cli/src/org/jetbrains/jet/cli/common/output/outputUtils.kt
index 09140f76645..5056538baa8 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/common/output/outputUtils.kt
+++ b/compiler/cli/src/org/jetbrains/jet/cli/common/output/outputUtils.kt
@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.cli.common.output.outputUtils
 
-import org.jetbrains.jet.OutputFileCollection
+import org.jetbrains.kotlin.backend.common.output.OutputFileCollection
 import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation
 import org.jetbrains.jet.cli.common.messages.OutputMessageUtil
 import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity
@@ -43,4 +43,4 @@ public fun OutputFileCollection.writeAll(outputDir: File, messageCollector: Mess
     writeAll(outputDir) { sources, output ->
         messageCollector.report(CompilerMessageSeverity.OUTPUT, OutputMessageUtil.formatOutputMessage(sources, output), CompilerMessageLocation.NO_LOCATION)
     }
-}
\ No newline at end of file
+}
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java
index d5b2164dc74..8acd7ee81a9 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java
@@ -32,7 +32,6 @@ import kotlin.Function1;
 import kotlin.Unit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.OutputFileCollection;
 import org.jetbrains.jet.analyzer.AnalysisResult;
 import org.jetbrains.jet.cli.common.CLICompiler;
 import org.jetbrains.jet.cli.common.CLIConfigurationKeys;
@@ -52,6 +51,7 @@ import org.jetbrains.jet.config.Services;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
 import org.jetbrains.jet.utils.PathUtil;
+import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
 import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS;
 import org.jetbrains.kotlin.js.config.Config;
 import org.jetbrains.kotlin.js.config.EcmaVersion;
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
index aa9dbce95d2..8aaa92693ca 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
@@ -36,7 +36,6 @@ import kotlin.modules.AllModules;
 import kotlin.modules.Module;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.OutputFile;
 import org.jetbrains.jet.cli.common.CLIConfigurationKeys;
 import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity;
 import org.jetbrains.jet.cli.common.messages.MessageCollector;
@@ -57,6 +56,7 @@ import org.jetbrains.jet.plugin.JetFileType;
 import org.jetbrains.jet.utils.KotlinPaths;
 import org.jetbrains.jet.utils.PathUtil;
 import org.jetbrains.jet.utils.UtilsPackage;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
 
 import java.io.*;
 import java.lang.reflect.Method;
@@ -162,7 +162,7 @@ public class CompileEnvironmentUtil {
             method.setAccessible(true);
             method.invoke(null);
 
-            ArrayList<Module> answer = new ArrayList<Module>(AllModules.INSTANCE$.get());
+            List<Module> answer = new ArrayList<Module>(AllModules.INSTANCE$.get());
             AllModules.INSTANCE$.get().clear();
             return answer;
         }
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java
index ebab420577f..e9c33c6e460 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java
@@ -32,7 +32,6 @@ import com.intellij.testFramework.LightVirtualFile;
 import com.intellij.util.SmartList;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.OutputFile;
 import org.jetbrains.jet.cli.common.messages.AnalyzerWithCompilerReport;
 import org.jetbrains.jet.cli.common.messages.MessageCollector;
 import org.jetbrains.jet.cli.common.messages.MessageCollectorToString;
@@ -65,6 +64,7 @@ import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.plugin.JetLanguage;
 import org.jetbrains.jet.utils.UtilsPackage;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
 import org.jetbrains.kotlin.di.InjectorForReplWithJava;
 import org.jetbrains.org.objectweb.asm.Type;
 
diff --git a/compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java b/compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java
index 31ca897124f..2ef566ce586 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java
@@ -24,11 +24,11 @@ import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.OutputFile;
-import org.jetbrains.jet.OutputFileCollection;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.test.TestCaseWithTmpdir;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
+import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
 import org.jetbrains.org.objectweb.asm.*;
 
 import java.io.File;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/AbstractLineNumberTest.java b/compiler/tests/org/jetbrains/jet/codegen/AbstractLineNumberTest.java
index c9c51e16a16..6fe4452cea7 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/AbstractLineNumberTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/AbstractLineNumberTest.java
@@ -21,10 +21,12 @@ import com.google.common.collect.Maps;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles;
-import org.jetbrains.org.objectweb.asm.*;
-import org.jetbrains.jet.*;
+import org.jetbrains.jet.ConfigurationKind;
+import org.jetbrains.jet.JetTestCaseBuilder;
+import org.jetbrains.jet.JetTestUtils;
+import org.jetbrains.jet.TestJdkKind;
 import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage;
+import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.psi.JetFile;
@@ -32,6 +34,9 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.test.TestCaseWithTmpdir;
 import org.jetbrains.jet.utils.UtilsPackage;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
+import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
+import org.jetbrains.org.objectweb.asm.*;
 
 import java.io.File;
 import java.io.IOException;
@@ -181,7 +186,7 @@ public class AbstractLineNumberTest extends TestCaseWithTmpdir {
 
         ClassVisitor visitor = new ClassVisitor(Opcodes.ASM5) {
             @Override
-            public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
+            public MethodVisitor visitMethod(int access, @NotNull String name, @NotNull String desc, String signature, String[] exceptions) {
                 return new MethodVisitor(Opcodes.ASM5) {
                     private Label lastLabel;
 
@@ -195,12 +200,12 @@ public class AbstractLineNumberTest extends TestCaseWithTmpdir {
                     }
 
                     @Override
-                    public void visitLabel(Label label) {
+                    public void visitLabel(@NotNull Label label) {
                         lastLabel = label;
                     }
 
                     @Override
-                    public void visitLineNumber(int line, Label start) {
+                    public void visitLineNumber(int line, @NotNull Label start) {
                         labels2LineNumbers.put(start, line);
                     }
                 };
@@ -224,10 +229,10 @@ public class AbstractLineNumberTest extends TestCaseWithTmpdir {
         final List<Integer> result = new ArrayList<Integer>();
         reader.accept(new ClassVisitor(Opcodes.ASM5) {
             @Override
-            public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
+            public MethodVisitor visitMethod(int access, @NotNull String name, @NotNull String desc, String signature, String[] exceptions) {
                 return new MethodVisitor(Opcodes.ASM5) {
                     @Override
-                    public void visitLineNumber(int line, Label label) {
+                    public void visitLineNumber(int line, @NotNull Label label) {
                         result.add(line);
                     }
                 };
diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
index 0742779486c..46ffd5bfbe3 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
@@ -24,13 +24,13 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.OutputFile;
 import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.utils.UtilsPackage;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
 import org.jetbrains.org.objectweb.asm.ClassReader;
 import org.jetbrains.org.objectweb.asm.tree.ClassNode;
 import org.jetbrains.org.objectweb.asm.tree.MethodNode;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/DxChecker.java b/compiler/tests/org/jetbrains/jet/codegen/DxChecker.java
index 733befc2894..8e2c9fe9b95 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/DxChecker.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/DxChecker.java
@@ -21,7 +21,7 @@ import com.android.dx.cf.direct.StdAttributeFactory;
 import com.android.dx.command.dexer.Main;
 import com.android.dx.dex.cf.CfTranslator;
 import com.android.dx.dex.file.DexFile;
-import org.jetbrains.jet.OutputFile;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
 import org.junit.Assert;
 
 import java.io.PrintWriter;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/GenerateNotNullAssertionsTest.java b/compiler/tests/org/jetbrains/jet/codegen/GenerateNotNullAssertionsTest.java
index 266e1a78f18..84dc7c4943a 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/GenerateNotNullAssertionsTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/GenerateNotNullAssertionsTest.java
@@ -19,7 +19,9 @@ package org.jetbrains.jet.codegen;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.*;
+import org.jetbrains.jet.ConfigurationKind;
+import org.jetbrains.jet.JetTestUtils;
+import org.jetbrains.jet.TestJdkKind;
 import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage;
 import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys;
 import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles;
@@ -27,6 +29,8 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
+import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
 import org.jetbrains.org.objectweb.asm.ClassReader;
 import org.jetbrains.org.objectweb.asm.ClassVisitor;
 import org.jetbrains.org.objectweb.asm.MethodVisitor;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/InlineTestUtil.java b/compiler/tests/org/jetbrains/jet/codegen/InlineTestUtil.java
index 6975a9a27f8..37930dacf6d 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/InlineTestUtil.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/InlineTestUtil.java
@@ -19,11 +19,11 @@ package org.jetbrains.jet.codegen;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.OutputFile;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.java.JvmClassName;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
 import org.jetbrains.org.objectweb.asm.*;
 import org.jetbrains.org.objectweb.asm.tree.MethodNode;
 
diff --git a/compiler/tests/org/jetbrains/jet/codegen/InnerClassInfoGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/InnerClassInfoGenTest.java
index bf01f1bb60d..1c6986bb471 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/InnerClassInfoGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/InnerClassInfoGenTest.java
@@ -19,9 +19,9 @@ package org.jetbrains.jet.codegen;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.ConfigurationKind;
-import org.jetbrains.jet.OutputFile;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.utils.UtilsPackage;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
 import org.jetbrains.org.objectweb.asm.ClassReader;
 import org.jetbrains.org.objectweb.asm.ClassVisitor;
 import org.jetbrains.org.objectweb.asm.Opcodes;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/KotlinSyntheticClassAnnotationTest.java b/compiler/tests/org/jetbrains/jet/codegen/KotlinSyntheticClassAnnotationTest.java
index 05cbf1b22bc..478b936e006 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/KotlinSyntheticClassAnnotationTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/KotlinSyntheticClassAnnotationTest.java
@@ -20,10 +20,10 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
-import org.jetbrains.jet.OutputFile;
 import org.jetbrains.jet.lang.resolve.java.AbiVersionUtil;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.name.FqName;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
 
 import java.lang.annotation.Annotation;
 import java.util.Collection;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/OuterClassGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/OuterClassGenTest.java
index d96b149a3c9..0587279485c 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/OuterClassGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/OuterClassGenTest.java
@@ -20,8 +20,8 @@ import com.intellij.util.lang.UrlClassLoader;
 import org.intellij.lang.annotations.Language;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
-import org.jetbrains.jet.OutputFile;
-import org.jetbrains.jet.OutputFileCollection;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
+import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
 import org.jetbrains.org.objectweb.asm.ClassReader;
 import org.jetbrains.org.objectweb.asm.ClassVisitor;
 import org.jetbrains.org.objectweb.asm.Opcodes;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/SourceInfoGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/SourceInfoGenTest.java
index 182a5d95e71..5a2cca22f02 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/SourceInfoGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/SourceInfoGenTest.java
@@ -16,7 +16,7 @@
 package org.jetbrains.jet.codegen;
 
 import org.jetbrains.jet.ConfigurationKind;
-import org.jetbrains.jet.OutputFile;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
 import org.jetbrains.org.objectweb.asm.ClassReader;
 import org.jetbrains.org.objectweb.asm.ClassVisitor;
 import org.jetbrains.org.objectweb.asm.Opcodes;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java
index 40133d2f216..29b08d179fc 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java
@@ -18,11 +18,11 @@ package org.jetbrains.jet.codegen;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
-import org.jetbrains.jet.OutputFile;
 import org.jetbrains.jet.lang.resolve.java.JvmAbi;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
diff --git a/compiler/tests/org/jetbrains/jet/codegen/flags/AbstractWriteFlagsTest.java b/compiler/tests/org/jetbrains/jet/codegen/flags/AbstractWriteFlagsTest.java
index 66466f0e8ed..cfa7da370ad 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/flags/AbstractWriteFlagsTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/flags/AbstractWriteFlagsTest.java
@@ -18,14 +18,15 @@ package org.jetbrains.jet.codegen.flags;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.testFramework.UsefulTestCase;
-import org.jetbrains.org.objectweb.asm.*;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.ConfigurationKind;
 import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.OutputFile;
-import org.jetbrains.jet.OutputFileCollection;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.codegen.GenerationUtils;
 import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
+import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
+import org.jetbrains.org.objectweb.asm.*;
 
 import java.io.File;
 import java.lang.reflect.Field;
@@ -75,7 +76,6 @@ public abstract class AbstractWriteFlagsTest extends UsefulTestCase {
         String fileText = FileUtil.loadFile(ktFile, true);
 
         JetFile psiFile = JetTestUtils.createFile(ktFile.getName(), fileText, jetCoreEnvironment.getProject());
-        assertTrue("Cannot create JetFile from text", psiFile != null);
 
         OutputFileCollection outputFiles = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile);
 
@@ -213,7 +213,7 @@ public abstract class AbstractWriteFlagsTest extends UsefulTestCase {
         private int access = 0;
 
         @Override
-        public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
+        public void visit(int version, int access, @NotNull String name, String signature, String superName, String[] interfaces) {
             this.access = access;
             isExists = true;
         }
@@ -233,7 +233,7 @@ public abstract class AbstractWriteFlagsTest extends UsefulTestCase {
         }
 
         @Override
-        public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
+        public MethodVisitor visitMethod(int access, @NotNull String name, @NotNull String desc, String signature, String[] exceptions) {
             if (name.equals(funName)) {
                 this.access = access;
                 isExists = true;
@@ -256,7 +256,7 @@ public abstract class AbstractWriteFlagsTest extends UsefulTestCase {
         }
 
         @Override
-        public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
+        public FieldVisitor visitField(int access, @NotNull String name, @NotNull String desc, String signature, Object value) {
             if (name.equals(propertyName)) {
                 this.access = access;
                 isExists = true;
@@ -279,7 +279,7 @@ public abstract class AbstractWriteFlagsTest extends UsefulTestCase {
         }
 
         @Override
-        public void visitInnerClass(String innerClassInternalName, String outerClassInternalName, String name, int access) {
+        public void visitInnerClass(@NotNull String innerClassInternalName, String outerClassInternalName, String name, int access) {
             if (name.equals(innerClassName)) {
                 this.access = access;
                 isExists = true;
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java
index 2d7517cdf91..5ef622e59f6 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java
@@ -21,7 +21,9 @@ import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.*;
+import org.jetbrains.jet.ConfigurationKind;
+import org.jetbrains.jet.JetTestUtils;
+import org.jetbrains.jet.TestJdkKind;
 import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage;
 import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
@@ -35,6 +37,8 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.test.TestCaseWithTmpdir;
 import org.jetbrains.jet.utils.UtilsPackage;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
+import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
 
 import java.io.File;
 import java.io.IOException;
@@ -69,12 +73,12 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends TestCaseWit
         inputFiles.add(firstFileName);
         inputFiles.add(firstFileName.substring(0, firstFileName.length() - "1.kt".length()) + "2.kt");
 
-        ArrayList<OutputFile> files = doBoxTest(inputFiles);
+        List<OutputFile> files = doBoxTest(inputFiles);
         InlineTestUtil.checkNoCallsToInline(files);
     }
 
     @NotNull
-    private ArrayList<OutputFile> doBoxTest(@NotNull List<String> files) throws Exception {
+    private List<OutputFile> doBoxTest(@NotNull List<String> files) throws Exception {
         Collections.sort(files);
 
         ClassFileFactory factory1 = null;
@@ -95,7 +99,7 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends TestCaseWit
             throw UtilsPackage.rethrow(e);
         }
 
-        ArrayList<OutputFile> allGeneratedFiles = new ArrayList<OutputFile>(factory1.asList());
+        List<OutputFile> allGeneratedFiles = new ArrayList<OutputFile>(factory1.asList());
         allGeneratedFiles.addAll(factory2.asList());
         return allGeneratedFiles;
     }
@@ -106,7 +110,7 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends TestCaseWit
                 AbstractCompileKotlinAgainstKotlinTest.class.getClassLoader()
         );
         Class<?> clazz = classLoader.loadClass(PackageClassUtils.getPackageClassName(FqName.ROOT));
-        Method main = clazz.getMethod("main", new Class[] {String[].class});
+        Method main = clazz.getMethod("main", String[].class);
         main.invoke(null, new Object[] {ArrayUtil.EMPTY_STRING_ARRAY});
     }
 
@@ -116,7 +120,7 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends TestCaseWit
                 AbstractCompileKotlinAgainstKotlinTest.class.getClassLoader()
         );
         Class<?> clazz = classLoader.loadClass(PackageClassUtils.getPackageClassName(FqName.ROOT));
-        Method box = clazz.getMethod("box", new Class[] {});
+        Method box = clazz.getMethod("box");
         String result = (String) box.invoke(null);
         assertEquals("OK", result);
     }
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java
index 3d2be20b9a6..40f38ac89b6 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java
@@ -22,17 +22,17 @@ import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.org.objectweb.asm.ClassReader;
-import org.jetbrains.org.objectweb.asm.ClassVisitor;
-import org.jetbrains.org.objectweb.asm.MethodVisitor;
-import org.jetbrains.org.objectweb.asm.Opcodes;
 import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.OutputFileCollection;
 import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.codegen.GenerationUtils;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.test.TestCaseWithTmpdir;
+import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
+import org.jetbrains.org.objectweb.asm.ClassReader;
+import org.jetbrains.org.objectweb.asm.ClassVisitor;
+import org.jetbrains.org.objectweb.asm.MethodVisitor;
+import org.jetbrains.org.objectweb.asm.Opcodes;
 import org.junit.Assert;
 
 import java.io.File;
diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt
index d9db22705b3..73a300c00c8 100644
--- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt
+++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt
@@ -43,7 +43,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.eval4j.jdi.asValue
 import org.jetbrains.jet.lang.psi.JetNamedFunction
 import org.jetbrains.jet.codegen.ClassFileFactory
-import org.jetbrains.jet.OutputFileCollection
+import org.jetbrains.kotlin.backend.common.output.OutputFileCollection
 import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult
 import org.jetbrains.jet.lang.psi.JetCodeFragment
 import org.jetbrains.jet.lang.psi.codeFragmentUtil.skipVisibilityCheck
diff --git a/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java b/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java
index 2089309eef9..8e6d4e49412 100644
--- a/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java
+++ b/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java
@@ -35,8 +35,6 @@ import com.intellij.ui.content.ContentFactory;
 import com.intellij.ui.content.ContentManager;
 import com.intellij.util.Alarm;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.OutputFile;
-import org.jetbrains.jet.OutputFileCollection;
 import org.jetbrains.jet.analyzer.AnalysisResult;
 import org.jetbrains.jet.codegen.ClassBuilderFactories;
 import org.jetbrains.jet.codegen.CompilationErrorHandler;
@@ -45,10 +43,12 @@ import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.codegen.state.Progress;
 import org.jetbrains.jet.lang.diagnostics.DiagnosticSink;
 import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.jet.plugin.util.ProjectRootsUtil;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.util.InfinitePeriodicalTask;
 import org.jetbrains.jet.plugin.util.LongRunningReadTask;
+import org.jetbrains.jet.plugin.util.ProjectRootsUtil;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
+import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
 
 import javax.swing.*;
 import java.awt.*;
@@ -305,4 +305,4 @@ public class KotlinBytecodeToolWindow extends JPanel implements Disposable {
                     new KotlinBytecodeToolWindow(project, toolWindow), "", false));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractJetPositionManagerTest.java b/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractJetPositionManagerTest.java
index c4f611073d0..d85c3bd313a 100644
--- a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractJetPositionManagerTest.java
+++ b/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractJetPositionManagerTest.java
@@ -36,14 +36,14 @@ import com.sun.jdi.Location;
 import com.sun.jdi.ReferenceType;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.OutputFile;
-import org.jetbrains.jet.OutputFileCollection;
 import org.jetbrains.jet.codegen.GenerationUtils;
 import org.jetbrains.jet.codegen.state.GenerationState;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.plugin.PluginTestCaseBase;
 import org.jetbrains.jet.plugin.project.PluginJetFilesProvider;
 import org.jetbrains.jet.utils.UtilsPackage;
+import org.jetbrains.kotlin.backend.common.output.OutputFile;
+import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java
index 63a6580206a..245e1e30b3a 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java
@@ -30,7 +30,6 @@ import com.intellij.util.Consumer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.JetTestUtils;
-import org.jetbrains.jet.OutputFileCollection;
 import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage;
 import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
@@ -39,6 +38,7 @@ import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.psi.JetPsiFactory;
 import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment;
 import org.jetbrains.jet.plugin.JetFileType;
+import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
 import org.jetbrains.kotlin.js.JavaScript;
 import org.jetbrains.kotlin.js.config.Config;
 import org.jetbrains.kotlin.js.config.EcmaVersion;
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java
index d6e98ef5fde..0d59c598fe5 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java
@@ -31,15 +31,15 @@ import com.intellij.util.SmartList;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.OutputFileCollection;
-import org.jetbrains.jet.SimpleOutputFile;
-import org.jetbrains.jet.SimpleOutputFileCollection;
 import org.jetbrains.jet.analyzer.AnalysisResult;
 import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics;
 import org.jetbrains.jet.utils.fileUtils.FileUtilsPackage;
+import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
+import org.jetbrains.kotlin.backend.common.output.SimpleOutputFile;
+import org.jetbrains.kotlin.backend.common.output.SimpleOutputFileCollection;
 import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS;
 import org.jetbrains.kotlin.js.config.Config;
 import org.jetbrains.kotlin.js.facade.exceptions.TranslationException;