diff --git a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java
index 3e96fafcbd3..be7abede23e 100644
--- a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java
+++ b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java
@@ -18,10 +18,10 @@ package org.jetbrains.kotlin.jps.build.kannotator;
 
 import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.jps.build.AbstractKotlinJpsBuildTestCase;
 import org.jetbrains.jps.builders.BuildResult;
 import org.jetbrains.jps.model.module.JpsModule;
 import org.jetbrains.jps.model.module.JpsModuleSourceRoot;
+import org.jetbrains.kotlin.jps.build.AbstractKotlinJpsBuildTestCase;
 
 import java.io.File;
 
diff --git a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.incremental.BuilderService b/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.incremental.BuilderService
index dbf52b9ce3b..caf9af82251 100644
--- a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.incremental.BuilderService
+++ b/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.incremental.BuilderService
@@ -1 +1 @@
-org.jetbrains.jet.jps.build.KotlinBuilderService
\ No newline at end of file
+org.jetbrains.kotlin.jps.build.KotlinBuilderService
\ No newline at end of file
diff --git a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension b/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension
index 6026c57ec4b..6310ade24c5 100644
--- a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension
+++ b/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension
@@ -1 +1 @@
-org.jetbrains.jet.jps.model.KotlinModelSerializerService
+org.jetbrains.kotlin.jps.model.KotlinModelSerializerService
\ No newline at end of file
diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java
similarity index 98%
rename from jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java
rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java
index e22c1971769..7af9b0f7551 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.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.jps;
+package org.jetbrains.kotlin.jps;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments;
diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.java
similarity index 96%
rename from jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java
rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.java
index f03b8fb9430..8aadbb2ffba 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.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.jps.build;
+package org.jetbrains.kotlin.jps.build;
 
 import com.intellij.util.Consumer;
 import org.jetbrains.annotations.NotNull;
@@ -66,4 +66,4 @@ class JpsJsModuleUtils {
             }
         });
     }
-}
\ No newline at end of file
+}
diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java
similarity index 96%
rename from jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java
rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java
index 6b46cf685c9..4492c006cec 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.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.jps.build;
+package org.jetbrains.kotlin.jps.build;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.utils.LibraryUtils;
diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
similarity index 99%
rename from jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt
rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
index 122c01b7ea0..b3c5e815feb 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.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.jps.build
+package org.jetbrains.kotlin.jps.build
 
 import com.intellij.openapi.util.Key
 import com.intellij.openapi.util.io.FileUtil
@@ -28,8 +28,8 @@ import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants
 import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl
 import org.jetbrains.jet.config.Services
 import org.jetbrains.jet.config.IncrementalCompilation
-import org.jetbrains.jet.jps.JpsKotlinCompilerSettings
-import org.jetbrains.jet.jps.incremental.*
+import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings
+import org.jetbrains.kotlin.jps.incremental.*
 import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider
 import org.jetbrains.jet.utils.PathUtil
 import org.jetbrains.jps.ModuleChunk
diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java
similarity index 98%
rename from jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java
rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java
index 4152b19420a..89d695eab4e 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.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.jps.build;
+package org.jetbrains.kotlin.jps.build;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
@@ -46,7 +46,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.*;
 
-import static org.jetbrains.jet.jps.build.JpsUtils.getAllDependencies;
+import static org.jetbrains.kotlin.jps.build.JpsUtils.getAllDependencies;
 import static org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilder.DependencyProcessor;
 import static org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilder.DependencyProvider;
 
diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderService.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderService.java
similarity index 92%
rename from jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderService.java
rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderService.java
index 08de8142505..2ad701e4433 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderService.java
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderService.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.jps.build;
+package org.jetbrains.kotlin.jps.build;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.incremental.BuilderService;
diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinSourceFileCollector.java
similarity index 98%
rename from jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java
rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinSourceFileCollector.java
index 353d99f2dbb..5fc6f77ddc5 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinSourceFileCollector.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.jps.build;
+package org.jetbrains.kotlin.jps.build;
 
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.io.FileUtil;
diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
similarity index 99%
rename from jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt
rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
index 5d5b6dcfb7e..05cc268cc43 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.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,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.jps.incremental
+package org.jetbrains.kotlin.jps.incremental
 
