diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java
index 56830b5faf8..e9bd16abd0a 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java
@@ -44,8 +44,8 @@ import org.jetbrains.jet.CompilerModeProvider;
 import org.jetbrains.jet.OperationModeProvider;
 import org.jetbrains.jet.config.CommonConfigurationKeys;
 import org.jetbrains.jet.config.CompilerConfiguration;
-import org.jetbrains.jet.lang.parsing.JetParserDefinition;
-import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
+import org.jetbrains.kotlin.parsing.JetParserDefinition;
+import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.CodeAnalyzerInitializer;
 import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache;
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
index 7ed75832807..2d819e9d88e 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
@@ -37,8 +37,8 @@ import org.jetbrains.kotlin.codegen.state.Progress;
 import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.context.ContextPackage;
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl;
-import org.jetbrains.jet.lang.parsing.JetScriptDefinition;
-import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
+import org.jetbrains.kotlin.parsing.JetScriptDefinition;
+import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java
index 39afbd0a813..3ce920096cd 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java
@@ -42,7 +42,7 @@ import org.jetbrains.jet.context.GlobalContextImpl;
 import org.jetbrains.kotlin.descriptors.ScriptDescriptor;
 import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider;
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl;
-import org.jetbrains.jet.lang.parsing.JetParserDefinition;
+import org.jetbrains.kotlin.parsing.JetParserDefinition;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.JetScript;
 import org.jetbrains.jet.lang.resolve.*;
diff --git a/compiler/frontend/src/org/jetbrains/jet/config/CommonConfigurationKeys.java b/compiler/frontend/src/org/jetbrains/jet/config/CommonConfigurationKeys.java
index 194f33e547b..0ff9a06ebdd 100644
--- a/compiler/frontend/src/org/jetbrains/jet/config/CommonConfigurationKeys.java
+++ b/compiler/frontend/src/org/jetbrains/jet/config/CommonConfigurationKeys.java
@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.config;
 
-import org.jetbrains.jet.lang.parsing.JetScriptDefinition;
+import org.jetbrains.kotlin.parsing.JetScriptDefinition;
 
 import java.util.List;
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/MarkerAdapter.java b/compiler/frontend/src/org/jetbrains/jet/lang/parsing/MarkerAdapter.java
deleted file mode 100644
index 6087e935fbe..00000000000
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/MarkerAdapter.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2010-2013 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.jet.lang.parsing;
-
-import com.intellij.lang.PsiBuilder;
-import com.intellij.lang.WhitespacesAndCommentsBinder;
-import com.intellij.psi.tree.IElementType;
-import org.jetbrains.annotations.Nullable;
-
-public class MarkerAdapter implements PsiBuilder.Marker {
-
-    private final PsiBuilder.Marker delegate;
-
-    public MarkerAdapter(PsiBuilder.Marker delegate) {
-        this.delegate = delegate;
-    }
-
-    @Override
-    public PsiBuilder.Marker precede() {
-        return delegate.precede();
-    }
-
-    @Override
-    public void drop() {
-        delegate.drop();
-    }
-
-    @Override
-    public void rollbackTo() {
-        delegate.rollbackTo();
-    }
-
-    @Override
-    public void done(IElementType type) {
-        delegate.done(type);
-    }
-
-    @Override
-    public void collapse(IElementType type) {
-        delegate.collapse(type);
-    }
-
-    @Override
-    public void doneBefore(IElementType type, PsiBuilder.Marker before) {
-        delegate.doneBefore(type, before);
-    }
-
-    @Override
-    public void doneBefore(IElementType type, PsiBuilder.Marker before, String errorMessage) {
-        delegate.doneBefore(type, before, errorMessage);
-    }
-
-    @Override
-    public void error(String message) {
-        delegate.error(message);
-    }
-
-    @Override
-    public void errorBefore(String message, PsiBuilder.Marker before) {
-        delegate.errorBefore(message, before);
-    }
-
-    @Override
-    public void setCustomEdgeTokenBinders(@Nullable WhitespacesAndCommentsBinder left, @Nullable WhitespacesAndCommentsBinder right) {
-        delegate.setCustomEdgeTokenBinders(left, right);
-    }
-}
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptNameUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptNameUtil.java
index a06677b4991..39ffa67daf6 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptNameUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptNameUtil.java
@@ -17,12 +17,12 @@
 package org.jetbrains.jet.lang.resolve;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.parsing.JetScriptDefinition;
