diff --git a/.idea/modules.xml b/.idea/modules.xml
index d7c163a6466..fc4c4f5c123 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -31,7 +31,7 @@
       <module fileurl="file://$PROJECT_DIR$/compiler/preloader/preloader.iml" filepath="$PROJECT_DIR$/compiler/preloader/preloader.iml" group="compiler/cli" />
       <module fileurl="file://$PROJECT_DIR$/runtime/runtime.iml" filepath="$PROJECT_DIR$/runtime/runtime.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler/frontend/serialization/serialization.iml" filepath="$PROJECT_DIR$/compiler/frontend/serialization/serialization.iml" group="compiler" />
-      <module fileurl="file://$PROJECT_DIR$/compiler/frontend.java/serialization.java/serialization.java.iml" filepath="$PROJECT_DIR$/compiler/frontend.java/serialization.java/serialization.java.iml" group="compiler/java" />
+      <module fileurl="file://$PROJECT_DIR$/core/serialization.java/serialization.java.iml" filepath="$PROJECT_DIR$/core/serialization.java/serialization.java.iml" group="compiler/java" />
       <module fileurl="file://$PROJECT_DIR$/compiler/util/util.iml" filepath="$PROJECT_DIR$/compiler/util/util.iml" />
     </modules>
   </component>
diff --git a/build.xml b/build.xml
index f5059e9c8f2..51c414094ed 100644
--- a/build.xml
+++ b/build.xml
@@ -27,7 +27,7 @@
         <include name="compiler/frontend/serialization/src"/>
         <include name="core/descriptor.loader.java/src"/>
         <include name="compiler/frontend.java/src"/>
-        <include name="compiler/frontend.java/serialization.java/src"/>
+        <include name="core/serialization.java/src"/>
         <include name="compiler/backend/src"/>
         <include name="compiler/cli/src"/>
         <include name="compiler/cli/cli-common/src"/>
@@ -46,6 +46,7 @@
         <include name="serialization/**"/>
         <include name="descriptor.loader.java/**"/>
         <include name="frontend.java/**"/>
+        <include name="serialization.java/**"/>
         <include name="backend/**"/>
         <include name="cli/**"/>
         <include name="cli-common/**"/>
diff --git a/compiler/frontend.java/serialization.java/serialization.java.iml b/core/serialization.java/serialization.java.iml
similarity index 100%
rename from compiler/frontend.java/serialization.java/serialization.java.iml
rename to core/serialization.java/serialization.java.iml
diff --git a/compiler/frontend.java/serialization.java/src/java_descriptors.proto b/core/serialization.java/src/java_descriptors.proto
similarity index 100%
rename from compiler/frontend.java/serialization.java/src/java_descriptors.proto
rename to core/serialization.java/src/java_descriptors.proto
diff --git a/compiler/frontend.java/serialization.java/src/org/jetbrains/jet/descriptors/serialization/JavaProtoBuf.java b/core/serialization.java/src/org/jetbrains/jet/descriptors/serialization/JavaProtoBuf.java
similarity index 100%
rename from compiler/frontend.java/serialization.java/src/org/jetbrains/jet/descriptors/serialization/JavaProtoBuf.java
rename to core/serialization.java/src/org/jetbrains/jet/descriptors/serialization/JavaProtoBuf.java
diff --git a/compiler/frontend.java/serialization.java/src/org/jetbrains/jet/descriptors/serialization/JavaProtoBufUtil.java b/core/serialization.java/src/org/jetbrains/jet/descriptors/serialization/JavaProtoBufUtil.java
similarity index 100%
rename from compiler/frontend.java/serialization.java/src/org/jetbrains/jet/descriptors/serialization/JavaProtoBufUtil.java
rename to core/serialization.java/src/org/jetbrains/jet/descriptors/serialization/JavaProtoBufUtil.java