diff --git a/compiler/frontend/serialization/serialization.iml b/compiler/frontend/serialization/serialization.iml
index 85fb26edac3..f383c337370 100644
--- a/compiler/frontend/serialization/serialization.iml
+++ b/compiler/frontend/serialization/serialization.iml
@@ -13,7 +13,7 @@
     <orderEntry type="library" name="trove4j" level="project" />
     <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="util.runtime" />
-    <orderEntry type="module" module-name="descriptors" />
+    <orderEntry type="module" module-name="descriptors" exported="" />
   </component>
 </module>
 
diff --git a/core/descriptor.loader.java/descriptor.loader.java.iml b/core/descriptor.loader.java/descriptor.loader.java.iml
index 281b0ba4b01..66e8496e0f7 100644
--- a/core/descriptor.loader.java/descriptor.loader.java.iml
+++ b/core/descriptor.loader.java/descriptor.loader.java.iml
@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="frontend" />
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="serialization.java" />
     <orderEntry type="library" name="javax.inject" level="project" />
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/SynthesizedCallableMemberDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/SynthesizedCallableMemberDescriptor.java
similarity index 100%
rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/SynthesizedCallableMemberDescriptor.java
rename to core/descriptors/src/org/jetbrains/jet/lang/descriptors/SynthesizedCallableMemberDescriptor.java
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/DependencyClassByQualifiedNameResolver.java b/core/descriptors/src/org/jetbrains/jet/lang/types/DependencyClassByQualifiedNameResolver.java
similarity index 99%
rename from compiler/frontend/src/org/jetbrains/jet/lang/types/DependencyClassByQualifiedNameResolver.java
rename to core/descriptors/src/org/jetbrains/jet/lang/types/DependencyClassByQualifiedNameResolver.java
index 2b03cf6f6d9..55d021257e0 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/DependencyClassByQualifiedNameResolver.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/types/DependencyClassByQualifiedNameResolver.java
@@ -22,7 +22,6 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 
 public interface DependencyClassByQualifiedNameResolver {
-
     @Nullable
     ClassDescriptor resolveClass(@NotNull FqName qualifiedName);
 }
diff --git a/core/serialization.java/serialization.java.iml b/core/serialization.java/serialization.java.iml
index 3af933ee3e9..b0975ee7c27 100644
--- a/core/serialization.java/serialization.java.iml
+++ b/core/serialization.java/serialization.java.iml
@@ -11,7 +11,6 @@
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="library" name="annotations" level="project" />
     <orderEntry type="library" name="asm" level="project" />
-    <orderEntry type="module" module-name="frontend" />
   </component>
 </module>