-import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
+import org.jetbrains.kotlin.name.FqName;
+import org.jetbrains.kotlin.parsing.JetScriptDefinition;
+import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.JetPackageDirective;
 import org.jetbrains.kotlin.psi.JetScript;
-import org.jetbrains.kotlin.name.FqName;
 
 public class ScriptNameUtil {
     private ScriptNameUtil() {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptParameterResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptParameterResolver.java
index 14ffc68a447..a13a056a081 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptParameterResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptParameterResolver.java
@@ -23,8 +23,8 @@ import org.jetbrains.kotlin.descriptors.SourceElement;
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor;
 import org.jetbrains.kotlin.descriptors.annotations.Annotations;
 import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl;
-import org.jetbrains.jet.lang.parsing.JetScriptDefinition;
-import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
+import org.jetbrains.kotlin.parsing.JetScriptDefinition;
+import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.JetScript;
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/AbstractJetParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractJetParsing.java
similarity index 99%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/AbstractJetParsing.java
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractJetParsing.java
index 4a76e71457a..b01f4347ada 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/AbstractJetParsing.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractJetParsing.java
@@ -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.lang.parsing;
+package org.jetbrains.kotlin.parsing;
 
 import com.intellij.lang.PsiBuilder;
 import com.intellij.psi.tree.IElementType;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/AbstractTokenStreamPattern.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractTokenStreamPattern.java
similarity index 93%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/AbstractTokenStreamPattern.java
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractTokenStreamPattern.java
index 3dfe832e8a2..c5882440fd8 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/AbstractTokenStreamPattern.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractTokenStreamPattern.java
@@ -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.lang.parsing;
+package org.jetbrains.kotlin.parsing;
 
 import com.intellij.psi.tree.IElementType;
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/AbstractTokenStreamPredicate.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractTokenStreamPredicate.java
similarity index 92%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/AbstractTokenStreamPredicate.java
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractTokenStreamPredicate.java
index 86a1ac1625d..18d303f8180 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/AbstractTokenStreamPredicate.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractTokenStreamPredicate.java
@@ -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.lang.parsing;
+package org.jetbrains.kotlin.parsing;
 
 public abstract class AbstractTokenStreamPredicate implements TokenStreamPredicate {
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/CommentBinders.kt b/compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt
similarity index 97%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/CommentBinders.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt
index 1c7c3c1bf35..17bec9da4bd 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/CommentBinders.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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.lang.parsing
+package org.jetbrains.kotlin.parsing
 
 import com.intellij.lang.WhitespacesAndCommentsBinder
 import com.intellij.psi.tree.IElementType
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/Consumer.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/Consumer.java
similarity index 88%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/Consumer.java
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/Consumer.java
index efbe6b1869e..88db9afe99e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/Consumer.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/Consumer.java
@@ -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.lang.parsing;
+package org.jetbrains.kotlin.parsing;
 
 public interface Consumer<T> {
     void consume(T item);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/FirstBefore.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/FirstBefore.java
similarity index 93%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/FirstBefore.java
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/FirstBefore.java
index b6b47d7ffe7..0530140f264 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/FirstBefore.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/FirstBefore.java
@@ -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.lang.parsing;
+package org.jetbrains.kotlin.parsing;
 
 public class FirstBefore extends AbstractTokenStreamPattern {
     private final TokenStreamPredicate lookFor;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetExpressionParsing.java
similarity index 99%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/JetExpressionParsing.java
index f8fc25989a2..6176e238dd0 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetExpressionParsing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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.lang.parsing;
+package org.jetbrains.kotlin.parsing;
 
 import com.google.common.collect.ImmutableMap;
 import com.intellij.lang.PsiBuilder;
@@ -31,8 +31,8 @@ import java.util.HashSet;
 import java.util.Set;
 
 import static org.jetbrains.jet.JetNodeTypes.*;
-import static org.jetbrains.jet.lang.parsing.JetParsing.AnnotationParsingMode.REGULAR_ANNOTATIONS_ALLOW_SHORTS;
-import static org.jetbrains.jet.lang.parsing.JetParsing.AnnotationParsingMode.REGULAR_ANNOTATIONS_ONLY_WITH_BRACKETS;
+import static org.jetbrains.kotlin.parsing.JetParsing.AnnotationParsingMode.REGULAR_ANNOTATIONS_ALLOW_SHORTS;
+import static org.jetbrains.kotlin.parsing.JetParsing.AnnotationParsingMode.REGULAR_ANNOTATIONS_ONLY_WITH_BRACKETS;
 import static org.jetbrains.kotlin.lexer.JetTokens.*;
 
 public class JetExpressionParsing extends AbstractJetParsing {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParser.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParser.java
similarity index 97%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParser.java
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParser.java
index 49eb18c91fe..18315eed435 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParser.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParser.java
@@ -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.lang.parsing;
+package org.jetbrains.kotlin.parsing;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.PsiBuilder;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParserDefinition.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParserDefinition.java
similarity index 97%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParserDefinition.java
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParserDefinition.java
index 88ef39fe4ae..01f2827c6fd 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParserDefinition.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParserDefinition.java
@@ -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.lang.parsing;
+package org.jetbrains.kotlin.parsing;
 
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
 import com.intellij.lang.ASTNode;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java
similarity index 99%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java
index 6ea52395c63..b58d4073b4d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetParsing.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 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.lang.parsing;
+package org.jetbrains.kotlin.parsing;
 
 import com.intellij.lang.PsiBuilder;
 import com.intellij.openapi.diagnostic.Logger;
@@ -29,7 +29,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static org.jetbrains.jet.JetNodeTypes.*;
-import static org.jetbrains.jet.lang.parsing.JetParsing.AnnotationParsingMode.*;
+import static org.jetbrains.kotlin.parsing.JetParsing.AnnotationParsingMode.*;
 import static org.jetbrains.kotlin.lexer.JetTokens.*;
 
 public class JetParsing extends AbstractJetParsing {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetScriptDefinition.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinition.java
similarity index 89%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetScriptDefinition.java
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinition.java
index 548f7b49f86..93e046ed841 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetScriptDefinition.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinition.java
@@ -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,9 +14,8 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.parsing;
+package org.jetbrains.kotlin.parsing;
 
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
 import org.jetbrains.jet.lang.resolve.ImportPath;
 
@@ -35,7 +34,7 @@ public class JetScriptDefinition {
     }
 
     private static List<ImportPath> importPaths(List<String> imports) {
-        ArrayList<ImportPath> paths = new ArrayList<ImportPath>(imports.size());
+        List<ImportPath> paths = new ArrayList<ImportPath>(imports.size());
         for (String anImport : imports) {
             paths.add(new ImportPath(anImport));
         }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetScriptDefinitionProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinitionProvider.java
similarity index 97%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetScriptDefinitionProvider.java
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinitionProvider.java
index 284e94345bf..23b9218995f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/JetScriptDefinitionProvider.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinitionProvider.java
@@ -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.lang.parsing;
+package org.jetbrains.kotlin.parsing;
 
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.project.Project;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/LastBefore.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/LastBefore.java
similarity index 95%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/LastBefore.java
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/LastBefore.java
index 0487acbbc28..f6033ad462a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/LastBefore.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/LastBefore.java
@@ -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.lang.parsing;
+package org.jetbrains.kotlin.parsing;
 
 public class LastBefore extends AbstractTokenStreamPattern {
     private final boolean dontStopRightAfterOccurrence;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilder.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/SemanticWhitespaceAwarePsiBuilder.java
similarity index 93%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilder.java
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/SemanticWhitespaceAwarePsiBuilder.java
index 44fa204f3ec..b4c940556aa 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilder.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/SemanticWhitespaceAwarePsiBuilder.java
@@ -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.lang.parsing;
+package org.jetbrains.kotlin.parsing;
 
 import com.intellij.lang.PsiBuilder;
 import com.intellij.psi.tree.IElementType;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilderAdapter.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/SemanticWhitespaceAwarePsiBuilderAdapter.java
similarity index 96%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilderAdapter.java
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/SemanticWhitespaceAwarePsiBuilderAdapter.java
index 6ed6e8e0ce9..55f2bc80a00 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilderAdapter.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/SemanticWhitespaceAwarePsiBuilderAdapter.java
@@ -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.lang.parsing;
+package org.jetbrains.kotlin.parsing;
 
 import com.intellij.lang.impl.PsiBuilderAdapter;
 import com.intellij.psi.tree.IElementType;
@@ -24,7 +24,6 @@ public class SemanticWhitespaceAwarePsiBuilderAdapter extends PsiBuilderAdapter
 
     private final SemanticWhitespaceAwarePsiBuilder myBuilder;
 
-
     public SemanticWhitespaceAwarePsiBuilderAdapter(SemanticWhitespaceAwarePsiBuilder builder) {
         super(builder);
         this.myBuilder = builder;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilderForByClause.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/SemanticWhitespaceAwarePsiBuilderForByClause.java
similarity index 93%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilderForByClause.java
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/SemanticWhitespaceAwarePsiBuilderForByClause.java
index 507b4397af0..b352a960d58 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilderForByClause.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/SemanticWhitespaceAwarePsiBuilderForByClause.java
@@ -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.lang.parsing;
+package org.jetbrains.kotlin.parsing;
 
 public class SemanticWhitespaceAwarePsiBuilderForByClause extends SemanticWhitespaceAwarePsiBuilderAdapter {
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilderImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/SemanticWhitespaceAwarePsiBuilderImpl.java
similarity index 98%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilderImpl.java
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/SemanticWhitespaceAwarePsiBuilderImpl.java
index 9eefdb1bac8..ef49b867d5d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/SemanticWhitespaceAwarePsiBuilderImpl.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/SemanticWhitespaceAwarePsiBuilderImpl.java
@@ -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,8 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.lang.parsing;
-
+package org.jetbrains.kotlin.parsing;
 
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.impl.PsiBuilderAdapter;
@@ -23,13 +22,11 @@ import com.intellij.lang.impl.PsiBuilderImpl;
 import com.intellij.psi.TokenType;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
+import com.intellij.util.containers.Stack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.lexer.JetTokens;
 
-import com.intellij.util.containers.Stack;
-
-
 import static org.jetbrains.kotlin.lexer.JetTokens.*;
 
 public class SemanticWhitespaceAwarePsiBuilderImpl extends PsiBuilderAdapter implements SemanticWhitespaceAwarePsiBuilder {
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/TokenStreamPattern.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/TokenStreamPattern.java
similarity index 89%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/TokenStreamPattern.java
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/TokenStreamPattern.java
index 8b5f87aadb2..da021899b41 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/TokenStreamPattern.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/TokenStreamPattern.java
@@ -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.lang.parsing;
+package org.jetbrains.kotlin.parsing;
 
 import com.intellij.psi.tree.IElementType;
 
@@ -34,7 +34,7 @@ public interface TokenStreamPattern {
     int result();
 
     /**
-     * Decides if the combination of open bracet counts makes a "top level position"
+     * Decides if the combination of open bracket counts makes a "top level position"
      * Straightforward meaning would be: if all counts are zero, then it's a top level
      */
     boolean isTopLevel(int openAngleBrackets, int openBrackets, int openBraces, int openParentheses);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/TokenStreamPredicate.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/TokenStreamPredicate.java
similarity index 89%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/TokenStreamPredicate.java
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/TokenStreamPredicate.java
index 8a302ab4d6e..58b5beec28a 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/TokenStreamPredicate.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/TokenStreamPredicate.java
@@ -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.lang.parsing;
+package org.jetbrains.kotlin.parsing;
 
 public interface TokenStreamPredicate {
     boolean matching(boolean topLevel);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/TruncatedSemanticWhitespaceAwarePsiBuilder.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/TruncatedSemanticWhitespaceAwarePsiBuilder.java
similarity index 96%
rename from compiler/frontend/src/org/jetbrains/jet/lang/parsing/TruncatedSemanticWhitespaceAwarePsiBuilder.java
rename to compiler/frontend/src/org/jetbrains/kotlin/parsing/TruncatedSemanticWhitespaceAwarePsiBuilder.java
index 9620209af4e..6c4da42d166 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/parsing/TruncatedSemanticWhitespaceAwarePsiBuilder.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/TruncatedSemanticWhitespaceAwarePsiBuilder.java
@@ -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.lang.parsing;
+package org.jetbrains.kotlin.parsing;
 
 import com.intellij.psi.tree.IElementType;
 
@@ -22,7 +22,6 @@ public class TruncatedSemanticWhitespaceAwarePsiBuilder extends SemanticWhitespa
 
     private final int myEOFPosition;
 
-
     public TruncatedSemanticWhitespaceAwarePsiBuilder(SemanticWhitespaceAwarePsiBuilder builder, int eofPosition) {
         super(builder);
         this.myEOFPosition = eofPosition;
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockCodeFragmentType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockCodeFragmentType.java
index 8d2280332f4..c2cb7d01223 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockCodeFragmentType.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockCodeFragmentType.java
@@ -23,7 +23,7 @@ import com.intellij.lang.PsiBuilderFactory;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.parsing.JetParser;
+import org.jetbrains.kotlin.parsing.JetParser;
 import org.jetbrains.kotlin.psi.stubs.elements.JetFileElementType;
 
 public class JetBlockCodeFragmentType extends JetFileElementType {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionCodeFragmentType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionCodeFragmentType.java
index 64a4bc415eb..cd62ee03b6a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionCodeFragmentType.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionCodeFragmentType.java
@@ -23,7 +23,7 @@ import com.intellij.lang.PsiBuilderFactory;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.parsing.JetParser;
+import org.jetbrains.kotlin.parsing.JetParser;
 import org.jetbrains.kotlin.psi.stubs.elements.JetFileElementType;
 
 public class JetExpressionCodeFragmentType extends JetFileElementType {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetOperationReferenceExpression.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetOperationReferenceExpression.kt
index 4671dd2aff2..08b87c6236f 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetOperationReferenceExpression.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetOperationReferenceExpression.kt
@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.psi
 
 import com.intellij.lang.ASTNode
-import org.jetbrains.jet.lang.parsing.JetExpressionParsing
+import org.jetbrains.kotlin.parsing.JetExpressionParsing
 
 public class JetOperationReferenceExpression(node: ASTNode) : JetSimpleNameExpressionImpl(node) {
     override fun getReferencedNameElement() = findChildByType(JetExpressionParsing.ALL_OPERATIONS) ?: this
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java
index 82dbd3e718f..597969ac4f2 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.JetNodeTypes;
 import org.jetbrains.kotlin.kdoc.psi.api.KDocElement;
-import org.jetbrains.jet.lang.parsing.JetExpressionParsing;
+import org.jetbrains.kotlin.parsing.JetExpressionParsing;
 import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.name.Name;
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragmentType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragmentType.java
index a9f969402fc..771766bd19b 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragmentType.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragmentType.java
@@ -23,7 +23,7 @@ import com.intellij.lang.PsiBuilderFactory;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.parsing.JetParser;
+import org.jetbrains.kotlin.parsing.JetParser;
 import org.jetbrains.kotlin.psi.stubs.elements.JetFileElementType;
 
 public class JetTypeCodeFragmentType extends JetFileElementType {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java
index 1bd780c14fe..dd1bfc5f67f 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java
@@ -28,7 +28,7 @@ import com.intellij.psi.tree.IStubFileElementType;
 import com.intellij.util.io.StringRef;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.parsing.JetParser;
+import org.jetbrains.kotlin.parsing.JetParser;
 import org.jetbrains.kotlin.psi.stubs.KotlinFileStub;
 import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl;
 import org.jetbrains.jet.plugin.JetLanguage;
diff --git a/compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java b/compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java
index 502a4883ddb..03c4ef70dae 100644
--- a/compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java
+++ b/compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java
@@ -21,7 +21,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.parsing.JetParserDefinition;
+import org.jetbrains.kotlin.parsing.JetParserDefinition;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/compiler/tests/org/jetbrains/jet/ScriptTest.java b/compiler/tests/org/jetbrains/jet/ScriptTest.java
index 0474f19b2d9..4955ed27d41 100644
--- a/compiler/tests/org/jetbrains/jet/ScriptTest.java
+++ b/compiler/tests/org/jetbrains/jet/ScriptTest.java
@@ -23,8 +23,8 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.codegen.CompilationException;
 import org.jetbrains.jet.config.CommonConfigurationKeys;
 import org.jetbrains.jet.config.CompilerConfiguration;
-import org.jetbrains.jet.lang.parsing.JetScriptDefinition;
-import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
+import org.jetbrains.kotlin.parsing.JetScriptDefinition;
+import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider;
 import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
 import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java
index fc103803c48..a4c95547b89 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java
@@ -24,8 +24,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetTestCaseBuilder;
 import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.checkers.CheckerTestUtil;
-import org.jetbrains.jet.lang.parsing.JetScriptDefinition;
-import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
+import org.jetbrains.kotlin.parsing.JetScriptDefinition;
+import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
 import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java
index 56a52d23faf..39f1b9dd444 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java
@@ -17,8 +17,8 @@
 package org.jetbrains.kotlin.codegen;
 
 import org.jetbrains.jet.ConfigurationKind;
-import org.jetbrains.jet.lang.parsing.JetScriptDefinition;
-import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider;
+import org.jetbrains.kotlin.parsing.JetScriptDefinition;
+import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider;
 import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
 import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
diff --git a/compiler/tests/org/jetbrains/jet/parsing/AbstractJetParsingTest.java b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java
similarity index 97%
rename from compiler/tests/org/jetbrains/jet/parsing/AbstractJetParsingTest.java
rename to compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java
index 241c9606932..7af2a3bc860 100644
--- a/compiler/tests/org/jetbrains/jet/parsing/AbstractJetParsingTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java
@@ -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.parsing;
+package org.jetbrains.kotlin.parsing;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.psi.PsiErrorElement;
@@ -26,7 +26,6 @@ import com.intellij.util.PathUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetNodeTypes;
 import org.jetbrains.jet.JetTestCaseBuilder;
-import org.jetbrains.jet.lang.parsing.JetParserDefinition;
 import org.jetbrains.kotlin.psi.IfNotParsed;
 import org.jetbrains.kotlin.psi.JetElement;
 import org.jetbrains.kotlin.psi.JetPsiFactory;
diff --git a/compiler/tests/org/jetbrains/jet/parsing/JetCodeConformanceTest.java b/compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java
similarity index 95%
rename from compiler/tests/org/jetbrains/jet/parsing/JetCodeConformanceTest.java
rename to compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java
index 965dd6f06c6..12c2b1cdfb8 100644
--- a/compiler/tests/org/jetbrains/jet/parsing/JetCodeConformanceTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java
@@ -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.parsing;
+package org.jetbrains.kotlin.parsing;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
@@ -47,11 +47,11 @@ public class JetCodeConformanceTest extends TestCase {
             new File("docs"),
             new File("ideaSDK"),
             new File("libraries/tools/kotlin-gradle-plugin-core/gradle_api_jar/build/tmp"),
-            new File("compiler/tests/org/jetbrains/jet/parsing/JetCodeConformanceTest.java"));
+            new File("compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java"));
     public static final Pattern JAVADOC_PATTERN = Pattern.compile("/\\*.+@author.+\\*/", Pattern.DOTALL);
 
     public void testParserCode() throws Exception {
-        for (File sourceFile : FileUtil.findFilesByMask(JAVA_FILE_PATTERN, new File("compiler/frontend/src/org/jetbrains/jet/lang/parsing"))) {
+        for (File sourceFile : FileUtil.findFilesByMask(JAVA_FILE_PATTERN, new File("compiler/frontend/src/org/jetbrains/kotlin/parsing"))) {
             String source = FileUtil.loadFile(sourceFile, true);
 
             Pattern atPattern = Pattern.compile("assert.*?\\b[^_]at.*?$", Pattern.MULTILINE);
diff --git a/compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/parsing/JetParsingTestGenerated.java
similarity index 99%
rename from compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java
rename to compiler/tests/org/jetbrains/kotlin/parsing/JetParsingTestGenerated.java
index 0faf8e683a8..a9305527fa3 100644
--- a/compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/parsing/JetParsingTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.parsing;
+package org.jetbrains.kotlin.parsing;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 65058d5a09b..73729edfcfe 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -25,7 +25,7 @@ import java.util.regex.Pattern
 import junit.framework.TestCase
 import org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest
 import org.jetbrains.jet.resolve.AbstractResolveTest
-import org.jetbrains.jet.parsing.AbstractJetParsingTest
+import org.jetbrains.kotlin.parsing.AbstractJetParsingTest
 import org.jetbrains.kotlin.codegen.generated.AbstractBlackBoxCodegenTest
 import org.jetbrains.kotlin.codegen.AbstractBytecodeTextTest
 import org.jetbrains.kotlin.codegen.AbstractTopLevelMembersInvocationTest
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/JetPsiPrecedences.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/JetPsiPrecedences.kt
index 0b1503a5298..f6a1f0fac7e 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/JetPsiPrecedences.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/JetPsiPrecedences.kt
@@ -18,9 +18,9 @@ package org.jetbrains.jet.plugin.util
 
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.psi.tree.IElementType
-import org.jetbrains.jet.lang.parsing.JetExpressionParsing
+import org.jetbrains.kotlin.parsing.JetExpressionParsing
 import java.util.HashMap
-import org.jetbrains.jet.lang.parsing.JetExpressionParsing.Precedence.*
+import org.jetbrains.kotlin.parsing.JetExpressionParsing.Precedence.*
 import org.jetbrains.kotlin.psi.*
 
 public object JetPsiPrecedences {
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 7d75346529a..aa723d39d03 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -163,8 +163,8 @@
     <projectService serviceInterface="org.jetbrains.jet.lang.resolve.CodeAnalyzerInitializer"
                       serviceImplementation="org.jetbrains.jet.lang.resolve.DummyCodeAnalyzerInitializer"/>
 
-    <projectService serviceInterface="org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider"
-                    serviceImplementation="org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider"/>
+    <projectService serviceInterface="org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider"
+                    serviceImplementation="org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider"/>
 
     <projectService serviceInterface="org.jetbrains.jet.plugin.configuration.ModuleTypeCacheManager"
                     serviceImplementation="org.jetbrains.jet.plugin.configuration.ModuleTypeCacheManager"/>
@@ -217,7 +217,7 @@
 
     <lang.syntaxHighlighterFactory key="jet" implementationClass="org.jetbrains.jet.plugin.highlighter.JetSyntaxHighlighterFactory"/>
     <lang.braceMatcher language="jet" implementationClass="org.jetbrains.jet.plugin.JetPairMatcher"/>
-    <lang.parserDefinition language="jet" implementationClass="org.jetbrains.jet.lang.parsing.JetParserDefinition"/>
+    <lang.parserDefinition language="jet" implementationClass="org.jetbrains.kotlin.parsing.JetParserDefinition"/>
     <lang.commenter language="jet" implementationClass="org.jetbrains.jet.plugin.JetCommenter"/>
     <lang.psiStructureViewFactory language="jet" implementationClass="org.jetbrains.jet.plugin.structureView.JetStructureViewFactory"/>
     <structureViewBuilder order="first" key="CLASS" factoryClass="org.jetbrains.jet.plugin.structureView.JetClsStructureViewBuilderProvider"/>