diff --git a/js/js.translator/lib/dart-ast.jar b/js/js.translator/lib/dart-ast.jar
index 8536021e2a3..160e199f9ff 100644
Binary files a/js/js.translator/lib/dart-ast.jar and b/js/js.translator/lib/dart-ast.jar differ
diff --git a/js/js.translator/lib/src/dart-ast-src.jar b/js/js.translator/lib/src/dart-ast-src.jar
index c0b540c2fbd..df6f8b784b7 100644
Binary files a/js/js.translator/lib/src/dart-ast-src.jar and b/js/js.translator/lib/src/dart-ast-src.jar differ
diff --git a/js/js.translator/src/org/jetbrains/js/compiler/JsSourceGenerationVisitor.java b/js/js.translator/src/org/jetbrains/js/compiler/JsSourceGenerationVisitor.java
index 57cff94ce23..29dc2b42788 100644
--- a/js/js.translator/src/org/jetbrains/js/compiler/JsSourceGenerationVisitor.java
+++ b/js/js.translator/src/org/jetbrains/js/compiler/JsSourceGenerationVisitor.java
@@ -21,6 +21,7 @@ import com.google.dart.compiler.backend.js.ast.*;
 import com.google.dart.compiler.util.TextOutput;
 import com.intellij.util.SmartList;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.js.compiler.sourcemap.SourceMapBuilder;
 
 import java.util.List;
 
diff --git a/js/js.translator/src/org/jetbrains/js/compiler/sourcemap/SourceMap3Builder.java b/js/js.translator/src/org/jetbrains/js/compiler/sourcemap/SourceMap3Builder.java
index 11f0d9ae0ca..e56f9a3180b 100644
--- a/js/js.translator/src/org/jetbrains/js/compiler/sourcemap/SourceMap3Builder.java
+++ b/js/js.translator/src/org/jetbrains/js/compiler/sourcemap/SourceMap3Builder.java
@@ -4,7 +4,6 @@ import com.google.dart.compiler.common.SourceInfo;
 import com.google.dart.compiler.util.TextOutput;
 import com.intellij.util.PairConsumer;
 import gnu.trove.TObjectIntHashMap;
-import org.jetbrains.js.compiler.SourceMapBuilder;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/js/js.translator/src/org/jetbrains/js/compiler/sourcemap/SourceMapBuilder.java b/js/js.translator/src/org/jetbrains/js/compiler/sourcemap/SourceMapBuilder.java
new file mode 100644
index 00000000000..8897c9646f2
--- /dev/null
+++ b/js/js.translator/src/org/jetbrains/js/compiler/sourcemap/SourceMapBuilder.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2010-2013 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.js.compiler.sourcemap;
+
+import java.io.File;
+
+public interface SourceMapBuilder {
+    void newLine();
+
+    void addMapping(String source, int sourceLine, int sourceColumn);
+
+    void processSourceInfo(Object info);
+
+    void addLink();
+
+    File getOutFile();
+
+    String build();
+}
diff --git a/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java b/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
index 5ace30c1201..c1223a8a43e 100644
--- a/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
+++ b/js/js.translator/src/org/jetbrains/k2js/facade/K2JSTranslator.java
@@ -25,8 +25,8 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.js.compiler.JsSourceGenerationVisitor;
-import org.jetbrains.js.compiler.SourceMapBuilder;
 import org.jetbrains.js.compiler.sourcemap.SourceMap3Builder;
+import org.jetbrains.js.compiler.sourcemap.SourceMapBuilder;
 import org.jetbrains.k2js.analyze.AnalyzerFacadeForJS;
 import org.jetbrains.k2js.config.Config;
 import org.jetbrains.k2js.facade.exceptions.TranslationException;
diff --git a/js/js.translator/src/org/jetbrains/k2js/facade/SourceMapBuilderConsumer.java b/js/js.translator/src/org/jetbrains/k2js/facade/SourceMapBuilderConsumer.java
index 90db9c0a6ab..6e75a217cd9 100644
--- a/js/js.translator/src/org/jetbrains/k2js/facade/SourceMapBuilderConsumer.java
+++ b/js/js.translator/src/org/jetbrains/k2js/facade/SourceMapBuilderConsumer.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Document;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.PairConsumer;
-import org.jetbrains.js.compiler.SourceMapBuilder;
+import org.jetbrains.js.compiler.sourcemap.SourceMapBuilder;
 
 class SourceMapBuilderConsumer implements PairConsumer<SourceMapBuilder, Object> {
     @Override