diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.java
similarity index 100%
rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.java
rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.java
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java
similarity index 100%
rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java
rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.java
similarity index 94%
rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.java
rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.java
index bddf4f15b0d..24f0f1eba61 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.java
@@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.resolve.scopes;
 
 import com.google.common.collect.Multimap;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.resolve.name.Name;
 
@@ -51,7 +50,8 @@ public interface WritableScope extends JetScope {
     
     void addVariableAlias(@NotNull Name name, @NotNull VariableDescriptor variableDescriptor);
 
-    @NotNull Multimap<Name, DeclarationDescriptor> getDeclaredDescriptorsAccessibleBySimpleName();
+    @NotNull
+    Multimap<Name, DeclarationDescriptor> getDeclaredDescriptorsAccessibleBySimpleName();
 
     void importScope(@NotNull JetScope imported);
 
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java
similarity index 100%
rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java
rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java
similarity index 100%
rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java
rename to compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java