From e3454dbb53ad140644b06ac0202f767974727a36 Mon Sep 17 00:00:00 2001
From: Pavel Talanov <Pavel.Talanov@jetbrains.com>
Date: Wed, 18 Jan 2012 20:56:23 +0400
Subject: [PATCH] Big migration.

---
 .idea/workspace.xml                           | 1519 ++++++++++-------
 .../google/dart/compiler/util/AstUtil.java    |    2 +-
 .../org/jetbrains/k2js/K2JSTranslator.java    |   37 +-
 .../translate/context/StandardClasses.java    |   58 +-
 .../k2js/translate/intrinsic/Intrinsics.java  |   15 +-
 .../intrinsic/array/IntrinsicArrayUtils.java  |    2 +-
 .../intrinsic/string/LengthIntrinsic.java     |   30 +
 .../translate/reference/CallTranslator.java   |   11 +-
 .../reference/PropertyAccessTranslator.java   |   54 +-
 .../org/jetbrains/k2js/test/FunctionTest.java |    4 +-
 .../org/jetbrains/k2js/test/MiscTest.java     |    6 -
 .../jetbrains/k2js/test/OperationTest.java    |    2 +-
 .../org/jetbrains/k2js/test/SystemTest.java   |   26 -
 .../jetbrains/k2js/test/TranslationTest.java  |   36 +
 ...lesTest.java => WebDemoExamples1Test.java} |    4 +-
 .../k2js/test/WebDemoExamples2Test.java       |   23 +
 .../sortedTests/unsupported/basicproperty.jet |    2 +-
 .../sortedTests/unsupported/traitproperty.jet |    2 +-
 .../expression/function/cases/KT-921.kt       |    4 +-
 ...hParameter.jet => closureWithParameter.kt} |    0
 .../{enclosingThis.jet => enclosingThis.kt}   |    0
 .../testFiles/expression/misc/cases/KT-962.kt |    4 +-
 .../expression/misc/cases/intRange.kt         |   10 +-
 .../operation/cases/{assign.jet => assign.kt} |    0
 .../testFiles/java/system/cases/print.kt      |    3 -
 .../testFiles/java/system/cases/println.kt    |    5 -
 translator/testFiles/kotlin_lib.js            |   31 +-
 .../testFiles/range/cases/explicitRange.kt    |    4 +-
 .../testFiles/range/cases/intInRange.kt       |    2 +
 .../testFiles/range/cases/rangeSugarSyntax.kt |    4 +-
 .../webDemoExamples/cases/forLoop.kt          |    9 -
 .../webDemoExamples/cases/ifAsExpression.kt   |    5 -
 .../webDemoExamples/cases/isCheck.kt          |   10 -
 .../cases/multiLanguageHello.kt               |    9 -
 .../webDemoExamples/cases/nullChecks.kt       |   23 -
 .../cases/objectOrientedHello.kt              |   10 -
 .../webDemoExamples/cases/patternMatching.kt  |   18 -
 .../webDemoExamples/cases/printArg.kt         |    3 -
 .../testFiles/webDemoExamples/cases/ranges.kt |   35 -
 .../webDemoExamples/cases/whileLoop.kt        |    5 -
 .../webDemoExamples2/cases/bottles.kt         |   75 +
 .../webDemoExamples2/expected/bottles.out     |  301 ++++
 42 files changed, 1480 insertions(+), 923 deletions(-)
 create mode 100644 translator/src/org/jetbrains/k2js/translate/intrinsic/string/LengthIntrinsic.java
 delete mode 100644 translator/test/org/jetbrains/k2js/test/SystemTest.java
 rename translator/test/org/jetbrains/k2js/test/{WebDemoExamplesTest.java => WebDemoExamples1Test.java} (94%)
 create mode 100644 translator/test/org/jetbrains/k2js/test/WebDemoExamples2Test.java
 rename translator/testFiles/expression/function/cases/{closureWithParameter.jet => closureWithParameter.kt} (100%)
 rename translator/testFiles/expression/function/cases/{enclosingThis.jet => enclosingThis.kt} (100%)
 rename translator/testFiles/expression/operation/cases/{assign.jet => assign.kt} (100%)
 delete mode 100644 translator/testFiles/java/system/cases/print.kt
 delete mode 100644 translator/testFiles/java/system/cases/println.kt
 delete mode 100644 translator/testFiles/webDemoExamples/cases/forLoop.kt
 delete mode 100644 translator/testFiles/webDemoExamples/cases/ifAsExpression.kt
 delete mode 100644 translator/testFiles/webDemoExamples/cases/isCheck.kt
 delete mode 100644 translator/testFiles/webDemoExamples/cases/multiLanguageHello.kt
 delete mode 100644 translator/testFiles/webDemoExamples/cases/nullChecks.kt
 delete mode 100644 translator/testFiles/webDemoExamples/cases/objectOrientedHello.kt
 delete mode 100644 translator/testFiles/webDemoExamples/cases/patternMatching.kt
 delete mode 100644 translator/testFiles/webDemoExamples/cases/printArg.kt
 delete mode 100644 translator/testFiles/webDemoExamples/cases/ranges.kt
 delete mode 100644 translator/testFiles/webDemoExamples/cases/whileLoop.kt
 create mode 100644 translator/testFiles/webDemoExamples2/cases/bottles.kt
 create mode 100644 translator/testFiles/webDemoExamples2/expected/bottles.out

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 11120bbb061..263f860b040 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,18 +10,52 @@
   </component>
   <component name="BookmarkManager">
     <bookmark url="file://$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/safeCallReturnsNullIfFails.kt" line="3" />
-    <bookmark url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" line="69" />
+    <bookmark url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" line="85" />
   </component>
   <component name="ChangeListManager">
     <list default="true" id="f02ef53d-47a4-4f5e-a1aa-3df68aae9b20" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/namedArguments.kt" />
-      <change type="DELETED" beforePath="C:\Dev\Projects\jet-contrib\k2js\.idea\workspace.xml" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/string/LengthIntrinsic.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/webDemoExamples2/cases/bottles.kt" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/webDemoExamples2/expected/bottles.out" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/WebDemoExamples2Test.java" />
+      <change type="DELETED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\java\system\cases\print.kt" afterPath="" />
+      <change type="DELETED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\java\system\cases\println.kt" afterPath="" />
+      <change type="DELETED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\webDemoExamples\cases\forLoop.kt" afterPath="" />
+      <change type="DELETED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\webDemoExamples\cases\ifAsExpression.kt" afterPath="" />
+      <change type="DELETED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\webDemoExamples\cases\isCheck.kt" afterPath="" />
+      <change type="DELETED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\webDemoExamples\cases\multiLanguageHello.kt" afterPath="" />
+      <change type="DELETED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\webDemoExamples\cases\nullChecks.kt" afterPath="" />
+      <change type="DELETED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\webDemoExamples\cases\objectOrientedHello.kt" afterPath="" />
+      <change type="DELETED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\webDemoExamples\cases\patternMatching.kt" afterPath="" />
+      <change type="DELETED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\webDemoExamples\cases\printArg.kt" afterPath="" />
+      <change type="DELETED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\webDemoExamples\cases\ranges.kt" afterPath="" />
+      <change type="DELETED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\webDemoExamples\cases\whileLoop.kt" afterPath="" />
+      <change type="DELETED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\test\org\jetbrains\k2js\test\SystemTest.java" afterPath="" />
+      <change type="MOVED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\expression\function\cases\closureWithParameter.jet" afterPath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/closureWithParameter.kt" />
+      <change type="MOVED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\expression\function\cases\enclosingThis.jet" afterPath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/enclosingThis.kt" />
+      <change type="MOVED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\expression\operation\cases\assign.jet" afterPath="$PROJECT_DIR$/translator/testFiles/expression/operation/cases/assign.kt" />
+      <change type="MOVED" beforePath="C:\Dev\Projects\jet-contrib\k2js\translator\test\org\jetbrains\k2js\test\WebDemoExamplesTest.java" afterPath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/WebDemoExamples1Test.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/src/com/google/dart/compiler/util/AstUtil.java" afterPath="$PROJECT_DIR$/js/src/com/google/dart/compiler/util/AstUtil.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/Namer.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/Namer.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/array/IntrinsicArrayUtils.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/array/IntrinsicArrayUtils.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/sortedTests/unsupported/basicproperty.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/sortedTests/unsupported/basicproperty.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/examples/sortedTests/unsupported/traitproperty.jet" afterPath="$PROJECT_DIR$/translator/testFiles/examples/sortedTests/unsupported/traitproperty.jet" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/KT-921.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/function/cases/KT-921.kt" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/misc/cases/KT-962.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/misc/cases/KT-962.kt" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/expression/misc/cases/intRange.kt" afterPath="$PROJECT_DIR$/translator/testFiles/expression/misc/cases/intRange.kt" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/kotlin_lib.js" afterPath="$PROJECT_DIR$/translator/testFiles/kotlin_lib.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/range/cases/explicitRange.kt" afterPath="$PROJECT_DIR$/translator/testFiles/range/cases/explicitRange.kt" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/range/cases/intInRange.kt" afterPath="$PROJECT_DIR$/translator/testFiles/range/cases/intInRange.kt" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/range/cases/rangeSugarSyntax.kt" afterPath="$PROJECT_DIR$/translator/testFiles/range/cases/rangeSugarSyntax.kt" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/FunctionTest.java" afterPath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/FunctionTest.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/translator.iml" afterPath="$PROJECT_DIR$/translator/translator.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/MiscTest.java" afterPath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/MiscTest.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/OperationTest.java" afterPath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/OperationTest.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/TranslationTest.java" afterPath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/TranslationTest.java" />
     </list>
     <ignored path="k2js.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -41,9 +75,15 @@
     <SUITE FILE_PATH="coverage/k2js$All_in_translator.ic" NAME="All in translator Coverage Results" MODIFIED="1322842646613" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>org.jetbrains.k2js.translate.*</FILTER>
     </SUITE>
+    <SUITE FILE_PATH="coverage/k2js$WebDemoExamples1Test_isCheck.ic" NAME="WebDemoExamples1Test.isCheck Coverage Results" MODIFIED="1326900366996" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+      <FILTER>org.jetbrains.k2js.*</FILTER>
+    </SUITE>
     <SUITE FILE_PATH="coverage/k2js$tests.ic" NAME="tests Coverage Results" MODIFIED="1323868123819" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>org.jetbrains.k2js.*</FILTER>
     </SUITE>
+    <SUITE FILE_PATH="coverage/k2js$OperationTest_assign.ic" NAME="OperationTest.assign Coverage Results" MODIFIED="1326894346349" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+      <FILTER>org.jetbrains.k2js.*</FILTER>
+    </SUITE>
     <SUITE FILE_PATH="coverage/k2js$All_in_jetTests.ic" NAME="All in jetTests Coverage Results" MODIFIED="1323784159712" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>org.jetbrains.k2js.translate.*</FILTER>
     </SUITE>
@@ -138,6 +178,97 @@
         <option name="CONDITION" value="" />
         <option name="LOG_MESSAGE" value="" />
       </breakpoint>
+      <breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java" line="89" class="org.jetbrains.k2js.translate.operation.BinaryOperationTranslator" package="org.jetbrains.k2js.translate.operation">
+        <option name="ENABLED" value="true" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java" line="55" class="org.jetbrains.k2js.translate.operation.BinaryOperationTranslator" package="org.jetbrains.k2js.translate.operation">
+        <option name="ENABLED" value="true" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java" line="161" class="org.jetbrains.k2js.translate.context.TranslationContext" package="org.jetbrains.k2js.translate.context">
+        <option name="ENABLED" value="true" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java" line="247" class="org.jetbrains.k2js.translate.reference.CallTranslator" package="org.jetbrains.k2js.translate.reference">
+        <option name="ENABLED" value="true" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java" line="266" class="org.jetbrains.k2js.translate.reference.CallTranslator" package="org.jetbrains.k2js.translate.reference">
+        <option name="ENABLED" value="true" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java" line="171" class="org.jetbrains.k2js.translate.context.StandardClasses" package="org.jetbrains.k2js.translate.context">
+        <option name="ENABLED" value="true" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java" line="108" class="org.jetbrains.k2js.translate.expression.ExpressionVisitor" package="org.jetbrains.k2js.translate.expression">
+        <option name="ENABLED" value="true" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
     </line_breakpoints>
     <breakpoint_any>
       <breakpoint>
