diff --git a/build-tools/build.xml b/build-tools/build.xml
index 66c9a2dcc2d..f98cc9956fb 100644
--- a/build-tools/build.xml
+++ b/build-tools/build.xml
@@ -2,7 +2,7 @@
 
     <property name="tests-dir"   location="${output}/ant-test/build-tools-test"/>
     <property name="tests-jar"   location="${tests-dir}/out.jar"/>
-    <property name="junit-jar"   location="${basedir}/libraries/testlib/lib/junit-4.9.jar"/>
+    <property name="junit-jar"   location="${basedir}/libraries/lib/junit-4.9.jar"/>
     <property name="failonerror" value="true"/>  <!-- Whether invoking compiled classes should file on error -->
     <property name="use-ivy"     value="false"/> <!-- Whether Ivy should be used to define "kotlin.classpath" and <kotlinc> task -->
                                                  <!-- Override with "-Duse-ivy=true" -->
@@ -378,19 +378,19 @@
     <macrodef name="testlib-tests">
         <sequential>
             <!-- Dir => Dir -->
-            <kotlinc-dir         src       = "${basedir}/libraries/testlib/test"/>
+            <kotlinc-dir         src       = "${basedir}/libraries/stdlib/test"/>
             <testlib-junit-tests classpath = "${tests-dir}"/>
 
             <!-- Dir => Jar -->
-            <kotlinc-jar         src       = "${basedir}/libraries/testlib/test"/>
+            <kotlinc-jar         src       = "${basedir}/libraries/stdlib/test"/>
             <testlib-junit-tests classpath = "${tests-jar}"/>
 
             <!-- Module => Explicit Jar -->
-            <kotlinc-jar         module    = "${basedir}/libraries/testlib/module.kt"/>
+            <kotlinc-jar         module    = "${basedir}/libraries/stdlib/testModule.kt"/>
             <testlib-junit-tests classpath = "${tests-jar}"/>
 
             <!-- Module => Default Jar -->
-            <kotlinc-jar         module    = "${basedir}/libraries/testlib/module.kt" jar=""/>
+            <kotlinc-jar         module    = "${basedir}/libraries/stdlib/testModule.kt" jar=""/>
             <move file="${basedir}/libraries/testlib/testlib.jar" todir="${tests-dir}"/>
             <testlib-junit-tests classpath = "${tests-dir}/testlib.jar"/>
         </sequential>
