diff --git a/.idea/dictionaries/Pavel_Talanov.xml b/.idea/dictionaries/Pavel_Talanov.xml
new file mode 100644
index 00000000000..556d1745d0f
--- /dev/null
+++ b/.idea/dictionaries/Pavel_Talanov.xml
@@ -0,0 +1,3 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="Pavel.Talanov" />
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/guava_10_0_1.xml b/.idea/libraries/guava_10_0_1.xml
new file mode 100644
index 00000000000..ef3fb899674
--- /dev/null
+++ b/.idea/libraries/guava_10_0_1.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="guava-10.0.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/translator/lib/guava-10.0.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 07c88da7dbd..f36aa0c5c3a 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,19 +2,25 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/../Kotlin/jet/compiler/backend/backend.iml" filepath="$PROJECT_DIR$/../Kotlin/jet/compiler/backend/backend.iml" />
       <module fileurl="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/backend/backend.iml" filepath="$PROJECT_DIR$/../../Kotlin/jet/compiler/backend/backend.iml" />
+      <module fileurl="file://$PROJECT_DIR$/../Kotlin/jet/compiler/cli/cli.iml" filepath="$PROJECT_DIR$/../Kotlin/jet/compiler/cli/cli.iml" />
       <module fileurl="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/cli/cli.iml" filepath="$PROJECT_DIR$/../../Kotlin/jet/compiler/cli/cli.iml" />
+      <module fileurl="file://$PROJECT_DIR$/../Kotlin/jet/compiler/tests/compiler-tests.iml" filepath="$PROJECT_DIR$/../Kotlin/jet/compiler/tests/compiler-tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/tests/compiler-tests.iml" filepath="$PROJECT_DIR$/../../Kotlin/jet/compiler/tests/compiler-tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/examplesForWebDemo/examplesForWebDemo.iml" filepath="$PROJECT_DIR$/examplesForWebDemo/examplesForWebDemo.iml" />
-      <module fileurl="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/frontend.iml" filepath="$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/frontend.iml" />
       <module fileurl="file://$PROJECT_DIR$/../Kotlin/jet/compiler/frontend/frontend.iml" filepath="$PROJECT_DIR$/../Kotlin/jet/compiler/frontend/frontend.iml" />
-      <module fileurl="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend.java/frontend.java.iml" filepath="$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend.java/frontend.java.iml" />
+      <module fileurl="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/frontend.iml" filepath="$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/frontend.iml" />
       <module fileurl="file://$PROJECT_DIR$/../Kotlin/jet/compiler/frontend.java/frontend.java.iml" filepath="$PROJECT_DIR$/../Kotlin/jet/compiler/frontend.java/frontend.java.iml" />
+      <module fileurl="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend.java/frontend.java.iml" filepath="$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend.java/frontend.java.iml" />
+      <module fileurl="file://$PROJECT_DIR$/../Kotlin/jet/compiler/jet.as.java.psi/jet.as.java.psi.iml" filepath="$PROJECT_DIR$/../Kotlin/jet/compiler/jet.as.java.psi/jet.as.java.psi.iml" />
       <module fileurl="file://$PROJECT_DIR$/js/js.iml" filepath="$PROJECT_DIR$/js/js.iml" />
       <module fileurl="file://$PROJECT_DIR$/jslib/jslib.iml" filepath="$PROJECT_DIR$/jslib/jslib.iml" />
+      <module fileurl="file://$PROJECT_DIR$/../Kotlin/jet/stdlib/stdlib.iml" filepath="$PROJECT_DIR$/../Kotlin/jet/stdlib/stdlib.iml" />
       <module fileurl="file://$PROJECT_DIR$/../../Kotlin/jet/stdlib/stdlib.iml" filepath="$PROJECT_DIR$/../../Kotlin/jet/stdlib/stdlib.iml" />
       <module fileurl="file://$PROJECT_DIR$/translator/translator.iml" filepath="$PROJECT_DIR$/translator/translator.iml" />
       <module fileurl="file://$PROJECT_DIR$/translatorTests/translatorTests.iml" filepath="$PROJECT_DIR$/translatorTests/translatorTests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/../Kotlin/jet/compiler/util/util.iml" filepath="$PROJECT_DIR$/../Kotlin/jet/compiler/util/util.iml" />
       <module fileurl="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/util/util.iml" filepath="$PROJECT_DIR$/../../Kotlin/jet/compiler/util/util.iml" />
     </modules>
   </component>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 21cbaa607b2..275077f8255 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
 