@@ -186,8 +317,8 @@
       <property name="field_breakpoints_groupByClasses" value="true" />
       <property name="method_breakpoints_groupByClasses" value="true" />
       <property name="exception_breakpoints_viewId" value="TABLE" />
-      <property name="exception_breakpoints_groupByClasses" value="true" />
       <property name="field_breakpoints_viewId" value="TABLE" />
+      <property name="exception_breakpoints_groupByClasses" value="true" />
       <property name="method_breakpoints_groupByMethods" value="false" />
     </ui_properties>
   </component>
@@ -195,13 +326,109 @@
     <favorites_list name="k2js" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.52194786">
+    <splitter split-orientation="horizontal" split-proportion="0.46980223">
       <split-first>
         <leaf>
-          <file leaf-file-name="StandardClassesTest.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/StandardClassesTest.java">
+          <file leaf-file-name="enclosingThis.kt" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/enclosingThis.kt">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="37" column="16" selection-start="844" selection-end="844" vertical-scroll-proportion="0.0">
+                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="closureWithParameter.kt" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/closureWithParameter.kt">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="FunctionTest.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/FunctionTest.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="52" column="16" selection-start="1209" selection-end="1209" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="closureWithParameterAndBoxing.jet" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/closureWithParameterAndBoxing.jet">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="ranges.kt" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/webDemoExamples1/cases/ranges.kt">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="6" column="12" selection-start="0" selection-end="864" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="JsSupport.jet" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/stdlib/ktSrc/jssupport/JsSupport.jet">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="JsCollectionSupport.jet" pinned="false" current="true" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/stdlib/ktSrc/jssupport/JsCollectionSupport.jet">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="11" column="16" selection-start="289" selection-end="289" vertical-scroll-proportion="0.40128756">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="WebDemoExamples1Test.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/WebDemoExamples1Test.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="48" column="16" selection-start="1231" selection-end="1231" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="K2JSTranslator.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="109" column="103" selection-start="4226" selection-end="4226" vertical-scroll-proportion="0.0">
+                  <folding>
+                    <element signature="e#2302#2311#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="DiagnosticHolder.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticHolder.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="21" column="0" selection-start="757" selection-end="757" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-first>
+      <split-second>
+        <leaf>
+          <file leaf-file-name="explicitRange.kt" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/range/cases/explicitRange.kt">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="2" column="11" selection-start="24" selection-end="24" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
@@ -216,167 +443,73 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="ArrayListTest.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ArrayListTest.java">
+          <file leaf-file-name="TraitTest.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/TraitTest.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="38" column="16" selection-start="781" selection-end="781" vertical-scroll-proportion="0.0">
+                <state line="47" column="16" selection-start="1088" selection-end="1088" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="namedArguments.kt" pinned="false" current="true" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/namedArguments.kt">
+          <file leaf-file-name="OperationTest.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/OperationTest.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="14" column="15" selection-start="256" selection-end="256" vertical-scroll-proportion="0.3211876">
+                <state line="36" column="16" selection-start="814" selection-end="814" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="FunctionTest.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/FunctionTest.java">
+          <file leaf-file-name="ExpressionVisitor.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="77" column="16" selection-start="1894" selection-end="1894" vertical-scroll-proportion="0.0">
+                <state line="108" column="0" selection-start="4806" selection-end="4806" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="localProperty.jet" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/misc/cases/localProperty.jet">
+          <file leaf-file-name="TranslationContext.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+                <state line="161" column="0" selection-start="6071" selection-end="6071" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="intRange.kt" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/misc/cases/intRange.kt">
+          <file leaf-file-name="ReflectiveCallable.class" pinned="false" current="false" current-in-tab="true">
+            <entry file="jar://C:/Program Files (x86)/JetBrains/IntelliJ IDEA Community Edition 112.121/lib/junit-4.10.jar!/org/junit/internal/runners/model/ReflectiveCallable.class">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+                <state line="11" column="40" selection-start="397" selection-end="397" vertical-scroll-proportion="0.34836066">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="intRange.js" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/misc/out/intRange.js">
+          <file leaf-file-name="intInRange.kt" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/range/cases/intInRange.kt">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="78" column="18" selection-start="1994" selection-end="1994" vertical-scroll-proportion="0.0">
+                <state line="2" column="0" selection-start="13" selection-end="13" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="arraysIterator.kt" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/standardClasses/cases/arraysIterator.kt">
+          <file leaf-file-name="KT-962.kt" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/misc/cases/KT-962.kt">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+                <state line="0" column="7" selection-start="7" selection-end="7" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="arraysIterator.js" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/standardClasses/out/arraysIterator.js">
+          <file leaf-file-name="PropertyTranslator.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="18" column="33" selection-start="332" selection-end="332" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-        </leaf>
-      </split-first>
-      <split-second>
-        <leaf>
-          <file leaf-file-name="KT-921.kt" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/KT-921.kt">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="66" column="1" selection-start="1029" selection-end="1029" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="RangeTest.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/RangeTest.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="27" column="16" selection-start="538" selection-end="538" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="defaultParameters.js" pinned="false" current="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/out/defaultParameters.js">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="1" column="0" selection-start="2" selection-end="2" vertical-scroll-proportion="0.024390243">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="enclosingThis.js" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/out/enclosingThis.js">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="1" column="0" selection-start="2" selection-end="2" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="CallTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="123" column="41" selection-start="6638" selection-end="6638" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="PsiUtils.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/PsiUtils.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="91" column="11" selection-start="3376" selection-end="3376" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="Collections.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="jar://C:/Program Files/Java/jdk1.6.0_29/src.zip!/java/util/Collections.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="2969" column="0" selection-start="115173" selection-end="115173" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="JetDelegatorToSuperCall.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDelegatorToSuperCall.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="13" column="13" selection-start="286" selection-end="286" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="ResolvedValueArgument.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ResolvedValueArgument.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="10" column="17" selection-start="206" selection-end="206" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="closureWithParameter.jet" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/closureWithParameter.jet">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="7" column="0" selection-start="0" selection-end="156" vertical-scroll-proportion="0.0">
+                <state line="70" column="0" selection-start="2535" selection-end="2535" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
@@ -406,22 +539,22 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/TranslationContext.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java" />
-        <option value="$PROJECT_DIR$/js/src/com/google/dart/compiler/backend/js/ast/JsBlock.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/DynamicContext.java" />
-        <option value="$PROJECT_DIR$/translator/testFiles/expression/function/out/defaultParameters.js" />
-        <option value="$PROJECT_DIR$/translator/testFiles/expression/function/cases/KT-921.kt" />
-        <option value="$PROJECT_DIR$/translator/testFiles/expression/function/out/KT-921.js" />
-        <option value="$PROJECT_DIR$/translator/testFiles/expression/function/cases/functionLiteralAsLastParameter.kt" />
-        <option value="$PROJECT_DIR$/translator/testFiles/expression/function/out/closureWithParameterAndBoxing.js" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/Namer.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java" />
+        <option value="$PROJECT_DIR$/translator/testFiles/range/cases/explicitRange.kt" />
+        <option value="$PROJECT_DIR$/translator/testFiles/webDemoExamples2/cases/bottles.kt" />
+        <option value="$PROJECT_DIR$/../../Kotlin/jet/stdlib/ktSrc/jssupport/JsInteger.jet" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/array/IntrinsicArrayUtils.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/string/LengthIntrinsic.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java" />
+        <option value="$PROJECT_DIR$/../../Kotlin/jet/stdlib/ktSrc/jssupport/JsSupport.jet" />
+        <option value="$PROJECT_DIR$/translator/testFiles/webDemoExamples1/cases/ifAsExpression.kt" />
+        <option value="$PROJECT_DIR$/translator/testFiles/webDemoExamples1/cases/ranges.kt" />
+        <option value="$PROJECT_DIR$/translator/testFiles/webDemoExamples1/cases/nullChecks.kt" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java" />
+        <option value="$PROJECT_DIR$/translator/testFiles/webDemoExamples1/out/ifAsExpression.js" />
+        <option value="$PROJECT_DIR$/translator/testFiles/kotlin_lib.js" />
         <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java" />
-        <option value="$PROJECT_DIR$/translator/testFiles/standardClasses/out/arraysIterator.js" />
-        <option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/FunctionTest.java" />
-        <option value="$PROJECT_DIR$/translator/testFiles/expression/function/cases/namedArguments.kt" />
+        <option value="$PROJECT_DIR$/../../Kotlin/jet/stdlib/ktSrc/jssupport/JsCollectionSupport.jet" />
       </list>
     </option>
   </component>
@@ -511,6 +644,416 @@
       <sortByType />
     </navigator>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="ProjectPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="webDemoExamples2" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="out" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="webDemoExamples2" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="webDemoExamples2" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="cases" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="webDemoExamples1" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="out" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="webDemoExamples1" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="cases" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="range" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="out" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="range" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="cases" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="expression" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="expression" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="operation" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="expression" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="operation" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="cases" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="expression" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="function" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="expression" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="function" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="cases" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="test" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="test" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="stdlib" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="stdlib" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ktSrc" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="stdlib" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="ktSrc" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="jssupport" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="examples" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
       <pane id="Scope">
         <subPane subId="Production">
           <PATH>
@@ -639,322 +1182,12 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
-      <pane id="ProjectPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="translator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="translator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="testFiles" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="translator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="testFiles" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="standardClasses" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="out" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="translator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="testFiles" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="standardClasses" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="cases" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="translator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="testFiles" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="expression" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="translator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="testFiles" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="expression" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="misc" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="out" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="translator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="testFiles" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="expression" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="misc" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="cases" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="translator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="testFiles" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="expression" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="function" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="translator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="testFiles" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="expression" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="function" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="cases" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="translator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="testFiles" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="examples" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="translator" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="test" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="frontend.java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="frontend" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="frontend" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="frontend" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="jet" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="examples" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
       <pane id="Favorites" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="project.structure.last.edited" value="Modules" />
+    <property name="project.structure.last.edited" value="Libraries" />
     <property name="OverrideImplement.combined" value="true" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="options.splitter.main.proportions" value="0.3" />
@@ -968,9 +1201,9 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="MemberChooser.showClasses" value="true" />
     <property name="GoToClass.includeLibraries" value="false" />
-    <property name="options.searchVisible" value="true" />
-    <property name="options.splitter.details.proportions" value="0.2" />
     <property name="dynamic.classpath" value="false" />
+    <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="options.searchVisible" value="true" />
   </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
@@ -979,74 +1212,18 @@
       <recent name="org.jetbrains.k2js.backend" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Dev\Projects\Kotlin\jet\stdlib\ktSrc\jssupport" />
       <recent name="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\examples\cases" />
       <recent name="C:\Dev\Projects\jet-contrib\k2js\idea_fix\src" />
       <recent name="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\java\system" />
       <recent name="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\java\arrayList" />
-      <recent name="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\expression\function\cases" />
     </key>
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
       <recent name="org.jetbrains.k2js.test.examples" />
     </key>
   </component>
-  <component name="RunManager" selected="JUnit.FunctionTest.namedArguments">
-    <configuration default="false" name="FunctionTest" type="JUnit" factoryName="JUnit" temporary="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="org.jetbrains.k2js.test.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="jetTests" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
-      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.FunctionTest" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs />
-      <patterns />
-      <RunnerSettings RunnerId="Run" />
-      <ConfigurationWrapper RunnerId="Run" />
-      <method />
-    </configuration>
-    <configuration default="false" name="FunctionTest.kt921" type="JUnit" factoryName="JUnit" temporary="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="org.jetbrains.k2js.test.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="jetTests" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
-      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.FunctionTest" />
-      <option name="METHOD_NAME" value="kt921" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs />
-      <patterns />
-      <RunnerSettings RunnerId="Run" />
-      <ConfigurationWrapper RunnerId="Run" />
-      <method />
-    </configuration>
-    <configuration default="false" name="FunctionTest.functionLiteralAsLastParameter" type="JUnit" factoryName="JUnit" temporary="true">
+  <component name="RunManager" selected="JUnit.All in jetTests">
+    <configuration default="false" name="WebDemoExamples2Test" type="JUnit" factoryName="JUnit" temporary="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
         <pattern>
           <option name="PATTERN" value="org.jetbrains.k2js.*" />