diff --git a/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java
index 752e15fc022..51ce5366485 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java
@@ -38,7 +38,7 @@ public class StdlibTest extends CodegenTestCase {
         super.setUp();
         createEnvironmentWithFullJdk();
         myEnvironment.addToClasspath(ForTestCompileStdlib.stdlibJarForTests());
-        File junitJar = new File("libraries/testlib/lib/junit-4.9.jar");
+        File junitJar = new File("libraries/lib/junit-4.9.jar");
 
         if (!junitJar.exists()) {
             throw new AssertionError();
diff --git a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
index c0852b71004..8f1b7f1de94 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
@@ -73,7 +73,7 @@ public class TestlibTest extends CodegenTestCase {
 
             myEnvironment.addToClasspath(ForTestCompileStdlib.stdlibJarForTests());
 
-            File junitJar = new File("libraries/testlib/lib/junit-4.9.jar");
+            File junitJar = new File("libraries/lib/junit-4.9.jar");
 
             if (!junitJar.exists()) {
                 throw new AssertionError();
diff --git a/libraries/kdoc/ApiDocsModule.kt b/libraries/kdoc/ApiDocsModule.kt
index 6237f370e08..137cc38e438 100644
--- a/libraries/kdoc/ApiDocsModule.kt
+++ b/libraries/kdoc/ApiDocsModule.kt
@@ -2,7 +2,7 @@ import kotlin.modules.*
 
 fun project() {
     module("apidocs") {
-        classpath += "../kunit/lib/junit-4.9.jar"
+        classpath += "../lib/junit-4.9.jar"
 
         addSourceFiles("../stdlib/src")
         addSourceFiles("../kunit/src/main/kotlin")
diff --git a/libraries/kunit/module.kt b/libraries/kunit/module.kt
index 7b6de7bf721..1e5a6b6154e 100644
--- a/libraries/kunit/module.kt
+++ b/libraries/kunit/module.kt
@@ -3,7 +3,7 @@ import kotlin.modules.*
 fun project() {
     module("kunit") {
         // TODO how to refer to the dir of the module?
-        classpath += "kunit/lib/junit-4.9.jar"
+        classpath += "lib/junit-4.9.jar"
 
         addSourceFiles("src/main/kotlin")
     }
diff --git a/libraries/kunit/lib/junit-4.9.jar b/libraries/lib/junit-4.9.jar
similarity index 100%
rename from libraries/kunit/lib/junit-4.9.jar
rename to libraries/lib/junit-4.9.jar
diff --git a/libraries/templatelib/src/TemplateCore.kt b/libraries/sandbox/templatelib/src/TemplateCore.kt
similarity index 100%
rename from libraries/templatelib/src/TemplateCore.kt
rename to libraries/sandbox/templatelib/src/TemplateCore.kt
diff --git a/libraries/templatelib/src/TemplateHtml.kt b/libraries/sandbox/templatelib/src/TemplateHtml.kt
similarity index 100%
rename from libraries/templatelib/src/TemplateHtml.kt
rename to libraries/sandbox/templatelib/src/TemplateHtml.kt
diff --git a/libraries/templatelib/src/TemplateJavaIo.kt b/libraries/sandbox/templatelib/src/TemplateJavaIo.kt
similarity index 100%
rename from libraries/templatelib/src/TemplateJavaIo.kt
rename to libraries/sandbox/templatelib/src/TemplateJavaIo.kt
diff --git a/libraries/templatelib/test/TemplateCoreTest.kt b/libraries/sandbox/templatelib/test/TemplateCoreTest.kt
similarity index 100%
rename from libraries/templatelib/test/TemplateCoreTest.kt
rename to libraries/sandbox/templatelib/test/TemplateCoreTest.kt
diff --git a/libraries/templatelib/test/TemplateHtmlTest.kt b/libraries/sandbox/templatelib/test/TemplateHtmlTest.kt
similarity index 100%
rename from libraries/templatelib/test/TemplateHtmlTest.kt
rename to libraries/sandbox/templatelib/test/TemplateHtmlTest.kt
diff --git a/libraries/templatelib/test/std/template/TemplateTestAll.java b/libraries/sandbox/templatelib/test/std/template/TemplateTestAll.java
similarity index 100%
rename from libraries/templatelib/test/std/template/TemplateTestAll.java
rename to libraries/sandbox/templatelib/test/std/template/TemplateTestAll.java
diff --git a/libraries/stdlib/testModule.kt b/libraries/stdlib/testModule.kt
new file mode 100644
index 00000000000..fcb1d44dc5e
--- /dev/null
+++ b/libraries/stdlib/testModule.kt
@@ -0,0 +1,9 @@
+import kotlin.modules.*
+
+fun project() {
+    module("testlib") {
+        classpath += "lib/junit-4.9.jar"
+
+        addSourceFiles("test")
+    }
+}
\ No newline at end of file
diff --git a/libraries/testlib/lib/junit-4.9.jar b/libraries/testlib/lib/junit-4.9.jar
deleted file mode 100644
index 14208156115..00000000000
Binary files a/libraries/testlib/lib/junit-4.9.jar and /dev/null differ
diff --git a/libraries/testlib/module.kt b/libraries/testlib/module.kt
deleted file mode 100644
index dd8310e6a17..00000000000
--- a/libraries/testlib/module.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-import kotlin.modules.*
-
-fun project() {
-    module("testlib") {
-        // TODO how to refer to the dir of the module?
-        classpath += "dist/kotlinc/lib/kotlin-test.jar"
-        classpath += "kunit/lib/junit-4.9.jar"
-
-        addSourceFiles("test")
-    }
-}
\ No newline at end of file