diff --git a/libraries/stdlib/src/Arrays.kt b/libraries/stdlib/src/kotlin/Arrays.kt
similarity index 100%
rename from libraries/stdlib/src/Arrays.kt
rename to libraries/stdlib/src/kotlin/Arrays.kt
diff --git a/libraries/stdlib/src/Integer.kt b/libraries/stdlib/src/kotlin/Integer.kt
similarity index 100%
rename from libraries/stdlib/src/Integer.kt
rename to libraries/stdlib/src/kotlin/Integer.kt
diff --git a/libraries/stdlib/src/Iterators.kt b/libraries/stdlib/src/kotlin/Iterators.kt
similarity index 100%
rename from libraries/stdlib/src/Iterators.kt
rename to libraries/stdlib/src/kotlin/Iterators.kt
diff --git a/libraries/stdlib/src/JavaCollections.kt b/libraries/stdlib/src/kotlin/JavaCollections.kt
similarity index 100%
rename from libraries/stdlib/src/JavaCollections.kt
rename to libraries/stdlib/src/kotlin/JavaCollections.kt
diff --git a/libraries/stdlib/src/JavaIterables.kt b/libraries/stdlib/src/kotlin/JavaIterables.kt
similarity index 99%
rename from libraries/stdlib/src/JavaIterables.kt
rename to libraries/stdlib/src/kotlin/JavaIterables.kt
index 623514bab8d..94d6d9e31cf 100644
--- a/libraries/stdlib/src/JavaIterables.kt
+++ b/libraries/stdlib/src/kotlin/JavaIterables.kt
@@ -5,7 +5,7 @@ import java.util.*
 /**
  * Returns true if any elements in the collection match the given predicate
  *
- * @includeFunction ../test/CollectionTest.kt any
+ * @includeFunction ../../test/CollectionTest.kt any
  */
 inline fun <T> java.lang.Iterable<T>.any(predicate: (T)-> Boolean) : Boolean {
   for (elem in this) {
diff --git a/libraries/stdlib/src/JavaIterablesLazy.kt b/libraries/stdlib/src/kotlin/JavaIterablesLazy.kt
similarity index 100%
rename from libraries/stdlib/src/JavaIterablesLazy.kt
rename to libraries/stdlib/src/kotlin/JavaIterablesLazy.kt
diff --git a/libraries/stdlib/src/JavaIterablesSpecial.kt b/libraries/stdlib/src/kotlin/JavaIterablesSpecial.kt
similarity index 100%
rename from libraries/stdlib/src/JavaIterablesSpecial.kt
rename to libraries/stdlib/src/kotlin/JavaIterablesSpecial.kt
diff --git a/libraries/stdlib/src/JavaLang.kt b/libraries/stdlib/src/kotlin/JavaLang.kt
similarity index 100%
rename from libraries/stdlib/src/JavaLang.kt
rename to libraries/stdlib/src/kotlin/JavaLang.kt
diff --git a/libraries/stdlib/src/JavaUtil.kt b/libraries/stdlib/src/kotlin/JavaUtil.kt
similarity index 100%
rename from libraries/stdlib/src/JavaUtil.kt
rename to libraries/stdlib/src/kotlin/JavaUtil.kt
diff --git a/libraries/stdlib/src/JavaUtilMap.kt b/libraries/stdlib/src/kotlin/JavaUtilMap.kt
similarity index 100%
rename from libraries/stdlib/src/JavaUtilMap.kt
rename to libraries/stdlib/src/kotlin/JavaUtilMap.kt
diff --git a/libraries/stdlib/src/Ordering.kt b/libraries/stdlib/src/kotlin/Ordering.kt
similarity index 100%
rename from libraries/stdlib/src/Ordering.kt
rename to libraries/stdlib/src/kotlin/Ordering.kt
diff --git a/libraries/stdlib/src/Preconditions.kt b/libraries/stdlib/src/kotlin/Preconditions.kt
similarity index 100%
rename from libraries/stdlib/src/Preconditions.kt
rename to libraries/stdlib/src/kotlin/Preconditions.kt
diff --git a/libraries/stdlib/src/Standard.kt b/libraries/stdlib/src/kotlin/Standard.kt
similarity index 100%
rename from libraries/stdlib/src/Standard.kt
rename to libraries/stdlib/src/kotlin/Standard.kt
diff --git a/libraries/stdlib/src/String.kt b/libraries/stdlib/src/kotlin/String.kt
similarity index 100%
rename from libraries/stdlib/src/String.kt
rename to libraries/stdlib/src/kotlin/String.kt
diff --git a/libraries/stdlib/src/concurrent/FunctionalList.kt b/libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt
similarity index 100%
rename from libraries/stdlib/src/concurrent/FunctionalList.kt
rename to libraries/stdlib/src/kotlin/concurrent/FunctionalList.kt
diff --git a/libraries/stdlib/src/concurrent/FunctionalQueue.kt b/libraries/stdlib/src/kotlin/concurrent/FunctionalQueue.kt
similarity index 100%
rename from libraries/stdlib/src/concurrent/FunctionalQueue.kt
rename to libraries/stdlib/src/kotlin/concurrent/FunctionalQueue.kt
diff --git a/libraries/stdlib/src/concurrent/Locks.kt b/libraries/stdlib/src/kotlin/concurrent/Locks.kt
similarity index 100%
rename from libraries/stdlib/src/concurrent/Locks.kt
rename to libraries/stdlib/src/kotlin/concurrent/Locks.kt
diff --git a/libraries/stdlib/src/concurrent/Thread.kt b/libraries/stdlib/src/kotlin/concurrent/Thread.kt
similarity index 100%
rename from libraries/stdlib/src/concurrent/Thread.kt
rename to libraries/stdlib/src/kotlin/concurrent/Thread.kt
diff --git a/libraries/stdlib/src/concurrent/Timer.kt b/libraries/stdlib/src/kotlin/concurrent/Timer.kt
similarity index 100%
rename from libraries/stdlib/src/concurrent/Timer.kt
rename to libraries/stdlib/src/kotlin/concurrent/Timer.kt
diff --git a/libraries/stdlib/src/dom/Dom.kt b/libraries/stdlib/src/kotlin/dom/Dom.kt
similarity index 100%
rename from libraries/stdlib/src/dom/Dom.kt
rename to libraries/stdlib/src/kotlin/dom/Dom.kt
diff --git a/libraries/stdlib/src/dom/DomJVM.kt b/libraries/stdlib/src/kotlin/dom/DomJVM.kt
similarity index 100%
rename from libraries/stdlib/src/dom/DomJVM.kt
rename to libraries/stdlib/src/kotlin/dom/DomJVM.kt
diff --git a/libraries/stdlib/src/JavaIo.kt b/libraries/stdlib/src/kotlin/io/JavaIo.kt
similarity index 100%
rename from libraries/stdlib/src/JavaIo.kt
rename to libraries/stdlib/src/kotlin/io/JavaIo.kt
diff --git a/libraries/stdlib/src/JavaMath.kt b/libraries/stdlib/src/kotlin/math/JavaMath.kt
similarity index 100%
rename from libraries/stdlib/src/JavaMath.kt
rename to libraries/stdlib/src/kotlin/math/JavaMath.kt
diff --git a/libraries/stdlib/src/modules/ModuleBuilder.kt b/libraries/stdlib/src/kotlin/modules/ModuleBuilder.kt
similarity index 100%
rename from libraries/stdlib/src/modules/ModuleBuilder.kt
rename to libraries/stdlib/src/kotlin/modules/ModuleBuilder.kt
diff --git a/libraries/stdlib/src/Nullables.kt b/libraries/stdlib/src/kotlin/nullable/Nullables.kt
similarity index 100%
rename from libraries/stdlib/src/Nullables.kt
rename to libraries/stdlib/src/kotlin/nullable/Nullables.kt
diff --git a/libraries/stdlib/src/properties/Properties.kt b/libraries/stdlib/src/kotlin/properties/Properties.kt
similarity index 100%
rename from libraries/stdlib/src/properties/Properties.kt
rename to libraries/stdlib/src/kotlin/properties/Properties.kt
diff --git a/libraries/stdlib/src/support/AbstractIterator.kt b/libraries/stdlib/src/kotlin/support/AbstractIterator.kt
similarity index 100%
rename from libraries/stdlib/src/support/AbstractIterator.kt
rename to libraries/stdlib/src/kotlin/support/AbstractIterator.kt
diff --git a/libraries/stdlib/src/test/Test.kt b/libraries/stdlib/src/kotlin/test/Test.kt
similarity index 100%
rename from libraries/stdlib/src/test/Test.kt
rename to libraries/stdlib/src/kotlin/test/Test.kt
diff --git a/libraries/stdlib/src/System.kt b/libraries/stdlib/src/kotlin/util/System.kt
similarity index 100%
rename from libraries/stdlib/src/System.kt
rename to libraries/stdlib/src/kotlin/util/System.kt