@@ -1057,8 +1234,72 @@
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" value="" />
       <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
-      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.FunctionTest" />
-      <option name="METHOD_NAME" value="functionLiteralAsLastParameter" />
+      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.WebDemoExamples2Test" />
+      <option name="METHOD_NAME" value="" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <dir value="$PROJECT_DIR$/translator" />
+      <patterns />
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Run" />
+      <method />
+    </configuration>
+    <configuration default="false" name="WebDemoExamples1Test.isCheck" type="JUnit" factoryName="JUnit" temporary="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+        <pattern>
+          <option name="PATTERN" value="org.jetbrains.k2js.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <module name="translator" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" value="" />
+      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
+      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.WebDemoExamples1Test" />
+      <option name="METHOD_NAME" value="isCheck" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <dir value="$PROJECT_DIR$/translator" />
+      <patterns />
+      <RunnerSettings RunnerId="Cover" />
+      <RunnerSettings RunnerId="Debug">
+        <option name="DEBUG_PORT" value="" />
+        <option name="TRANSPORT" value="0" />
+        <option name="LOCAL" value="true" />
+      </RunnerSettings>
+      <ConfigurationWrapper RunnerId="Cover" />
+      <ConfigurationWrapper RunnerId="Debug" />
+      <method />
+    </configuration>
+    <configuration default="false" name="WebDemoExamples1Test.ranges" type="JUnit" factoryName="JUnit" temporary="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+        <pattern>
+          <option name="PATTERN" value="org.jetbrains.k2js.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <module name="translator" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" value="" />
+      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
+      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.WebDemoExamples1Test" />
+      <option name="METHOD_NAME" value="ranges" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" value="" />
@@ -1098,20 +1339,15 @@
       <ConfigurationWrapper RunnerId="Run" />
       <method />
     </configuration>
-    <configuration default="false" name="FunctionTest.namedArguments" type="JUnit" factoryName="JUnit" temporary="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="org.jetbrains.k2js.test.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="translator" />
+    <configuration default="false" name="All in jetTests" type="JUnit" factoryName="JUnit" temporary="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="jetTests" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
-      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.FunctionTest" />
-      <option name="METHOD_NAME" value="namedArguments" />
-      <option name="TEST_OBJECT" value="method" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="package" />
       <option name="VM_PARAMETERS" />
       <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
@@ -1184,17 +1420,6 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
-    <configuration default="true" type="JavascriptDebugSession" factoryName="Local">
-      <JSDebuggerConfigurationSettings>
-        <option name="engineId" value="embedded" />
-        <option name="fileUrl" />
-      </JSDebuggerConfigurationSettings>
-      <method>
-        <option name="AntTarget" enabled="false" />
-        <option name="BuildArtifacts" enabled="false" />
-        <option name="Maven.BeforeRunTask" enabled="false" />
-      </method>
-    </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="" />
@@ -1221,6 +1446,17 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
+    <configuration default="true" type="JavascriptDebugSession" factoryName="Local">
+      <JSDebuggerConfigurationSettings>
+        <option name="engineId" value="embedded" />
+        <option name="fileUrl" />
+      </JSDebuggerConfigurationSettings>
+      <method>
+        <option name="AntTarget" enabled="false" />
+        <option name="BuildArtifacts" enabled="false" />
+        <option name="Maven.BeforeRunTask" enabled="false" />
+      </method>
+    </configuration>
     <configuration default="false" name="Applet" type="Applet" factoryName="Applet">
       <module name="translator" />
       <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.K2JSTranslatorApplet" />
@@ -1282,11 +1518,11 @@
     <list size="7">
       <item index="0" class="java.lang.String" itemvalue="Applet.Applet" />
       <item index="1" class="java.lang.String" itemvalue="JUnit.tests" />
-      <item index="2" class="java.lang.String" itemvalue="JUnit.FunctionTest" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.FunctionTest.kt921" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.FunctionTest.functionLiteralAsLastParameter" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.WebDemoExamples2Test" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.WebDemoExamples1Test.isCheck" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.WebDemoExamples1Test.ranges" />
       <item index="5" class="java.lang.String" itemvalue="JUnit.All in translator" />
-      <item index="6" class="java.lang.String" itemvalue="JUnit.FunctionTest.namedArguments" />
+      <item index="6" class="java.lang.String" itemvalue="JUnit.All in jetTests" />
     </list>
     <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
       <Host>localhost</Host>
@@ -1349,7 +1585,7 @@
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32756963" sideWeight="0.4216996" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24973261" sideWeight="0.7183908" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25552353" sideWeight="0.7733832" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.34774256" sideWeight="0.7733832" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32949087" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29682997" sideWeight="0.14323892" order="11" side_tool="true" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@@ -1361,8 +1597,9 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.20363443" sideWeight="0.7588857" order="1" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32977018" sideWeight="0.7002882" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3997862" sideWeight="0.6705998" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22073758" sideWeight="0.7588857" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24111432" sideWeight="0.8530198" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2383752" sideWeight="0.5158501" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.48414984" sideWeight="0.8530198" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Coverage View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3707265" sideWeight="0.5158501" order="-1" side_tool="true" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.0908605" sideWeight="0.7146974" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -1406,7 +1643,7 @@
     <option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
     <option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
     <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" value="function literal as the last parameter supported&#10;added temporary and partial solution to global namespace polluting problem" />
+    <option name="LAST_COMMIT_MESSAGE" value="refactor and TODO clean-up" />
     <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -1419,11 +1656,6 @@
     <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
     <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
     <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
-    <MESSAGE value="bug fixes:&#10;1. Range standard implementation size property fixed, iteration order fixed&#10;2. System.println() without parameters fixed." />
-    <MESSAGE value="Changes to class sorter implementation." />
-    <MESSAGE value="added applet class." />
-    <MESSAGE value="implement better this aliasing, implement anti shadowing." />
-    <MESSAGE value="code clean up" />
     <MESSAGE value="hacks for some examples added&#10;tests added&#10;kotlin lib clean up" />
     <MESSAGE value="more koltin lib clean up." />
     <MESSAGE value="fixes in module structure.&#10;add workaround code for applet.&#10;add method needed for applet.&#10;" />
@@ -1444,6 +1676,11 @@
     <MESSAGE value="ongoing refactoring" />
     <MESSAGE value="refactoring call translator" />
     <MESSAGE value="function literal as the last parameter supported&#10;added temporary and partial solution to global namespace polluting problem" />
+    <MESSAGE value="Migrated to new main project code.&#10;Added test for named arguments.&#10;Minor refactoring changes." />
+    <MESSAGE value="Fixed bug where standard methods names may become obfuscated." />
+    <MESSAGE value="fixed arrayList tests." />
+    <MESSAGE value="KT-962: Function is called two times &#10;safecall expression now compute receiver only once." />
+    <MESSAGE value="refactor and TODO clean-up" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -1453,98 +1690,21 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/functionLiteralAsLastParameter.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="13" column="22" selection-start="198" selection-end="198" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/misc/cases/intRange.kt">
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/enclosingThis.kt">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/out/closureWithParameterAndBoxing.js">
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="19" column="29" selection-start="343" selection-end="343" vertical-scroll-proportion="0.0">
+        <state line="41" column="11" selection-start="1683" selection-end="1683" vertical-scroll-proportion="-7.5384617">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/misc/out/intRange.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="78" column="18" selection-start="1994" selection-end="1994" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/context/Namer.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="35" column="40" selection-start="1229" selection-end="1229" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/standardClasses/cases/arraysIterator.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="38" column="32" selection-start="1499" selection-end="1499" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/standardClasses/out/arraysIterator.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="18" column="33" selection-start="332" selection-end="332" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/StandardClassesTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="37" column="16" selection-start="844" selection-end="844" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/MiscTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="19" column="16" selection-start="475" selection-end="475" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="9" column="68" selection-start="392" selection-end="392" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ArrayListTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="38" column="16" selection-start="781" selection-end="781" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/jet/Library.jet">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/jet/Arrays.jet">
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/closureWithParameter.kt">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
@@ -1553,14 +1713,93 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/FunctionTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="77" column="16" selection-start="1894" selection-end="1894" vertical-scroll-proportion="0.0">
+        <state line="52" column="16" selection-start="1209" selection-end="1209" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/namedArguments.kt">
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/webDemoExamples1/out/ifAsExpression.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="14" column="15" selection-start="256" selection-end="256" vertical-scroll-proportion="0.3211876">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/kotlin_lib.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="364" column="17" selection-start="9155" selection-end="9155" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticHolder.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="21" column="0" selection-start="757" selection-end="757" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/K2JSTranslator.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="109" column="103" selection-start="4226" selection-end="4226" vertical-scroll-proportion="0.0">
+          <folding>
+            <element signature="e#2302#2311#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/function/cases/closureWithParameterAndBoxing.jet">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/webDemoExamples1/cases/nullChecks.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="5" column="16" selection-start="121" selection-end="121" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/webDemoExamples1/cases/ranges.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="6" column="12" selection-start="0" selection-end="864" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/webDemoExamples1/cases/ifAsExpression.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="3" column="33" selection-start="79" selection-end="79" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/expression/operation/cases/assign.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="6" column="1" selection-start="69" selection-end="69" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/WebDemoExamples1Test.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="48" column="16" selection-start="1231" selection-end="1231" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/stdlib/ktSrc/jssupport/JsSupport.jet">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/stdlib/ktSrc/jssupport/JsCollectionSupport.jet">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="11" column="16" selection-start="289" selection-end="289" vertical-scroll-proportion="0.40128756">
           <folding />
         </state>
       </provider>
@@ -1620,7 +1859,7 @@
       </state>
       <state key="ModuleStructureConfigurable.UI">
         <settings>
-          <last-edited>translator</last-edited>
+          <last-edited>cli</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
diff --git a/js/src/com/google/dart/compiler/util/AstUtil.java b/js/src/com/google/dart/compiler/util/AstUtil.java
index c47a04abcfd..a130ab44be8 100644
--- a/js/src/com/google/dart/compiler/util/AstUtil.java
+++ b/js/src/com/google/dart/compiler/util/AstUtil.java
@@ -290,7 +290,7 @@ public class AstUtil {
         return new JsBinaryOperation(JsBinaryOperator.OR, op1, op2);
     }
 
