for consistency, moved extension functions on iterator/iterable/collection to the kotlin package rather than being split across kotlin and kotlin.util. Once intrinsic collections are here we could consider moving the java.util extension functions into kotlin.java.util

libraries/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt

@@ -5,7 +5,6 @@ import org.jetbrains.jet.compiler.CompileEnvironment
 import org.jetbrains.jet.cli.CompilerArguments
 import java.io.PrintStream
 import java.io.File
-import kotlin.util.orEmpty
 
 /**
  * Main for running the KDocCompiler

libraries/kotlin-jdbc/src/main/kotlin/kotlin/jdbc/ResultSets.kt

@@ -1,13 +1,13 @@
 package kotlin.jdbc
 
-import java.sql. *
+import java.sql.*
-import java.util.List
+import java.util.ArrayList
-import kotlin.util.arrayList
 import java.util.Collection
+import java.util.List
 
 /**
- * Creates an iterator through a [[ResultSet]]
+* Creates an iterator through a [[ResultSet]]
- */
+*/
 fun ResultSet.iterator() : Iterator<ResultSet> {
     val rs = this
     return object : Iterator<ResultSet>{
@@ -32,7 +32,7 @@ fun ResultSet.get(columnName: String): Any? = this.getObject(columnName)
  * Maps the collection of rows to some value
  */
 fun <T> ResultSet.map(fn: (ResultSet) -> T) : List<T> {
-    val answer = arrayList<T>()
+    val answer = ArrayList<T>()
     mapTo(answer, fn)
     return answer
 }

libraries/stdlib/src/JavaCollections.kt

@@ -1,4 +1,4 @@
-package kotlin.util
+package kotlin
 
 import java.util.*
 

libraries/stdlib/src/JavaIterables.kt

@@ -1,4 +1,4 @@
-package kotlin.util
+package kotlin
 
 import java.util.*
 

libraries/stdlib/src/JavaIterablesLazy.kt

@@ -1,4 +1,4 @@
-package kotlin.util
+package kotlin
 
 import java.util.*
 

libraries/stdlib/src/JavaIterablesSpecial.kt

@@ -1,4 +1,4 @@
-package kotlin.util
+package kotlin
 // Number of extension function for java.lang.Iterable that shouldn't participate in auto generation
 
 import java.util.Collection

libraries/stdlib/src/JavaUtil.kt

@@ -1,4 +1,4 @@
-package kotlin.util
+package kotlin
 
 import java.util.*
 import java.util.regex.Pattern

libraries/stdlib/src/JavaUtilMap.kt

@@ -1,4 +1,4 @@
-package kotlin.util
+package kotlin
 
 import java.util.Map as JMap
 import java.util.HashMap

libraries/stdlib/src/Nullables.kt

@@ -1,7 +1,6 @@
 package kotlin.nullable
 
 import java.util.*
-import kotlin.util.getOrPut
 
 /** Returns true if the element is not null and matches the given predicate */
 inline fun <T> T?.any(predicate: (T)-> Boolean): Boolean {

libraries/stdlib/src/generated/JavaUtilIterablesFromJavaCollections.kt

@@ -1,5 +1,5 @@
 // NOTE this file is auto-generated from src/JavaCollections.kt
-package kotlin.util
+package kotlin
 
 import java.util.*
 

libraries/stdlib/src/generated/JavaUtilIteratorsFromJavaIterables.kt

@@ -1,5 +1,5 @@
 // NOTE this file is auto-generated from src/JavaIterables.kt
-package kotlin.util
+package kotlin
 
 import java.util.*
 

libraries/stdlib/test/GenerateStandardLib.kt

@@ -63,7 +63,7 @@ fun main(args: Array<String>) {
         it.replaceAll("java.lang.Iterable<T", "Iterable<T")
     }
 
-    generateFile(File(outDir, "JavaUtilIteratorsFromJavaIterables.kt"), "package kotlin.util", File(srcDir, "JavaIterables.kt")) {
+    generateFile(File(outDir, "JavaUtilIteratorsFromJavaIterables.kt"), "package kotlin", File(srcDir, "JavaIterables.kt")) {
         it.replaceAll("java.lang.Iterable<T", "java.util.Iterator<T")
     }
 
@@ -74,7 +74,7 @@ fun main(args: Array<String>) {
         it.replaceAll("java.util.Collection<T", "Array<T")
     }
 
-    generateFile(File(outDir, "JavaUtilIterablesFromJavaCollections.kt"), "package kotlin.util", File(srcDir, "JavaCollections.kt")) {
+    generateFile(File(outDir, "JavaUtilIterablesFromJavaCollections.kt"), "package kotlin", File(srcDir, "JavaCollections.kt")) {
         it.replaceAll("java.util.Collection<T", "java.lang.Iterable<T").replaceAll("(this.size)", "")
     }
 

libraries/stdlib/test/regressions/Kt1617Test.kt

@@ -1,8 +1,7 @@
 package regressions
 
 // TODO comment out the next line to reproduce KT-1617
-import kotlin.util.map
+//import kotlin.util.map
-import kotlin.util.arrayList
 
 import java.util.Collection
 import java.io.File

libraries/stdlib/test/regressions/Kt1619Test.kt

@@ -2,7 +2,6 @@ package regressions
 
 import junit.framework.TestCase
 import java.util.List
-import kotlin.util.arrayList
 
 class Kt1619Test: TestCase() {
 

libraries/website/src/test/kotlin/org/jetbrains/kotlin/site/GenerateSiteTest.kt

@@ -2,7 +2,6 @@ package org.jetbrains.kotlin.site
 
 import junit.framework.TestCase
 import java.io.File
-import kotlin.util.arrayList
 import org.jetbrains.kotlin.doc.KDocArguments
 import org.jetbrains.kotlin.doc.KDocCompiler