diff --git a/idea/testData/codegen/funDelegation.jet b/idea/testData/codegen/classes/funDelegation.jet
similarity index 100%
rename from idea/testData/codegen/funDelegation.jet
rename to idea/testData/codegen/classes/funDelegation.jet
diff --git a/idea/testData/codegen/inheritance.jet b/idea/testData/codegen/classes/inheritance.jet
similarity index 100%
rename from idea/testData/codegen/inheritance.jet
rename to idea/testData/codegen/classes/inheritance.jet
diff --git a/idea/testData/codegen/inheritingFromArrayList.jet b/idea/testData/codegen/classes/inheritingFromArrayList.jet
similarity index 100%
rename from idea/testData/codegen/inheritingFromArrayList.jet
rename to idea/testData/codegen/classes/inheritingFromArrayList.jet
diff --git a/idea/testData/codegen/newInstanceDefaultConstructor.jet b/idea/testData/codegen/classes/newInstanceDefaultConstructor.jet
similarity index 100%
rename from idea/testData/codegen/newInstanceDefaultConstructor.jet
rename to idea/testData/codegen/classes/newInstanceDefaultConstructor.jet
diff --git a/idea/testData/codegen/propertyDelegation.jet b/idea/testData/codegen/classes/propertyDelegation.jet
similarity index 100%
rename from idea/testData/codegen/propertyDelegation.jet
rename to idea/testData/codegen/classes/propertyDelegation.jet
diff --git a/idea/testData/codegen/simpleClass.jet b/idea/testData/codegen/classes/simpleClass.jet
similarity index 100%
rename from idea/testData/codegen/simpleClass.jet
rename to idea/testData/codegen/classes/simpleClass.jet
diff --git a/idea/testData/codegen/break.jet b/idea/testData/codegen/controlStructures/break.jet
similarity index 100%
rename from idea/testData/codegen/break.jet
rename to idea/testData/codegen/controlStructures/break.jet
diff --git a/idea/testData/codegen/continue.jet b/idea/testData/codegen/controlStructures/continue.jet
similarity index 100%
rename from idea/testData/codegen/continue.jet
rename to idea/testData/codegen/controlStructures/continue.jet
diff --git a/idea/testData/codegen/doWhile.jet b/idea/testData/codegen/controlStructures/doWhile.jet
similarity index 100%
rename from idea/testData/codegen/doWhile.jet
rename to idea/testData/codegen/controlStructures/doWhile.jet
diff --git a/idea/testData/codegen/for.jet b/idea/testData/codegen/controlStructures/for.jet
similarity index 100%
rename from idea/testData/codegen/for.jet
rename to idea/testData/codegen/controlStructures/for.jet
diff --git a/idea/testData/codegen/forInArray.jet b/idea/testData/codegen/controlStructures/forInArray.jet
similarity index 100%
rename from idea/testData/codegen/forInArray.jet
rename to idea/testData/codegen/controlStructures/forInArray.jet
diff --git a/idea/testData/codegen/if.jet b/idea/testData/codegen/controlStructures/if.jet
similarity index 100%
rename from idea/testData/codegen/if.jet
rename to idea/testData/codegen/controlStructures/if.jet
diff --git a/idea/testData/codegen/ifNoElse.jet b/idea/testData/codegen/controlStructures/ifNoElse.jet
similarity index 100%
rename from idea/testData/codegen/ifNoElse.jet
rename to idea/testData/codegen/controlStructures/ifNoElse.jet
diff --git a/idea/testData/codegen/singleBranchIf.jet b/idea/testData/codegen/controlStructures/singleBranchIf.jet
similarity index 100%
rename from idea/testData/codegen/singleBranchIf.jet
rename to idea/testData/codegen/controlStructures/singleBranchIf.jet
diff --git a/idea/testData/codegen/tryCatch.jet b/idea/testData/codegen/controlStructures/tryCatch.jet
similarity index 100%
rename from idea/testData/codegen/tryCatch.jet
rename to idea/testData/codegen/controlStructures/tryCatch.jet
diff --git a/idea/testData/codegen/while.jet b/idea/testData/codegen/controlStructures/while.jet
similarity index 100%
rename from idea/testData/codegen/while.jet
rename to idea/testData/codegen/controlStructures/while.jet
diff --git a/idea/testData/codegen/fieldPropertyAccess.jet b/idea/testData/codegen/properties/fieldPropertyAccess.jet
similarity index 100%
rename from idea/testData/codegen/fieldPropertyAccess.jet
rename to idea/testData/codegen/properties/fieldPropertyAccess.jet
diff --git a/idea/testData/codegen/fieldSetter.jet b/idea/testData/codegen/properties/fieldSetter.jet
similarity index 100%
rename from idea/testData/codegen/fieldSetter.jet
rename to idea/testData/codegen/properties/fieldSetter.jet
diff --git a/idea/testData/codegen/fieldSetterPlusEq.jet b/idea/testData/codegen/properties/fieldSetterPlusEq.jet
similarity index 100%
rename from idea/testData/codegen/fieldSetterPlusEq.jet
rename to idea/testData/codegen/properties/fieldSetterPlusEq.jet
diff --git a/idea/testData/codegen/privateVal.jet b/idea/testData/codegen/properties/privateVal.jet
similarity index 100%
rename from idea/testData/codegen/privateVal.jet
rename to idea/testData/codegen/properties/privateVal.jet
diff --git a/idea/testData/codegen/privateVar.jet b/idea/testData/codegen/properties/privateVar.jet
similarity index 100%
rename from idea/testData/codegen/privateVar.jet
rename to idea/testData/codegen/properties/privateVar.jet
diff --git a/idea/tests/org/jetbrains/jet/codegen/ClassGenTest.java b/idea/tests/org/jetbrains/jet/codegen/ClassGenTest.java
index 6c66f0e6754..9a62f256cae 100644
--- a/idea/tests/org/jetbrains/jet/codegen/ClassGenTest.java
+++ b/idea/tests/org/jetbrains/jet/codegen/ClassGenTest.java
@@ -8,7 +8,7 @@ import java.util.List;
  */
 public class ClassGenTest extends CodegenTestCase {
     public void testPSVMClass() throws Exception {
-        loadFile("simpleClass.jet");
+        loadFile("classes/simpleClass.jet");
         System.out.println(generateToText());
 
         final Class aClass = loadClass("SimpleClass", generateClassesInFile());
@@ -17,7 +17,7 @@ public class ClassGenTest extends CodegenTestCase {
     }
 
     public void testArrayListInheritance() throws Exception {
-        loadFile("inheritingFromArrayList.jet");
+        loadFile("classes/inheritingFromArrayList.jet");
         System.out.println(generateToText());
 
         final Class aClass = loadClass("Foo", generateClassesInFile());
@@ -25,15 +25,15 @@ public class ClassGenTest extends CodegenTestCase {
     }
 
     public void testInheritanceAndDelegation_DelegatingDefaultConstructorProperties() throws Exception {
-        blackBoxFile("inheritance.jet");
+        blackBoxFile("classes/inheritance.jet");
     }
 
     public void testFunDelegation() throws Exception {
-        blackBoxFile("funDelegation.jet");
+        blackBoxFile("classes/funDelegation.jet");
     }
 
     public void testPropertyDelegation() throws Exception {
-        blackBoxFile("propertyDelegation.jet");
+        blackBoxFile("classes/propertyDelegation.jet");
     }
 
     private static void checkInterface(Class aClass, Class ifs) {
@@ -44,7 +44,7 @@ public class ClassGenTest extends CodegenTestCase {
     }
 
     public void testNewInstanceExplicitConstructor() throws Exception {
-        loadFile("newInstanceDefaultConstructor.jet");
+        loadFile("classes/newInstanceDefaultConstructor.jet");
         System.out.println(generateToText());
         final Codegens codegens = generateClassesInFile();
         loadImplementationClass(codegens, "SimpleClass");
diff --git a/idea/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java b/idea/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java
index bf183752557..e26b4a608b0 100644
--- a/idea/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java
+++ b/idea/tests/org/jetbrains/jet/codegen/ControlStructuresTest.java
@@ -10,7 +10,7 @@ import java.util.List;
  */
 public class ControlStructuresTest extends CodegenTestCase {
     public void testIf() throws Exception {
-        loadFile("if.jet");
+        loadFile("controlStructures/if.jet");
 
         System.out.println(generateToText());
         final Method main = generateFunction();
@@ -19,7 +19,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testSingleBranchIf() throws Exception {
-        loadFile("singleBranchIf.jet");
+        loadFile("controlStructures/singleBranchIf.jet");
 
         System.out.println(generateToText());
         final Method main = generateFunction();
@@ -28,15 +28,15 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testWhile() throws Exception {
-        factorialTest("while.jet");
+        factorialTest("controlStructures/while.jet");
     }
 
     public void testDoWhile() throws Exception {
-        factorialTest("doWhile.jet");
+        factorialTest("controlStructures/doWhile.jet");
     }
 
     public void testBreak() throws Exception {
-        factorialTest("break.jet");
+        factorialTest("controlStructures/break.jet");
     }
 
     private void factorialTest(final String name) throws IllegalAccessException, InvocationTargetException {
@@ -49,7 +49,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testContinue() throws Exception {
-        loadFile("continue.jet");
+        loadFile("controlStructures/continue.jet");
         System.out.println(generateToText());
         final Method main = generateFunction();
         assertEquals(3, main.invoke(null, 4));
@@ -57,7 +57,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testIfNoElse() throws Exception {
-        loadFile("ifNoElse.jet");
+        loadFile("controlStructures/ifNoElse.jet");
         System.out.println(generateToText());
         final Method main = generateFunction();
         assertEquals(5, main.invoke(null, 5, true));
@@ -72,7 +72,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testFor() throws Exception {
-        loadFile("for.jet");
+        loadFile("controlStructures/for.jet");
         System.out.println(generateToText());
         final Method main = generateFunction();
         List<String> args = Arrays.asList("IntelliJ", " ", "IDEA");
@@ -80,7 +80,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testForInArray() throws Exception {
-        loadFile("forInArray.jet");
+        loadFile("controlStructures/forInArray.jet");
         System.out.println(generateToText());
         final Method main = generateFunction();
         String[] args = new String[] { "IntelliJ", " ", "IDEA" };
@@ -102,7 +102,7 @@ public class ControlStructuresTest extends CodegenTestCase {
     }
 
     public void testTryCatch() throws Exception {
-        loadFile("tryCatch.jet");
+        loadFile("controlStructures/tryCatch.jet");
         System.out.println(generateToText());
         final Method main = generateFunction();
         assertEquals("no message", main.invoke(null, "0"));
diff --git a/idea/tests/org/jetbrains/jet/codegen/PropertyGenTest.java b/idea/tests/org/jetbrains/jet/codegen/PropertyGenTest.java
index 11377e758b2..d5353d3283b 100644
--- a/idea/tests/org/jetbrains/jet/codegen/PropertyGenTest.java
+++ b/idea/tests/org/jetbrains/jet/codegen/PropertyGenTest.java
@@ -9,7 +9,7 @@ import java.lang.reflect.Modifier;
  */
 public class PropertyGenTest extends CodegenTestCase {
     public void testPrivateVal() throws Exception {
-        loadFile("privateVal.jet");
+        loadFile("properties/privateVal.jet");
         System.out.println(generateToText());
         final Class aClass = loadImplementationClass(generateClassesInFile(), "PrivateVal");
         final Field[] fields = aClass.getDeclaredFields();
@@ -19,7 +19,7 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testPrivateVar() throws Exception {
-        loadFile("privateVar.jet");
+        loadFile("properties/privateVar.jet");
         System.out.println(generateToText());
         final Class aClass = loadImplementationClass(generateClassesInFile(), "PrivateVar");
         final Object instance = aClass.newInstance();
@@ -60,7 +60,7 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testFieldPropertyAccess() throws Exception {
-        loadFile("fieldPropertyAccess.jet");
+        loadFile("properties/fieldPropertyAccess.jet");
         final Method method = generateFunction();
         assertEquals(1, method.invoke(null));
         assertEquals(2, method.invoke(null));
@@ -73,7 +73,7 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testFieldSetter() throws Exception {
-        loadFile("fieldSetter.jet");
+        loadFile("properties/fieldSetter.jet");
         System.out.println(generateToText());
         final Method method = generateFunction("append");
         method.invoke(null, "IntelliJ ");
@@ -82,7 +82,7 @@ public class PropertyGenTest extends CodegenTestCase {
     }
 
     public void testFieldSetterPlusEq() throws Exception {
-        loadFile("fieldSetterPlusEq.jet");
+        loadFile("properties/fieldSetterPlusEq.jet");
         System.out.println(generateToText());
         final Method method = generateFunction("append");
         method.invoke(null, "IntelliJ ");