-    //TODO
+    //TODO refactor
     public static void setQualifier(JsExpression selector, JsExpression receiver) {
         if (selector instanceof JsInvocation) {
             setQualifier(((JsInvocation) selector).getQualifier(), receiver);
diff --git a/translator/src/org/jetbrains/k2js/K2JSTranslator.java b/translator/src/org/jetbrains/k2js/K2JSTranslator.java
index 41c01799e7a..41e5db39ab2 100644
--- a/translator/src/org/jetbrains/k2js/K2JSTranslator.java
+++ b/translator/src/org/jetbrains/k2js/K2JSTranslator.java
@@ -1,5 +1,6 @@
 package org.jetbrains.k2js;
 
+import com.google.common.base.Predicate;
 import com.google.dart.compiler.backend.js.ast.JsProgram;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.util.io.FileUtil;
@@ -17,6 +18,7 @@ import org.jetbrains.jet.lang.cfg.pseudocode.JetControlFlowDataTraceFactory;
 import org.jetbrains.jet.lang.psi.JetFile;
 import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
 import org.jetbrains.jet.lang.resolve.BindingContext;
+import org.jetbrains.jet.lang.resolve.java.AnalyzerFacade;
 import org.jetbrains.jet.plugin.JetLanguage;
 import org.jetbrains.k2js.generate.CodeGenerator;
 import org.jetbrains.k2js.translate.general.Translation;
@@ -25,18 +27,23 @@ import org.jetbrains.k2js.utils.GenerationUtils;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.StringTokenizer;
 
 import static org.jetbrains.k2js.translate.utils.BindingUtils.getNamespaceDescriptor;
 import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getNameForNamespace;
-import static org.jetbrains.k2js.utils.JetTestUtils.analyzeNamespace;
 
 /**
  * @author Pavel Talanov
  */
 public final class K2JSTranslator {
 
+    private static final List<String> LIB_FILE_NAMES = Arrays.asList(
+            "C:\\Dev\\Projects\\Kotlin\\jet\\stdlib\\ktSrc\\jssupport\\JsCollectionSupport.jet",
+            "C:\\Dev\\Projects\\Kotlin\\jet\\stdlib\\ktSrc\\jssupport\\JsSupport.jet"
+    );
+
     @NotNull
     private JetCoreEnvironment environment = new JetCoreEnvironment(new Disposable() {
 
@@ -55,9 +62,18 @@ public final class K2JSTranslator {
     public K2JSTranslator() {
     }
 
+    @NotNull
+    public List<JetFile> getJsSupportStdLib() {
+        List<JetFile> libFiles = new ArrayList<JetFile>();
+        for (String libFileName : LIB_FILE_NAMES) {
+            libFiles.add(loadPsiFile(libFileName));
+        }
+        return libFiles;
+    }
+
     public void translateFile(@NotNull String inputFile, @NotNull String outputFile) throws Exception {
         JetFile PsiFile = loadPsiFile(inputFile);
-        includeRtJar();
+        // includeRtJar();
         JsProgram program = generateProgram(PsiFile);
         CodeGenerator generator = new CodeGenerator();
         generator.generateToFile(program, new File(outputFile));
@@ -83,8 +99,21 @@ public final class K2JSTranslator {
     @NotNull
     private JsProgram generateProgram(@NotNull JetFile psiFile) {
 
-        bindingContext = analyzeNamespace(psiFile,
-                JetControlFlowDataTraceFactory.EMPTY);
+//        bindingContext = analyzeNamespace(psiFile,
+//                JetControlFlowDataTraceFactory.EMPTY);
+        List<JetFile> files = getJsSupportStdLib();
+        files.add(psiFile);
+        bindingContext = AnalyzerFacade.analyzeFilesWithJavaIntegration(psiFile.getProject(), files, new Predicate<PsiFile>() {
+            @Override
+            public boolean apply(@Nullable PsiFile file) {
+                for (String libFileName : LIB_FILE_NAMES) {
+                    if (libFileName.contains(file.getName().substring(0, file.getName().lastIndexOf('.')))) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        }, JetControlFlowDataTraceFactory.EMPTY);
         assert bindingContext != null;
         AnalyzingUtils.checkForSyntacticErrors(psiFile);
         AnalyzingUtils.throwExceptionOnErrors(bindingContext);
diff --git a/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java b/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java
index e343bd8794d..b92bb4f2418 100644
--- a/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java
+++ b/translator/src/org/jetbrains/k2js/translate/context/StandardClasses.java
@@ -19,6 +19,7 @@ import static org.jetbrains.k2js.translate.utils.DescriptorUtils.*;
 /**
  * @author Pavel Talanov
  */
+//TODO: REFACTOR FFS
 public final class StandardClasses {
 
     //TODO: move declaration code to some kind of builder
@@ -31,22 +32,32 @@ public final class StandardClasses {
         declareRange(standardClasses);
         declareString(standardClasses);
         declareJavaArrayList(standardClasses);
-        declareJavaSystem(standardClasses);
-        declareJavaInteger(standardClasses);
-        declareJavaUtilIterator(standardClasses);
+        declareTopLevelFunctions(standardClasses);
+        declareInteger(standardClasses);
         return standardClasses;
     }
 
-    private static void declareJavaUtilIterator(@NotNull StandardClasses standardClasses) {
-        String iteratorFQName = "<java_root>.java.util.Iterator";
-        standardClasses.declareStandardTopLevelObject(iteratorFQName, "Iterator");
-        declareMethods(standardClasses, iteratorFQName, "next", "hasNext");
+    //TODO: refactor
+    private static void declareTopLevelFunctions(@NotNull StandardClasses standardClasses) {
+        String parseIntFQName = "js.parseInt";
+        standardClasses.declareStandardTopLevelObject(parseIntFQName, "parseInt");
+        String printlnFQName = "js.println";
+        standardClasses.declareStandardTopLevelObject(printlnFQName, "println");
+        String printFQName = "js.print";
+        standardClasses.declareStandardTopLevelObject(printFQName, "print");
     }
 
+    private static void declareInteger(@NotNull StandardClasses standardClasses) {
+        String integerFQName = "Integer";
+        standardClasses.declareStandardTopLevelObject(integerFQName, "Integer");
+        standardClasses.declareStandardInnerDeclaration(integerFQName, "parseInt", "parseInt");
+    }
+
+
     private static void declareString(@NotNull StandardClasses standardClasses) {
         String stringFQName = "jet.String";
         standardClasses.declareStandardTopLevelObject(stringFQName, "String");
-        standardClasses.declareStandardInnerDeclaration(stringFQName, "length", "length");
+        declareReadonlyProperties(standardClasses, stringFQName, "length");
     }
 
     //TODO: duplication
@@ -55,27 +66,12 @@ public final class StandardClasses {
         standardClasses.declareStandardTopLevelObject(intRangeFQName, "NumberRange");
         standardClasses.declareStandardInnerDeclaration(intRangeFQName, "<init>", "NumberRange");
         declareMethods(standardClasses, intRangeFQName, "iterator", "contains");
-        declareProperties(standardClasses, intRangeFQName, "start", "size", "end", "reversed");
+        declareReadonlyProperties(standardClasses, intRangeFQName, "start", "size", "end", "reversed");
     }
 
-    private static void declareJavaInteger(@NotNull StandardClasses standardClasses) {
-        String integerFQName = "<java_root>.java.lang.Integer";
-        standardClasses.declareStandardTopLevelObject(integerFQName, "Integer");
-        declareMethods(standardClasses, integerFQName, "parseInt");
-    }
-
-    private static void declareJavaSystem(@NotNull StandardClasses standardClasses) {
-        String systemFQName = "<java_root>.java.lang.System";
-        standardClasses.declareStandardTopLevelObject(systemFQName, "System");
-        declareMethods(standardClasses, systemFQName, "out");
-        String printStreamFQName = "<java_root>.java.io.PrintStream";
-        //TODO:
-        standardClasses.declareStandardTopLevelObject(printStreamFQName, "ErrorName");
-        declareMethods(standardClasses, printStreamFQName, "print", "println");
-    }
 
     private static void declareJavaArrayList(@NotNull StandardClasses standardClasses) {
-        String arrayListFQName = "<java_root>.java.util.ArrayList";
+        String arrayListFQName = "java.util.ArrayList";
         standardClasses.declareStandardTopLevelObject(arrayListFQName, "ArrayList");
         standardClasses.declareStandardInnerDeclaration(arrayListFQName, "<init>", "ArrayList");
         declareMethods(standardClasses, arrayListFQName, "size", "add", "get",
@@ -113,12 +109,16 @@ public final class StandardClasses {
         }
     }
 
-    private static void declareProperties(@NotNull StandardClasses standardClasses,
-                                          @NotNull String classFQName,
-                                          @NotNull String... propertyNames) {
+    private static void declareReadonlyProperties(@NotNull StandardClasses standardClasses,
+                                                  @NotNull String classFQName,
+                                                  @NotNull String... propertyNames) {
         for (String propertyName : propertyNames) {
             standardClasses.declareStandardInnerDeclaration(classFQName,
-                    propertyName, Namer.getNameForGetter(propertyName));
+                    propertyName, propertyName);
+            //TODO: provide general and concise way to declare
+//            standardClasses.declareStandardInnerDeclaration(classFQName,
+//                    "get-" + propertyName, propertyName);
+
         }
     }
 
diff --git a/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java b/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java
index 9a0c4594487..cf5fca0da83 100644
--- a/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java
+++ b/translator/src/org/jetbrains/k2js/translate/intrinsic/Intrinsics.java
@@ -2,16 +2,14 @@ package org.jetbrains.k2js.translate.intrinsic;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
-import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
-import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorVisitor;
-import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
+import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.types.JetStandardLibrary;
 import org.jetbrains.jet.lexer.JetToken;
 import org.jetbrains.k2js.translate.intrinsic.array.ArrayGetIntrinsic;
 import org.jetbrains.k2js.translate.intrinsic.array.ArrayNullConstructorIntrinsic;
 import org.jetbrains.k2js.translate.intrinsic.array.ArraySetIntrinsic;
 import org.jetbrains.k2js.translate.intrinsic.primitive.*;
+import org.jetbrains.k2js.translate.intrinsic.string.LengthIntrinsic;
 import org.jetbrains.k2js.translate.operation.OperatorTable;
 import org.jetbrains.k2js.translate.utils.DescriptorUtils;
 
@@ -20,6 +18,7 @@ import java.util.Map;
 
 import static org.jetbrains.jet.lang.types.expressions.OperatorConventions.*;
 import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getFunctionByName;
+import static org.jetbrains.k2js.translate.utils.DescriptorUtils.getPropertyByName;
 
 /**
  * @author Pavel Talanov
@@ -48,10 +47,17 @@ public final class Intrinsics {
     private Intrinsics(@NotNull JetStandardLibrary library) {
         this.library = library;
         declareOperatorIntrinsics();
+        declareStringIntrinsics();
         //TODO: array intrinsic are under consideration
         //declareArrayIntrinsics();
     }
 
+    private void declareStringIntrinsics() {
+        PropertyDescriptor lengthProperty =
+                getPropertyByName(library.getString().getDefaultType().getMemberScope(), "length");
+        functionIntrinsics.put(lengthProperty.getGetter(), LengthIntrinsic.INSTANCE);
+    }
+
     private void declareOperatorIntrinsics() {
         IntrinsicDeclarationVisitor visitor = new IntrinsicDeclarationVisitor();
         for (DeclarationDescriptor descriptor : library.getLibraryScope().getAllDescriptors()) {
@@ -70,6 +76,7 @@ public final class Intrinsics {
 
         FunctionDescriptor setFunction = getFunctionByName(library.getArray(), "set");
         functionIntrinsics.put(setFunction, ArraySetIntrinsic.INSTANCE);
+
     }
 
     public boolean isIntrinsic(@NotNull DeclarationDescriptor descriptor) {
diff --git a/translator/src/org/jetbrains/k2js/translate/intrinsic/array/IntrinsicArrayUtils.java b/translator/src/org/jetbrains/k2js/translate/intrinsic/array/IntrinsicArrayUtils.java
index 620d2ef7dff..dab49e8ef57 100644
--- a/translator/src/org/jetbrains/k2js/translate/intrinsic/array/IntrinsicArrayUtils.java
+++ b/translator/src/org/jetbrains/k2js/translate/intrinsic/array/IntrinsicArrayUtils.java
@@ -36,6 +36,6 @@ public final class IntrinsicArrayUtils {
     @NotNull
     private static JsExpression throwOutOfBoundsException() {
         //TODO: think about exception
-        return new JsThisRef();
+        return AstUtil.newQualifiedNameRef("ErrorName");
     }
 }
diff --git a/translator/src/org/jetbrains/k2js/translate/intrinsic/string/LengthIntrinsic.java b/translator/src/org/jetbrains/k2js/translate/intrinsic/string/LengthIntrinsic.java
new file mode 100644
index 00000000000..5e731d7d76a
--- /dev/null
+++ b/translator/src/org/jetbrains/k2js/translate/intrinsic/string/LengthIntrinsic.java
@@ -0,0 +1,30 @@
+package org.jetbrains.k2js.translate.intrinsic.string;
+
+
+import com.google.dart.compiler.backend.js.ast.JsExpression;
+import com.google.dart.compiler.backend.js.ast.JsNameRef;
+import com.google.dart.compiler.util.AstUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.k2js.translate.context.TranslationContext;
+import org.jetbrains.k2js.translate.intrinsic.FunctionIntrinsic;
+
+import java.util.List;
+
+/**
+ * @author Pavel Talanov
+ */
+public enum LengthIntrinsic implements FunctionIntrinsic {
+
+    INSTANCE;
+
+    @NotNull
+    @Override
+    public JsExpression apply(@NotNull JsExpression receiver, @NotNull List<JsExpression> arguments,
+                              @NotNull TranslationContext context) {
+        assert arguments.isEmpty() : "Length expression must have zero arguments.";
+        //TODO: provide better way
+        JsNameRef lengthProperty = AstUtil.newQualifiedNameRef("length");
+        AstUtil.setQualifier(lengthProperty, receiver);
+        return lengthProperty;
+    }
+}
\ No newline at end of file
diff --git a/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java b/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java
index 883934d8acd..a4bbf3bedab 100644
--- a/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/reference/CallTranslator.java
@@ -126,9 +126,16 @@ public final class CallTranslator extends AbstractTranslator {
     }
 
     @NotNull
-    public static JsExpression translate(@NotNull JsExpression receiver, @NotNull CallableDescriptor functionDescriptor,
+    public static JsExpression translate(@Nullable JsExpression receiver, @NotNull CallableDescriptor functionDescriptor,
                                          @NotNull TranslationContext context) {
-        return (new CallTranslator(receiver, Collections.<JsExpression>emptyList(), functionDescriptor, context)).translate();
+        return translate(receiver, Collections.<JsExpression>emptyList(), functionDescriptor, context);
+    }
+
+    @NotNull
+    public static JsExpression translate(@Nullable JsExpression receiver, @NotNull List<JsExpression> arguments,
+                                         @NotNull CallableDescriptor functionDescriptor,
+                                         @NotNull TranslationContext context) {
+        return (new CallTranslator(receiver, arguments, functionDescriptor, context)).translate();
     }
 
     @NotNull
diff --git a/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java b/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java
index 9134489f70a..104fe0c5bb2 100644
--- a/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java
@@ -1,8 +1,6 @@
 package org.jetbrains.k2js.translate.reference;
 
 import com.google.dart.compiler.backend.js.ast.JsExpression;
-import com.google.dart.compiler.backend.js.ast.JsInvocation;
-import com.google.dart.compiler.backend.js.ast.JsName;
 import com.google.dart.compiler.backend.js.ast.JsNameRef;
 import com.google.dart.compiler.util.AstUtil;
 import org.jetbrains.annotations.NotNull;
@@ -14,10 +12,11 @@ import org.jetbrains.jet.lang.descriptors.PropertySetterDescriptor;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.psi.JetQualifiedExpression;
 import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
-import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.k2js.translate.context.TranslationContext;
 import org.jetbrains.k2js.translate.general.Translation;
 
+import java.util.Arrays;
+
 import static org.jetbrains.k2js.translate.utils.BindingUtils.getDescriptorForReferenceExpression;
 import static org.jetbrains.k2js.translate.utils.PsiUtils.getSelectorAsSimpleName;
 import static org.jetbrains.k2js.translate.utils.PsiUtils.isBackingFieldReference;
@@ -32,7 +31,6 @@ public final class PropertyAccessTranslator extends AccessTranslator {
     private static final String MESSAGE = "Cannot be accessor call. Use canBeProperty*Call to ensure this method " +
             "can be called safely.";
 
-
     @NotNull
     private static PropertyDescriptor getPropertyDescriptor(@NotNull JetSimpleNameExpression expression,
                                                             @NotNull TranslationContext context) {
@@ -42,13 +40,6 @@ public final class PropertyAccessTranslator extends AccessTranslator {
         return (PropertyDescriptor) descriptor;
     }
 
-    @NotNull
-    public static JsExpression translateAsPropertyGetterCall(@NotNull JetQualifiedExpression expression,
-                                                             @NotNull TranslationContext context) {
-        return (newInstance(expression, context))
-                .translateAsGet();
-    }
-
     @NotNull
     public static JsExpression translateAsPropertyGetterCall(@NotNull PropertyDescriptor descriptor,
                                                              @NotNull TranslationContext context) {
@@ -163,15 +154,7 @@ public final class PropertyAccessTranslator extends AccessTranslator {
 
     @NotNull
     private JsExpression getterCall() {
-        //TODO: HACK to make standard example work
-        if (DescriptorUtils.getFQName(propertyDescriptor).equals("jet.String.length")) {
-            JsNameRef lengthMethodReference = AstUtil.newQualifiedNameRef("length");
-            AstUtil.setQualifier(lengthMethodReference, translateQualifier());
-            return lengthMethodReference;
-        }
-
-        JsName getterName = getGetterName();
-        return qualifiedAccessorInvocation(getterName);
+        return CallTranslator.translate(translateQualifier(), getGetterDescriptor(), context());
     }
 
     @Override
@@ -186,10 +169,7 @@ public final class PropertyAccessTranslator extends AccessTranslator {
 
     @NotNull
     private JsExpression setterCall(@NotNull JsExpression toSetTo) {
-        JsName setterName = getSetterName();
-        JsInvocation setterCall = qualifiedAccessorInvocation(setterName);
-        setterCall.getArguments().add(toSetTo);
-        return setterCall;
+        return CallTranslator.translate(translateQualifier(), Arrays.asList(toSetTo), getSetterDescriptor(), context());
     }
 
     @NotNull
@@ -198,13 +178,6 @@ public final class PropertyAccessTranslator extends AccessTranslator {
         return AstUtil.newAssignment(backingFieldReference, toSetTo);
     }
 
-    @NotNull
-    private JsInvocation qualifiedAccessorInvocation(@NotNull JsName accessorName) {
-        JsNameRef accessorReference = accessorName.makeRef();
-        AstUtil.setQualifier(accessorReference, translateQualifier());
-        return AstUtil.newInvocation(accessorReference);
-    }
-
     @NotNull
     private JsExpression translateQualifier() {
         if (qualifier != null) {
@@ -215,7 +188,6 @@ public final class PropertyAccessTranslator extends AccessTranslator {
         return implicitReceiver;
     }
 
-
     @NotNull
     private static JetSimpleNameExpression getNotNullSelector(@NotNull JetQualifiedExpression qualifiedExpression) {
         JetSimpleNameExpression selectorExpression = getSelectorAsSimpleName(qualifiedExpression);
@@ -223,18 +195,6 @@ public final class PropertyAccessTranslator extends AccessTranslator {
         return selectorExpression;
     }
 
-    @NotNull
-    private JsName getGetterName() {
-        //TODO: hack alert. properties for standard objects that do not have their implementation
-        // do not have getters and thus this workaround is needed
-        if (context().isStandardObject(propertyDescriptor)) {
-            return context().getNameForStandardObject(propertyDescriptor);
-        }
-
-        PropertyGetterDescriptor getter = getGetterDescriptor();
-        return context().getNameForDescriptor(getter);
-    }
-
     @NotNull
     private PropertyGetterDescriptor getGetterDescriptor() {
         PropertyGetterDescriptor getter = propertyDescriptor.getGetter();
@@ -242,12 +202,6 @@ public final class PropertyAccessTranslator extends AccessTranslator {
         return getter;
     }
 
-    @NotNull
-    private JsName getSetterName() {
-        PropertySetterDescriptor setter = getSetterDescriptor();
-        return context().getNameForDescriptor(setter);
-    }
-
     @NotNull
     private PropertySetterDescriptor getSetterDescriptor() {
         PropertySetterDescriptor setter = propertyDescriptor.getSetter();
diff --git a/translator/test/org/jetbrains/k2js/test/FunctionTest.java b/translator/test/org/jetbrains/k2js/test/FunctionTest.java
index 9882a4ea42c..133a6e1fa65 100644
--- a/translator/test/org/jetbrains/k2js/test/FunctionTest.java
+++ b/translator/test/org/jetbrains/k2js/test/FunctionTest.java
@@ -46,7 +46,7 @@ public class FunctionTest extends AbstractExpressionTest {
 
     @Test
     public void closureWithParameter() throws Exception {
-        testFooBoxIsOk("closureWithParameter.jet");
+        testFooBoxIsOk("closureWithParameter.kt");
     }
 
     @Test
@@ -56,7 +56,7 @@ public class FunctionTest extends AbstractExpressionTest {
 
     @Test
     public void enclosingThis() throws Exception {
-        testFunctionOutput("enclosingThis.jet", "Anonymous", "box", "OK");
+        testFunctionOutput("enclosingThis.kt", "Anonymous", "box", "OK");
     }
 
     @Test
diff --git a/translator/test/org/jetbrains/k2js/test/MiscTest.java b/translator/test/org/jetbrains/k2js/test/MiscTest.java
index 3ab5c7b0ef8..105ccd357e5 100644
--- a/translator/test/org/jetbrains/k2js/test/MiscTest.java
+++ b/translator/test/org/jetbrains/k2js/test/MiscTest.java
@@ -32,10 +32,4 @@ public class MiscTest extends AbstractExpressionTest {
     public void safecallComputesExpressionOnlyOnce() throws Exception {
         testFooBoxIsTrue("safecallComputesExpressionOnlyOnce.kt");
     }
-
-    @Test
-    public void KT962() throws Exception {
-        checkOutput("KT-962.kt", "stdout\n" +
-                "Hello, world!\n");
-    }
 }
diff --git a/translator/test/org/jetbrains/k2js/test/OperationTest.java b/translator/test/org/jetbrains/k2js/test/OperationTest.java
index 967003ba948..af8225b1a0f 100644
--- a/translator/test/org/jetbrains/k2js/test/OperationTest.java
+++ b/translator/test/org/jetbrains/k2js/test/OperationTest.java
@@ -35,7 +35,7 @@ public class OperationTest extends AbstractExpressionTest {
 
     @Test
     public void assign() throws Exception {
-        testFunctionOutput("assign.jet", "foo", "f", 2.0);
+        testFunctionOutput("assign.kt", "foo", "f", 2.0);
     }
 
     @Test
diff --git a/translator/test/org/jetbrains/k2js/test/SystemTest.java b/translator/test/org/jetbrains/k2js/test/SystemTest.java
deleted file mode 100644
index c0c5c02e77a..00000000000
--- a/translator/test/org/jetbrains/k2js/test/SystemTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.jetbrains.k2js.test;
-
-import org.junit.Test;
-
-/**
- * @author Pavel Talanov
- */
-public final class SystemTest extends JavaClassesTest {
-
-    final private static String MAIN = "system/";
-
-    @Override
-    protected String mainDirectory() {
-        return MAIN;
-    }
-
-    @Test
-    public void systemPrint() throws Exception {
-        checkOutput("print.kt", "Hello, world!");
-    }
-
-    @Test
-    public void systemPrintln() throws Exception {
-        checkOutput("println.kt", "Hello, world!\n3\n\n");
-    }
-}
diff --git a/translator/test/org/jetbrains/k2js/test/TranslationTest.java b/translator/test/org/jetbrains/k2js/test/TranslationTest.java
index a27a5112d3f..27c5e631b17 100644
--- a/translator/test/org/jetbrains/k2js/test/TranslationTest.java
+++ b/translator/test/org/jetbrains/k2js/test/TranslationTest.java
@@ -4,7 +4,13 @@ import org.jetbrains.k2js.K2JSTranslator;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileReader;
+import java.io.IOException;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.List;
 
@@ -18,6 +24,7 @@ public abstract class TranslationTest {
     private static final String CASES = "cases/";
     private static final String OUT = "out/";
     private static final String KOTLIN_JS_LIB = TEST_FILES + "kotlin_lib.js";
+    private static final String EXPECTED = "expected/";
 
     protected abstract String mainDirectory();
 
@@ -49,6 +56,14 @@ public abstract class TranslationTest {
         return testFilesPath() + casesDirectoryName();
     }
 
+    private String getExpectedPath() {
+        return testFilesPath() + expectedDirectoryName();
+    }
+
+    private String expectedDirectoryName() {
+        return EXPECTED;
+    }
+
     protected void testFunctionOutput(String filename, String namespaceName,
                                       String functionName, Object expectedResult) throws Exception {
         translateFile(filename);
@@ -81,6 +96,10 @@ public abstract class TranslationTest {
         return getInputFilePath(filename);
     }
 
+    private String expected(String testName) {
+        return getExpectedPath() + testName + ".out";
+    }
+
     protected void runFileWithRhino(String inputFile, Context context, Scriptable scope) throws Exception {
         FileReader reader = new FileReader(inputFile);
         context.evaluateReader(scope, reader, inputFile, 1, null);
@@ -111,4 +130,21 @@ public abstract class TranslationTest {
                 new RhinoSystemOutputChecker(expectedResult, Arrays.asList(args)));
     }
 
+    protected void testWithMain(String testName, String testId, String... args) throws Exception {
+        checkOutput(testName + ".kt", readFile(expected(testName + testId)), args);
+    }
+
+    private static String readFile(String path) throws IOException {
+        FileInputStream stream = new FileInputStream(new File(path));
+        try {
+            FileChannel fc = stream.getChannel();
+            MappedByteBuffer bb = fc.map(FileChannel.MapMode.READ_ONLY, 0, fc.size());
+            /* Instead of using default, pass in a decoder. */
+            return Charset.defaultCharset().decode(bb).toString();
+        } finally {
+            stream.close();
+        }
+    }
+
+
 }
diff --git a/translator/test/org/jetbrains/k2js/test/WebDemoExamplesTest.java b/translator/test/org/jetbrains/k2js/test/WebDemoExamples1Test.java
similarity index 94%
rename from translator/test/org/jetbrains/k2js/test/WebDemoExamplesTest.java
rename to translator/test/org/jetbrains/k2js/test/WebDemoExamples1Test.java
index 9b36d134581..a4162231c21 100644
--- a/translator/test/org/jetbrains/k2js/test/WebDemoExamplesTest.java
+++ b/translator/test/org/jetbrains/k2js/test/WebDemoExamples1Test.java
@@ -5,9 +5,9 @@ import org.junit.Test;
 /**
  * @author Pavel Talanov
  */
-public final class WebDemoExamplesTest extends TranslationTest {
+public final class WebDemoExamples1Test extends TranslationTest {
 
-    final private static String MAIN = "webDemoExamples/";
+    final private static String MAIN = "webDemoExamples1/";
 
     @Override
     protected String mainDirectory() {
diff --git a/translator/test/org/jetbrains/k2js/test/WebDemoExamples2Test.java b/translator/test/org/jetbrains/k2js/test/WebDemoExamples2Test.java
new file mode 100644
index 00000000000..c6c52beee82
--- /dev/null
+++ b/translator/test/org/jetbrains/k2js/test/WebDemoExamples2Test.java
@@ -0,0 +1,23 @@
+package org.jetbrains.k2js.test;
+
+import org.junit.Test;
+
+/**
+ * @author Pavel Talanov
+ */
+public final class WebDemoExamples2Test extends TranslationTest {
+
+    final private static String MAIN = "webDemoExamples2/";
+
+    @Override
+    protected String mainDirectory() {
+        return MAIN;
+    }
+
+    @Test
+    public void bottles() throws Exception {
+        testWithMain("bottles", "");
+    }
+
+
+}
diff --git a/translator/testFiles/examples/sortedTests/unsupported/basicproperty.jet b/translator/testFiles/examples/sortedTests/unsupported/basicproperty.jet
index 196ed3f40b0..ae1cfa5618b 100644
--- a/translator/testFiles/examples/sortedTests/unsupported/basicproperty.jet
+++ b/translator/testFiles/examples/sortedTests/unsupported/basicproperty.jet
@@ -16,7 +16,7 @@ class N() : M() {
 
 fun box(): String {
     val n = N()
-    System.out?.println("a: " + n.a + " b: " + n.b + " superb: " + n.superb)
+    println("a: " + n.a + " b: " + n.b + " superb: " + n.superb)
     if (n.b == 3 && n.a == 4 && n.superb == 3) return "OK";
     return "fail";
 }
\ No newline at end of file
diff --git a/translator/testFiles/examples/sortedTests/unsupported/traitproperty.jet b/translator/testFiles/examples/sortedTests/unsupported/traitproperty.jet
index 962f71c5dc9..715d8d73d8b 100644
--- a/translator/testFiles/examples/sortedTests/unsupported/traitproperty.jet
+++ b/translator/testFiles/examples/sortedTests/unsupported/traitproperty.jet
@@ -23,7 +23,7 @@ class N() : M {
 
 fun box(): String {
     val n = N()
-    System.out?.println("a: " + n.a + " b: " + n.b + " superb: " + n.superb)
+    println("a: " + n.a + " b: " + n.b + " superb: " + n.superb)
     if (n.b == 3 && n.a == 4 && n.superb == 3) return "OK";
     return "fail";
 }
\ No newline at end of file
diff --git a/translator/testFiles/expression/function/cases/KT-921.kt b/translator/testFiles/expression/function/cases/KT-921.kt
index 05b388369f7..7c41a0fc0c0 100644
--- a/translator/testFiles/expression/function/cases/KT-921.kt
+++ b/translator/testFiles/expression/function/cases/KT-921.kt
@@ -46,8 +46,8 @@ fun lifetime(body: (Lifetime)->Unit)
 fun<T> Dump(items:ArrayList<T>)
 {
   for(item in items)
-   System.out?.print(item.toString() + ", ")
-  System.out?.println()
+   print(item.toString() + ", ")
+  println()
 }
 
 fun main(args:Array<String>)
diff --git a/translator/testFiles/expression/function/cases/closureWithParameter.jet b/translator/testFiles/expression/function/cases/closureWithParameter.kt
similarity index 100%
rename from translator/testFiles/expression/function/cases/closureWithParameter.jet
rename to translator/testFiles/expression/function/cases/closureWithParameter.kt
diff --git a/translator/testFiles/expression/function/cases/enclosingThis.jet b/translator/testFiles/expression/function/cases/enclosingThis.kt
similarity index 100%
rename from translator/testFiles/expression/function/cases/enclosingThis.jet
rename to translator/testFiles/expression/function/cases/enclosingThis.kt
diff --git a/translator/testFiles/expression/misc/cases/KT-962.kt b/translator/testFiles/expression/misc/cases/KT-962.kt
index 9f435bdf9a4..c922a8c4136 100644
--- a/translator/testFiles/expression/misc/cases/KT-962.kt
+++ b/translator/testFiles/expression/misc/cases/KT-962.kt
@@ -1,5 +1,7 @@
+iimport
+
 fun stdout(): java.io.PrintStream? {
-  System.out?.println("stdout")
+  println("stdout")
   return System.out
 }
 
diff --git a/translator/testFiles/expression/misc/cases/intRange.kt b/translator/testFiles/expression/misc/cases/intRange.kt
index 668b26ae1ea..73d578db692 100644
--- a/translator/testFiles/expression/misc/cases/intRange.kt
+++ b/translator/testFiles/expression/misc/cases/intRange.kt
@@ -1,5 +1,7 @@
 package foo
 
+import js.*
+
 class RangeIterator(val start : Int, var count : Int, val reversed : Boolean) {
 
     var i = start
@@ -59,7 +61,7 @@ fun testRange() : Boolean {
         sum += i;
     }
     for (i in oneToFive) {
-        System.out?.print(i)
+        print(i)
     }
 
     if (sum != 10) return false;
@@ -70,7 +72,7 @@ fun testRange() : Boolean {
 
 fun testReversedRange() : Boolean {
 
-    System.out?.println("Testing reversed range.");
+    println("Testing reversed range.");
 
     val tenToFive = NumberRange(10, 5, true);
 
@@ -89,7 +91,7 @@ fun testReversedRange() : Boolean {
     if (!(tenToFive.end == 6)) return false;
 
     for (i in tenToFive) {
-        System.out?.println(i)
+        println(i)
     }
 
 
@@ -106,5 +108,5 @@ fun testReversedRange() : Boolean {
 }
 
 fun main(args : Array<String>) {
-    System.out?.println(box())
+    println(box())
 }
\ No newline at end of file
diff --git a/translator/testFiles/expression/operation/cases/assign.jet b/translator/testFiles/expression/operation/cases/assign.kt
similarity index 100%
rename from translator/testFiles/expression/operation/cases/assign.jet
rename to translator/testFiles/expression/operation/cases/assign.kt
diff --git a/translator/testFiles/java/system/cases/print.kt b/translator/testFiles/java/system/cases/print.kt
deleted file mode 100644
index 4913966a4d2..00000000000
--- a/translator/testFiles/java/system/cases/print.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args : Array<String>) {
-    System.out?.print("Hello, world!");
-}
diff --git a/translator/testFiles/java/system/cases/println.kt b/translator/testFiles/java/system/cases/println.kt
deleted file mode 100644
index 3881178af15..00000000000
--- a/translator/testFiles/java/system/cases/println.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-fun main(args : Array<String>) {
-    System.out?.println("Hello, world!");
-    System.out?.println(3);
-    System.out?.println();
-}
diff --git a/translator/testFiles/kotlin_lib.js b/translator/testFiles/kotlin_lib.js
index e62cd2728a6..03a2c5a98bf 100644
--- a/translator/testFiles/kotlin_lib.js
+++ b/translator/testFiles/kotlin_lib.js
@@ -280,10 +280,14 @@ Kotlin.Array = Class.create({
     size:function () {
         return this.array.length;
     },
+    //TODO: remove duplicated methods
+    get_size:function () {
+        return this.array.length;
+    },
     iterator:function () {
         return new Kotlin.ArrayIterator(this);
     },
-    indices:function () {
+    get_indices:function () {
         return new Kotlin.NumberRange(0, this.size(), false);
     }
 });
@@ -358,15 +362,11 @@ Kotlin.ArrayIterator = Class.create({
     }
 });
 
-Kotlin.Integer = function () {
-
-    return {
-        parseInt:function (str) {
-            return parseInt(str);
-        }
+Kotlin.parseInt =
+    function (str) {
+        return parseInt(str);
     }
-
-}();
+;
 
 Kotlin.System = function () {
     var output = "";
@@ -397,6 +397,14 @@ Kotlin.System = function () {
     };
 }();
 
+Kotlin.println = function (s) {
+    Kotlin.System.out().println(s);
+}
+
+Kotlin.print = function (s) {
+    Kotlin.System.out().print(s);
+}
+
 Kotlin.AbstractFunctionInvokationError = Class.create();
 
 Kotlin.Iterator = Class.create({
@@ -420,6 +428,9 @@ Kotlin.ArrayIterator = Class.create(Kotlin.Iterator, {
     },
     hasNext:function () {
         return (this.array.size() > this.index);
+    },
+    get_hasNext:function () {
+        return this.hasNext();
     }
 });
 
@@ -453,6 +464,8 @@ Kotlin.RangeIterator = Kotlin.Class.create(Kotlin.Iterator, {
         }
     }, hasNext:function () {
         return this.get_count() > 0;
+    }, get_hasNext:function () {
+        return this.hasNext();
     }
 });
 
diff --git a/translator/testFiles/range/cases/explicitRange.kt b/translator/testFiles/range/cases/explicitRange.kt
index 0e9b843d3d2..3c8595027e3 100644
--- a/translator/testFiles/range/cases/explicitRange.kt
+++ b/translator/testFiles/range/cases/explicitRange.kt
@@ -1,5 +1,7 @@
 package foo
 
+import js.*
+
 fun box() : Boolean {
 
     var oneToFive = IntRange(1, 4)
@@ -21,7 +23,7 @@ fun box() : Boolean {
         sum += i;
     }
     for (i in oneToFive) {
-        System.out?.print(i)
+        print(i)
     }
 
     if (sum != 10) return false;
diff --git a/translator/testFiles/range/cases/intInRange.kt b/translator/testFiles/range/cases/intInRange.kt
index 46f7c542016..95959d09eb2 100644
--- a/translator/testFiles/range/cases/intInRange.kt
+++ b/translator/testFiles/range/cases/intInRange.kt
@@ -1,5 +1,7 @@
 package foo
 
+
+
 fun box() : Boolean {
 
     if (1 in -2..0) return false;
diff --git a/translator/testFiles/range/cases/rangeSugarSyntax.kt b/translator/testFiles/range/cases/rangeSugarSyntax.kt
index 8ea37e12359..d300924fe91 100644
--- a/translator/testFiles/range/cases/rangeSugarSyntax.kt
+++ b/translator/testFiles/range/cases/rangeSugarSyntax.kt
@@ -1,5 +1,7 @@
 package foo
 
+import js.*
+
 fun box() : Boolean {
 
     var oneToFive = 1..5
@@ -21,7 +23,7 @@ fun box() : Boolean {
         sum += i;
     }
     for (i in oneToFive) {
-        System.out?.print(i)
+        print(i)
     }
 
     if (sum != 15) return false;
diff --git a/translator/testFiles/webDemoExamples/cases/forLoop.kt b/translator/testFiles/webDemoExamples/cases/forLoop.kt
deleted file mode 100644
index 5c8cf6ce528..00000000000
--- a/translator/testFiles/webDemoExamples/cases/forLoop.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-fun main(args : Array<String>) {
-  for (arg in args)
-    System.out?.println(arg)
-
-  // or
-  System.out?.println()
-  for (i in args.indices)
-    System.out?.println(args[i])
-}
diff --git a/translator/testFiles/webDemoExamples/cases/ifAsExpression.kt b/translator/testFiles/webDemoExamples/cases/ifAsExpression.kt
deleted file mode 100644
index bb8b9c0573c..00000000000
--- a/translator/testFiles/webDemoExamples/cases/ifAsExpression.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-fun main(args : Array<String>) {
-  System.out?.println(max(Integer.parseInt(args[0]), Integer.parseInt(args[1])))
-}
-
-fun max(a : Int, b : Int) = if (a > b) a else b
\ No newline at end of file
diff --git a/translator/testFiles/webDemoExamples/cases/isCheck.kt b/translator/testFiles/webDemoExamples/cases/isCheck.kt
deleted file mode 100644
index ace651c385c..00000000000
--- a/translator/testFiles/webDemoExamples/cases/isCheck.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-fun main(args : Array<String>) {
-    System.out?.println(getStringLength("aaa"))
-    System.out?.println(getStringLength(1))
-}
-
-fun getStringLength(obj : Any) : Int? {
-    if (obj is String)
-        return obj.length // no cast to String is needed
-    return null
-}
\ No newline at end of file
diff --git a/translator/testFiles/webDemoExamples/cases/multiLanguageHello.kt b/translator/testFiles/webDemoExamples/cases/multiLanguageHello.kt
deleted file mode 100644
index 0038a5e12c0..00000000000
--- a/translator/testFiles/webDemoExamples/cases/multiLanguageHello.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-fun main(args : Array<String>) {
-  val language = if (args.size == 0) "EN" else args[0]
-  System.out?.println(when (language) {
-    "EN" -> "Hello!"
-    "FR" -> "Salut!"
-    "IT" -> "Ciao!"
-    else -> "Sorry, I can't greet you in $language yet"
-  })
-}
diff --git a/translator/testFiles/webDemoExamples/cases/nullChecks.kt b/translator/testFiles/webDemoExamples/cases/nullChecks.kt
deleted file mode 100644
index ebfac5371a5..00000000000
--- a/translator/testFiles/webDemoExamples/cases/nullChecks.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-// Return null if str does not hold a number
-fun parseInt(str : String) : Int? {
-    try{
-        return  Integer.parseInt(str)
-    } catch (e: NumberFormatException) {
-        System.out?.println("One of argument isn't Int")
-    }
-    return null
-}
-
-fun main(args : Array<String>) {
-    if (args.size < 2) {
-        System.out?.print("No number supplied");
-    } else {
-        val x = parseInt(args[0])
-        val y = parseInt(args[1])
-
-        // We cannot say 'x * y' now because they may hold nulls
-        if (x != null && y != null) {
-            System.out?.print(x * y) // Now we can
-        }
-    }
-}
diff --git a/translator/testFiles/webDemoExamples/cases/objectOrientedHello.kt b/translator/testFiles/webDemoExamples/cases/objectOrientedHello.kt
deleted file mode 100644
index b50d54bbb9d..00000000000
--- a/translator/testFiles/webDemoExamples/cases/objectOrientedHello.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-class Greeter(name : String) {
-  val name = name
-  fun greet() {
-    System.out?.println("Hello, ${name}!");
-  }
-}
-
-fun main(args : Array<String>) {
-  Greeter(args[0]).greet()
-}
\ No newline at end of file
diff --git a/translator/testFiles/webDemoExamples/cases/patternMatching.kt b/translator/testFiles/webDemoExamples/cases/patternMatching.kt
deleted file mode 100644
index 5dd0be84862..00000000000
--- a/translator/testFiles/webDemoExamples/cases/patternMatching.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-fun main(args : Array<String>) {
-    cases("Hello")
-    cases(1)
-    cases(MyClass())
-    cases("hello")
-}
-
-fun cases(obj : Any) {
-  when(obj) {
-    1          -> System.out?.println("One")
-    "Hello"    -> System.out?.println("Greeting")
-    !is String -> System.out?.println("Not a string")
-    else       -> System.out?.println("Unknown")
-  }
-}
-
-class MyClass() {
-}
diff --git a/translator/testFiles/webDemoExamples/cases/printArg.kt b/translator/testFiles/webDemoExamples/cases/printArg.kt
deleted file mode 100644
index 0300a93901e..00000000000
--- a/translator/testFiles/webDemoExamples/cases/printArg.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-fun main(args : Array<String>) {
-    System.out?.print(args[0]);
-}
diff --git a/translator/testFiles/webDemoExamples/cases/ranges.kt b/translator/testFiles/webDemoExamples/cases/ranges.kt
deleted file mode 100644
index e64fc693342..00000000000
--- a/translator/testFiles/webDemoExamples/cases/ranges.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-import java.util.ArrayList;
-
-fun main(args : Array<String>) {
-    val x = Integer.parseInt(args[0])
-    //Check if a number lies within a range:
-    val y = 10
-    if (x in 1..y-1)
-        System.out?.println("OK")
-
-    //Iterate over a range:
-    for (a in 1..5)
-    System.out?.print(" ${a}")
-
-    //Check if a number is out of range:
-    System.out?.println()
-    val array = ArrayList<String>();
-
-    array.add("aaa")
-    array.add("bbb")
-    array.add("ccc")
-
-    if (x !in 0..array.size())
-        System.out?.println("Out: array has only ${array.size()} elements. x = ${x}")
-
-    //Check if a collection contains an object:
-    if ("aaa" in array) // collection.contains(obj) is called
-        System.out?.println("Yes: array contains aaa")
-
-    if ("ddd" in array) // collection.contains(obj) is called
-        System.out?.println("Yes: array contains ddd")
-    else
-        System.out?.println("No: array doesn't contains ddd")
-}
-
- 
diff --git a/translator/testFiles/webDemoExamples/cases/whileLoop.kt b/translator/testFiles/webDemoExamples/cases/whileLoop.kt
deleted file mode 100644
index 5ef65053397..00000000000
--- a/translator/testFiles/webDemoExamples/cases/whileLoop.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-fun main(args : Array<String>) {
-  var i = 0
-  while (i < args.size)
-    System.out?.println(args[i++])
-}
diff --git a/translator/testFiles/webDemoExamples2/cases/bottles.kt b/translator/testFiles/webDemoExamples2/cases/bottles.kt
new file mode 100644
index 00000000000..f6f96395c99
--- /dev/null
+++ b/translator/testFiles/webDemoExamples2/cases/bottles.kt
@@ -0,0 +1,75 @@
+/**
+ * This example implements the famous "99 Bottles of Beer" program
+ * See http://99-bottles-of-beer.net/
+ *
+ * The point is to print out a song with the following lyrics:
+ *
+ *     The "99 bottles of beer" song
+ *
+ *     99 bottles of beer on the wall, 99 bottles of beer.
+ *     Take one down, pass it around, 98 bottles of beer on the wall.
+ *
+ *     98 bottles of beer on the wall, 98 bottles of beer.
+ *     Take one down, pass it around, 97 bottles of beer on the wall.
+ *
+ *       ...
+ *
+ *     2 bottles of beer on the wall, 2 bottles of beer.
+ *     Take one down, pass it around, 1 bottle of beer on the wall.
+ *
+ *     1 bottle of beer on the wall, 1 bottle of beer.
+ *     Take one down, pass it around, no more bottles of beer on the wall.
+ *
+ *     No more bottles of beer on the wall, no more bottles of beer.
+ *     Go to the store and buy some more, 99 bottles of beer on the wall.
+ *
+ * Additionally, you can pass the desired initial number of bottles to use (rather than 99)
+ * as a command-line argument
+ */
+ import js.*
+
+fun main(args : Array<String>) {
+  if (args.isEmpty) {
+    printBottles(99)
+  }
+  else {
+    val bottles = Integer.parseInt(args[0]);
+    if (bottles != null) {
+        printBottles(bottles);
+    } else {
+        println("You have passed '${args[0]}' as a number of bottles, " +
+                      "but it is not a valid integral number")
+    }
+  }
+}
+
+fun printBottles(bottleCount : Int) {
+  if (bottleCount <= 0) {
+    println("No bottles - no song")
+    return
+  }
+
+  println("The \"${bottlesOfBeer(bottleCount)}\" song\n")
+
+  var bottles = bottleCount
+  while (bottles > 0) {
+    val bottlesOfBeer = bottlesOfBeer(bottles)
+    print("$bottlesOfBeer on the wall, $bottlesOfBeer.\nTake one down, pass it around, ")
+    bottles--
+    println("${bottlesOfBeer(bottles)} on the wall.\n")
+  }
+  println("No more bottles of beer on the wall, no more bottles of beer.\n" +
+          "Go to the store and buy some more, ${bottlesOfBeer(bottleCount)} on the wall.")
+}
+
+fun bottlesOfBeer(count : Int) : String =
+  when (count) {
+           0 -> "no more bottles"
+           1 -> "1 bottle"
+           else -> "$count bottles"
+         } + " of beer"
+
+// From the std package
+// This is an extension property, i.e. a property that is defined for the
+// type Array<T>, but does not sit inside the class Array
+val <T> Array<T>.isEmpty : Boolean get() = size == 0
diff --git a/translator/testFiles/webDemoExamples2/expected/bottles.out b/translator/testFiles/webDemoExamples2/expected/bottles.out
new file mode 100644
index 00000000000..e7b140a5f40
--- /dev/null
+++ b/translator/testFiles/webDemoExamples2/expected/bottles.out
@@ -0,0 +1,301 @@
+The "99 bottles of beer" song
+
+99 bottles of beer on the wall, 99 bottles of beer.
+Take one down, pass it around, 98 bottles of beer on the wall.
+
+98 bottles of beer on the wall, 98 bottles of beer.
+Take one down, pass it around, 97 bottles of beer on the wall.
+
+97 bottles of beer on the wall, 97 bottles of beer.
+Take one down, pass it around, 96 bottles of beer on the wall.
+
+96 bottles of beer on the wall, 96 bottles of beer.
+Take one down, pass it around, 95 bottles of beer on the wall.
+
+95 bottles of beer on the wall, 95 bottles of beer.
+Take one down, pass it around, 94 bottles of beer on the wall.
+
+94 bottles of beer on the wall, 94 bottles of beer.
+Take one down, pass it around, 93 bottles of beer on the wall.
+
+93 bottles of beer on the wall, 93 bottles of beer.
+Take one down, pass it around, 92 bottles of beer on the wall.
+
+92 bottles of beer on the wall, 92 bottles of beer.
+Take one down, pass it around, 91 bottles of beer on the wall.
+
+91 bottles of beer on the wall, 91 bottles of beer.
+Take one down, pass it around, 90 bottles of beer on the wall.
+
+90 bottles of beer on the wall, 90 bottles of beer.
+Take one down, pass it around, 89 bottles of beer on the wall.
+
+89 bottles of beer on the wall, 89 bottles of beer.
+Take one down, pass it around, 88 bottles of beer on the wall.
+
+88 bottles of beer on the wall, 88 bottles of beer.
+Take one down, pass it around, 87 bottles of beer on the wall.
+
+87 bottles of beer on the wall, 87 bottles of beer.
+Take one down, pass it around, 86 bottles of beer on the wall.
+
+86 bottles of beer on the wall, 86 bottles of beer.
+Take one down, pass it around, 85 bottles of beer on the wall.
+
+85 bottles of beer on the wall, 85 bottles of beer.
+Take one down, pass it around, 84 bottles of beer on the wall.
+
+84 bottles of beer on the wall, 84 bottles of beer.
+Take one down, pass it around, 83 bottles of beer on the wall.
+
+83 bottles of beer on the wall, 83 bottles of beer.
+Take one down, pass it around, 82 bottles of beer on the wall.
+
+82 bottles of beer on the wall, 82 bottles of beer.
+Take one down, pass it around, 81 bottles of beer on the wall.
+
+81 bottles of beer on the wall, 81 bottles of beer.
+Take one down, pass it around, 80 bottles of beer on the wall.
+
+80 bottles of beer on the wall, 80 bottles of beer.
+Take one down, pass it around, 79 bottles of beer on the wall.
+
+79 bottles of beer on the wall, 79 bottles of beer.
+Take one down, pass it around, 78 bottles of beer on the wall.
+
+78 bottles of beer on the wall, 78 bottles of beer.
+Take one down, pass it around, 77 bottles of beer on the wall.
+
+77 bottles of beer on the wall, 77 bottles of beer.
+Take one down, pass it around, 76 bottles of beer on the wall.
+
+76 bottles of beer on the wall, 76 bottles of beer.
+Take one down, pass it around, 75 bottles of beer on the wall.
+
+75 bottles of beer on the wall, 75 bottles of beer.
+Take one down, pass it around, 74 bottles of beer on the wall.
+
+74 bottles of beer on the wall, 74 bottles of beer.
+Take one down, pass it around, 73 bottles of beer on the wall.
+
+73 bottles of beer on the wall, 73 bottles of beer.
+Take one down, pass it around, 72 bottles of beer on the wall.
+
+72 bottles of beer on the wall, 72 bottles of beer.
+Take one down, pass it around, 71 bottles of beer on the wall.
+
+71 bottles of beer on the wall, 71 bottles of beer.
+Take one down, pass it around, 70 bottles of beer on the wall.
+
+70 bottles of beer on the wall, 70 bottles of beer.
+Take one down, pass it around, 69 bottles of beer on the wall.
+
+69 bottles of beer on the wall, 69 bottles of beer.
+Take one down, pass it around, 68 bottles of beer on the wall.
+
+68 bottles of beer on the wall, 68 bottles of beer.
+Take one down, pass it around, 67 bottles of beer on the wall.
+
+67 bottles of beer on the wall, 67 bottles of beer.
+Take one down, pass it around, 66 bottles of beer on the wall.
+
+66 bottles of beer on the wall, 66 bottles of beer.
+Take one down, pass it around, 65 bottles of beer on the wall.
+
+65 bottles of beer on the wall, 65 bottles of beer.
+Take one down, pass it around, 64 bottles of beer on the wall.
+
+64 bottles of beer on the wall, 64 bottles of beer.
+Take one down, pass it around, 63 bottles of beer on the wall.
+
+63 bottles of beer on the wall, 63 bottles of beer.
+Take one down, pass it around, 62 bottles of beer on the wall.
+
+62 bottles of beer on the wall, 62 bottles of beer.
+Take one down, pass it around, 61 bottles of beer on the wall.
+
+61 bottles of beer on the wall, 61 bottles of beer.
+Take one down, pass it around, 60 bottles of beer on the wall.
+
+60 bottles of beer on the wall, 60 bottles of beer.
+Take one down, pass it around, 59 bottles of beer on the wall.
+
+59 bottles of beer on the wall, 59 bottles of beer.
+Take one down, pass it around, 58 bottles of beer on the wall.
+
+58 bottles of beer on the wall, 58 bottles of beer.
+Take one down, pass it around, 57 bottles of beer on the wall.
+
+57 bottles of beer on the wall, 57 bottles of beer.
+Take one down, pass it around, 56 bottles of beer on the wall.
+
+56 bottles of beer on the wall, 56 bottles of beer.
+Take one down, pass it around, 55 bottles of beer on the wall.
+
+55 bottles of beer on the wall, 55 bottles of beer.
+Take one down, pass it around, 54 bottles of beer on the wall.
+
+54 bottles of beer on the wall, 54 bottles of beer.
+Take one down, pass it around, 53 bottles of beer on the wall.
+
+53 bottles of beer on the wall, 53 bottles of beer.
+Take one down, pass it around, 52 bottles of beer on the wall.
+
+52 bottles of beer on the wall, 52 bottles of beer.
+Take one down, pass it around, 51 bottles of beer on the wall.
+
+51 bottles of beer on the wall, 51 bottles of beer.
+Take one down, pass it around, 50 bottles of beer on the wall.
+
+50 bottles of beer on the wall, 50 bottles of beer.
+Take one down, pass it around, 49 bottles of beer on the wall.
+
+49 bottles of beer on the wall, 49 bottles of beer.
+Take one down, pass it around, 48 bottles of beer on the wall.
+
+48 bottles of beer on the wall, 48 bottles of beer.
+Take one down, pass it around, 47 bottles of beer on the wall.
+
+47 bottles of beer on the wall, 47 bottles of beer.
+Take one down, pass it around, 46 bottles of beer on the wall.
+
+46 bottles of beer on the wall, 46 bottles of beer.
+Take one down, pass it around, 45 bottles of beer on the wall.
+
+45 bottles of beer on the wall, 45 bottles of beer.
+Take one down, pass it around, 44 bottles of beer on the wall.
+
+44 bottles of beer on the wall, 44 bottles of beer.
+Take one down, pass it around, 43 bottles of beer on the wall.
+
+43 bottles of beer on the wall, 43 bottles of beer.
+Take one down, pass it around, 42 bottles of beer on the wall.
+
+42 bottles of beer on the wall, 42 bottles of beer.
+Take one down, pass it around, 41 bottles of beer on the wall.
+
+41 bottles of beer on the wall, 41 bottles of beer.
+Take one down, pass it around, 40 bottles of beer on the wall.
+
+40 bottles of beer on the wall, 40 bottles of beer.
+Take one down, pass it around, 39 bottles of beer on the wall.
+
+39 bottles of beer on the wall, 39 bottles of beer.
+Take one down, pass it around, 38 bottles of beer on the wall.
+
+38 bottles of beer on the wall, 38 bottles of beer.
+Take one down, pass it around, 37 bottles of beer on the wall.
+
+37 bottles of beer on the wall, 37 bottles of beer.
+Take one down, pass it around, 36 bottles of beer on the wall.
+
+36 bottles of beer on the wall, 36 bottles of beer.
+Take one down, pass it around, 35 bottles of beer on the wall.
+
+35 bottles of beer on the wall, 35 bottles of beer.
+Take one down, pass it around, 34 bottles of beer on the wall.
+
+34 bottles of beer on the wall, 34 bottles of beer.
+Take one down, pass it around, 33 bottles of beer on the wall.
+
+33 bottles of beer on the wall, 33 bottles of beer.
+Take one down, pass it around, 32 bottles of beer on the wall.
+
+32 bottles of beer on the wall, 32 bottles of beer.
+Take one down, pass it around, 31 bottles of beer on the wall.
+
+31 bottles of beer on the wall, 31 bottles of beer.
+Take one down, pass it around, 30 bottles of beer on the wall.
+
+30 bottles of beer on the wall, 30 bottles of beer.
+Take one down, pass it around, 29 bottles of beer on the wall.
+
+29 bottles of beer on the wall, 29 bottles of beer.
+Take one down, pass it around, 28 bottles of beer on the wall.
+
+28 bottles of beer on the wall, 28 bottles of beer.
+Take one down, pass it around, 27 bottles of beer on the wall.
+
+27 bottles of beer on the wall, 27 bottles of beer.
+Take one down, pass it around, 26 bottles of beer on the wall.
+
+26 bottles of beer on the wall, 26 bottles of beer.
+Take one down, pass it around, 25 bottles of beer on the wall.
+
+25 bottles of beer on the wall, 25 bottles of beer.
+Take one down, pass it around, 24 bottles of beer on the wall.
+
+24 bottles of beer on the wall, 24 bottles of beer.
+Take one down, pass it around, 23 bottles of beer on the wall.
+
+23 bottles of beer on the wall, 23 bottles of beer.
+Take one down, pass it around, 22 bottles of beer on the wall.
+
+22 bottles of beer on the wall, 22 bottles of beer.
+Take one down, pass it around, 21 bottles of beer on the wall.
+
+21 bottles of beer on the wall, 21 bottles of beer.
+Take one down, pass it around, 20 bottles of beer on the wall.
+
+20 bottles of beer on the wall, 20 bottles of beer.
+Take one down, pass it around, 19 bottles of beer on the wall.
+
+19 bottles of beer on the wall, 19 bottles of beer.
+Take one down, pass it around, 18 bottles of beer on the wall.
+
+18 bottles of beer on the wall, 18 bottles of beer.
+Take one down, pass it around, 17 bottles of beer on the wall.
+
+17 bottles of beer on the wall, 17 bottles of beer.
+Take one down, pass it around, 16 bottles of beer on the wall.
+
+16 bottles of beer on the wall, 16 bottles of beer.
+Take one down, pass it around, 15 bottles of beer on the wall.
+
+15 bottles of beer on the wall, 15 bottles of beer.
+Take one down, pass it around, 14 bottles of beer on the wall.
+
+14 bottles of beer on the wall, 14 bottles of beer.
+Take one down, pass it around, 13 bottles of beer on the wall.
+
+13 bottles of beer on the wall, 13 bottles of beer.
+Take one down, pass it around, 12 bottles of beer on the wall.
+
+12 bottles of beer on the wall, 12 bottles of beer.
+Take one down, pass it around, 11 bottles of beer on the wall.
+
+11 bottles of beer on the wall, 11 bottles of beer.
+Take one down, pass it around, 10 bottles of beer on the wall.
+
+10 bottles of beer on the wall, 10 bottles of beer.
+Take one down, pass it around, 9 bottles of beer on the wall.
+
+9 bottles of beer on the wall, 9 bottles of beer.
+Take one down, pass it around, 8 bottles of beer on the wall.
+
+8 bottles of beer on the wall, 8 bottles of beer.
+Take one down, pass it around, 7 bottles of beer on the wall.
+
+7 bottles of beer on the wall, 7 bottles of beer.
+Take one down, pass it around, 6 bottles of beer on the wall.
+
+6 bottles of beer on the wall, 6 bottles of beer.
+Take one down, pass it around, 5 bottles of beer on the wall.
+
+5 bottles of beer on the wall, 5 bottles of beer.
+Take one down, pass it around, 4 bottles of beer on the wall.
+
+4 bottles of beer on the wall, 4 bottles of beer.
+Take one down, pass it around, 3 bottles of beer on the wall.
+
+3 bottles of beer on the wall, 3 bottles of beer.
+Take one down, pass it around, 2 bottles of beer on the wall.
+
+2 bottles of beer on the wall, 2 bottles of beer.
+Take one down, pass it around, 1 bottle of beer on the wall.
+
+1 bottle of beer on the wall, 1 bottle of beer.
+Take one down, pass it around, no more bottles of beer on the wall.
+
+No more bottles of beer on the wall, no more bottles of beer.
+Go to the store and buy some more, 99 bottles of beer on the wall.
\ No newline at end of file