diff --git a/translator/testFiles/class/out/.gitignore b/translator/testFiles/class/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/class/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/examples/out/.gitignore b/translator/testFiles/examples/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/examples/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/expression/conditional/out/.gitignore b/translator/testFiles/expression/conditional/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/expression/conditional/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/expression/for/out/.gitignore b/translator/testFiles/expression/for/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/expression/for/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/expression/function/out/.gitignore b/translator/testFiles/expression/function/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/expression/function/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/expression/misc/out/.gitignore b/translator/testFiles/expression/misc/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/expression/misc/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/expression/string/out/.gitignore b/translator/testFiles/expression/string/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/expression/string/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/extensionFunction/out/.gitignore b/translator/testFiles/extensionFunction/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/extensionFunction/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/extensionProperty/out/.gitignore b/translator/testFiles/extensionProperty/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/extensionProperty/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/inheritance/out/.gitignore b/translator/testFiles/inheritance/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/inheritance/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/java/arrayList/out/.gitignore b/translator/testFiles/java/arrayList/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/java/arrayList/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/multiFile/out/.gitignore b/translator/testFiles/multiFile/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/multiFile/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/multiNamespace/out/.gitignore b/translator/testFiles/multiNamespace/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/multiNamespace/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/nameClashes/out/.gitignore b/translator/testFiles/nameClashes/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/nameClashes/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/object/out/.gitignore b/translator/testFiles/object/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/object/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/operatorOverloading/out/.gitignore b/translator/testFiles/operatorOverloading/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/operatorOverloading/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/patternMatching/out/.gitignore b/translator/testFiles/patternMatching/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/patternMatching/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/propertyAccess/out/.gitignore b/translator/testFiles/propertyAccess/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/propertyAccess/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/range/out/.gitignore b/translator/testFiles/range/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/range/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/rtti/out/.gitignore b/translator/testFiles/rtti/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/rtti/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/simple/out/.gitignore b/translator/testFiles/simple/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/simple/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/standardClasses/out/.gitignore b/translator/testFiles/standardClasses/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/standardClasses/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/stdlib/out/.gitignore b/translator/testFiles/stdlib/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/stdlib/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/trait/out/.gitignore b/translator/testFiles/trait/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/trait/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/tuple/out/.gitignore b/translator/testFiles/tuple/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/tuple/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/webDemoExamples1/out/.gitignore b/translator/testFiles/webDemoExamples1/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/webDemoExamples1/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/testFiles/webDemoExamples2/out/.gitignore b/translator/testFiles/webDemoExamples2/out/.gitignore
new file mode 100644
index 00000000000..86d0cb2726c
--- /dev/null
+++ b/translator/testFiles/webDemoExamples2/out/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file
diff --git a/translator/translator.iml b/translator/translator.iml
index e22aa76dd49..c659b734bd1 100644
--- a/translator/translator.iml
+++ b/translator/translator.iml
@@ -8,9 +8,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="frontend" />
-    <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="backend" />
-    <orderEntry type="module" module-name="cli" />
     <orderEntry type="module-library">
       <library>
         <CLASSES>
@@ -24,8 +21,10 @@
     <orderEntry type="library" name="js" level="application" />
     <orderEntry type="library" name="idea-full" level="application" />
     <orderEntry type="module" module-name="js" />
-    <orderEntry type="module" module-name="compiler-tests" />
     <orderEntry type="module" module-name="jslib" />
+    <orderEntry type="library" name="guava-10.0.1" level="project" />
+    <orderEntry type="module" module-name="cli" />
+    <orderEntry type="module" module-name="frontend.java" />
   </component>
 </module>
 
diff --git a/translatorTests/translatorTests.iml b/translatorTests/translatorTests.iml
index ed4ac8d37f0..adc13b8c755 100644
--- a/translatorTests/translatorTests.iml
+++ b/translatorTests/translatorTests.iml
@@ -10,6 +10,7 @@
     <orderEntry type="module" module-name="translator" />
     <orderEntry type="library" name="idea-full" level="application" />
     <orderEntry type="library" name="js" level="application" />
+    <orderEntry type="library" name="guava-10.0.1" level="project" />
     <orderEntry type="module" module-name="compiler-tests" />
     <orderEntry type="module" module-name="cli" />
   </component>