diff --git a/compiler/builtins-serializer/src/BuiltInsSerializer.kt b/compiler/builtins-serializer/src/BuiltInsSerializer.kt
index 2820ef101f8..b042514f1bc 100644
--- a/compiler/builtins-serializer/src/BuiltInsSerializer.kt
+++ b/compiler/builtins-serializer/src/BuiltInsSerializer.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.utils.builtinsSerializer
+package org.jetbrains.kotlin.serialization.builtins
 
 import java.io.File
 import com.intellij.openapi.util.Disposer
diff --git a/compiler/builtins-serializer/src/ClassSerializationUtil.kt b/compiler/builtins-serializer/src/ClassSerializationUtil.kt
index 9d74e9db8df..607266cf94e 100644
--- a/compiler/builtins-serializer/src/ClassSerializationUtil.kt
+++ b/compiler/builtins-serializer/src/ClassSerializationUtil.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.utils.builtinsSerializer
+package org.jetbrains.kotlin.serialization.builtins
 
 import org.jetbrains.jet.descriptors.serialization.DescriptorSerializer
 import org.jetbrains.jet.descriptors.serialization.ProtoBuf
diff --git a/compiler/builtins-serializer/src/run-bootstrap.kt b/compiler/builtins-serializer/src/run-bootstrap.kt
new file mode 100644
index 00000000000..82529eab1a8
--- /dev/null
+++ b/compiler/builtins-serializer/src/run-bootstrap.kt
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ * 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.utils.builtinsSerializer
+
+// TODO: delete this file, needed for bootstrap only
+fun main(args: Array<String>) {
+    org.jetbrains.kotlin.serialization.builtins.main(args)
+}
diff --git a/compiler/builtins-serializer/src/run.kt b/compiler/builtins-serializer/src/run.kt
index 8232bea6a48..283a14a115b 100644
--- a/compiler/builtins-serializer/src/run.kt
+++ b/compiler/builtins-serializer/src/run.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.utils.builtinsSerializer
+package org.jetbrains.kotlin.serialization.builtins
 
 import java.io.File
 
diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltInsSerializerTest.kt b/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltInsSerializerTest.kt
index fea639563b9..b749051a820 100644
--- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltInsSerializerTest.kt
+++ b/compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltInsSerializerTest.kt
@@ -17,7 +17,7 @@
 package org.jetbrains.jet.descriptors.serialization
 
 import java.io.File
-import org.jetbrains.jet.utils.builtinsSerializer.BuiltInsSerializer
+import org.jetbrains.kotlin.serialization.builtins.BuiltInsSerializer
 import org.jetbrains.jet.test.TestCaseWithTmpdir
 import org.jetbrains.jet.lang.types.lang.BuiltinsPackageFragment
 import org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.TEST_PACKAGE_FQNAME