-import org.jetbrains.jet.jps.incremental.IncrementalCacheImpl.RecompilationDecision.*
+import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.*
 import java.io.File
 import com.intellij.util.io.PersistentHashMap
 import java.io.DataOutput
diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheProviderImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt
similarity index 90%
rename from jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheProviderImpl.kt
rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt
index b174b864cee..9fdc78be502 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheProviderImpl.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.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,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.jps.incremental
+package org.jetbrains.kotlin.jps.incremental
 
 import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider
 import org.jetbrains.jps.incremental.ModuleBuildTarget
 import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache
-import kotlin.properties.Delegates
 
 public class IncrementalCacheProviderImpl(caches: Map<ModuleBuildTarget, IncrementalCacheImpl>): IncrementalCacheProvider {
     private val idToCache = caches.mapKeys { it.key.getId()!! }
@@ -28,4 +27,3 @@ public class IncrementalCacheProviderImpl(caches: Map<ModuleBuildTarget, Increme
         return idToCache[moduleId]!!
     }
 }
-
diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt
similarity index 95%
rename from jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt
rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt
index ee6b4329db6..cca30f8be06 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.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.jps.incremental
+package org.jetbrains.kotlin.jps.incremental
 
 import org.jetbrains.jet.lang.resolve.kotlin.FileBasedKotlinClass
 import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader
diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerArgumentsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java
similarity index 92%
rename from jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerArgumentsSerializer.java
rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java
index 64590df88e6..502d34f9266 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerArgumentsSerializer.java
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.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,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.jps.model;
+package org.jetbrains.kotlin.jps.model;
 
 import com.intellij.util.xmlb.XmlSerializer;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments;
-import org.jetbrains.jet.jps.JpsKotlinCompilerSettings;
 import org.jetbrains.jps.model.JpsProject;
 import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer;
+import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings;
 
 import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE;
 import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION;
diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java
similarity index 92%
rename from jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java
rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java
index 2138bbd38d5..545a80396c8 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.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,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.jps.model;
+package org.jetbrains.kotlin.jps.model;
 
 import com.intellij.util.xmlb.XmlSerializer;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments;
-import org.jetbrains.jet.jps.JpsKotlinCompilerSettings;
 import org.jetbrains.jps.model.JpsProject;
 import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer;
+import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings;
 
 import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE;
 import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION;
@@ -45,4 +45,4 @@ class Kotlin2JvmCompilerArgumentsSerializer extends JpsProjectExtensionSerialize
     @Override
     public void saveExtension(@NotNull JpsProject project, @NotNull Element componentTag) {
     }
-}
\ No newline at end of file
+}
diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerArgumentsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java
similarity index 92%
rename from jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerArgumentsSerializer.java
rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java
index 793f1625103..173b8fcc9e7 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerArgumentsSerializer.java
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.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,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.jps.model;
+package org.jetbrains.kotlin.jps.model;
 
 import com.intellij.util.xmlb.XmlSerializer;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments;
-import org.jetbrains.jet.jps.JpsKotlinCompilerSettings;
 import org.jetbrains.jps.model.JpsProject;
 import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer;
+import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings;
 
 import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION;
 import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE;
diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCompilerSettingsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java
similarity index 92%
rename from jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCompilerSettingsSerializer.java
rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java
index c49532277fc..109bdef9672 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCompilerSettingsSerializer.java
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.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,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.jps.model;
+package org.jetbrains.kotlin.jps.model;
 
 import com.intellij.util.xmlb.XmlSerializer;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.compiler.CompilerSettings;
-import org.jetbrains.jet.jps.JpsKotlinCompilerSettings;
 import org.jetbrains.jps.model.JpsProject;
 import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer;
+import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings;
 
-import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION;
 import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE;
+import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION;
 
 class KotlinCompilerSettingsSerializer extends JpsProjectExtensionSerializer {
     KotlinCompilerSettingsSerializer() {
diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinModelSerializerService.java
similarity index 94%
rename from jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java
rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinModelSerializerService.java
index feef8743763..8274f453dde 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinModelSerializerService.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.jps.model;
+package org.jetbrains.kotlin.jps.model;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.model.serialization.JpsModelSerializerExtension;
diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
similarity index 99%
rename from jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt
rename to jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
index 0d2fba0f0cc..15f6dd75629 100644
--- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.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.jps.build
+package org.jetbrains.kotlin.jps.build
 
 import org.jetbrains.jps.builders.JpsBuildTestCase
 import kotlin.properties.Delegates
diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java
similarity index 98%
rename from jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java
rename to jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java
index 2cbd42c48ed..3c3ab6ccd8e 100644
--- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.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.jps.build;
+package org.jetbrains.kotlin.jps.build;
 
 import com.intellij.openapi.util.io.FileUtil;
 import org.jetbrains.annotations.NotNull;
diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalCacheVersionChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt
similarity index 88%
rename from jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalCacheVersionChangedTest.kt
rename to jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt
index 01e72da5452..1744b5d2c99 100644
--- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalCacheVersionChangedTest.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.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,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.jps.build
+package org.jetbrains.kotlin.jps.build
 
 import org.jetbrains.jps.builders.impl.BuildDataPathsImpl
 import java.io.File
 import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType
-import org.jetbrains.jet.jps.incremental.IncrementalCacheImpl
+import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl
 import kotlin.test.assertTrue
-import org.jetbrains.jet.jps.incremental.CacheFormatVersion
+import org.jetbrains.kotlin.jps.incremental.CacheFormatVersion
 
 public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest() {
     fun testCacheVersionChanged() {
@@ -43,4 +43,4 @@ public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest() {
         assertTrue(cacheVersionFile.exists())
         cacheVersionFile.writeText("777")
     }
-}
\ No newline at end of file
+}
diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
similarity index 99%
rename from jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
rename to jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
index 0e312e657c2..842ccd9ec46 100644
--- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.jps.build;
+package org.jetbrains.kotlin.jps.build;
 
 import com.intellij.testFramework.TestDataPath;
 import org.jetbrains.jet.JUnit3RunnerWithInners;
diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java
similarity index 99%
rename from jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java
rename to jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java
index da4377aba83..071e50a59cf 100644
--- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.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,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.jps.build;
+package org.jetbrains.kotlin.jps.build;
 
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.testFramework.LightVirtualFile;
-import com.intellij.util.Processor;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.io.ZipUtil;
 import kotlin.KotlinPackage;
diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
similarity index 98%
rename from jps/jps-plugin/test/org/jetbrains/jet/jps/build/SimpleKotlinJpsBuildTest.kt
rename to jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt
index 1adc05168c3..10aee550912 100644
--- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/SimpleKotlinJpsBuildTest.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.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.jps.build
+package org.jetbrains.kotlin.jps.build
 
 import org.jetbrains.jps.builders.JpsBuildTestCase
 import com.intellij.util.PathUtil
diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt
similarity index 96%
rename from jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt
rename to jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt
index baec706c9a8..b12ee084c48 100644
--- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.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.jps.build
+package org.jetbrains.kotlin.jps.build
 
 import java.io.File
 import org.junit.Assert.*
@@ -28,14 +28,13 @@ import com.google.common.hash.Hashing
 import com.intellij.openapi.util.io.FileUtil
 import com.google.common.collect.Sets
 import java.util.HashSet
-import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader
 import org.jetbrains.jet.descriptors.serialization.BitEncoding
 import org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf
 import com.google.protobuf.ExtensionRegistry
 import java.io.ByteArrayInputStream
 import org.jetbrains.jet.descriptors.serialization.DebugProtoBuf
 import java.util.Arrays
-import org.jetbrains.jet.jps.incremental.LocalFileKotlinClass
+import org.jetbrains.kotlin.jps.incremental.LocalFileKotlinClass
 import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatibleClassKind
 import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatiblePackageFacadeKind