diff --git a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
index e92d9cf9d756..a5683b5afe02 100644
--- a/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
+++ b/compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala
@@ -1178,8 +1178,8 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
         val arity = field.meth.tpe.widenDealias.paramTypes.size - _1.size
         val returnsUnit = field.meth.tpe.widenDealias.resultType.classSymbol == UnitClass
         if (returnsUnit)
-          ctx.requiredClass(("scala.compat.java8.JProcedure" + arity))
-        else ctx.requiredClass(("scala.compat.java8.JFunction" + arity))
+          ctx.requiredClass(("dotty.runtime.function.JProcedure" + arity))
+        else ctx.requiredClass(("dotty.runtime.function.JFunction" + arity))
       }
     }
   }
diff --git a/compiler/src/dotty/tools/dotc/transform/FunctionalInterfaces.scala b/compiler/src/dotty/tools/dotc/transform/FunctionalInterfaces.scala
index 94c6b3d233ff..a685219ad69c 100644
--- a/compiler/src/dotty/tools/dotc/transform/FunctionalInterfaces.scala
+++ b/compiler/src/dotty/tools/dotc/transform/FunctionalInterfaces.scala
@@ -24,7 +24,7 @@ class FunctionalInterfaces extends MiniPhase {
   def phaseName: String = FunctionalInterfaces.name
 
   private[this] val functionName = "JFunction".toTermName
-  private[this] val functionPackage = "scala.compat.java8.".toTermName
+  private[this] val functionPackage = "dotty.runtime.function.".toTermName
 
   override def transformClosure(tree: Closure)(implicit ctx: Context): Tree = {
     val cls = tree.tpe.widen.classSymbol.asClass
diff --git a/library/src/scala/compat/java8/JFunction.java b/library/src/dotty/runtime/function/JFunction.java
similarity index 99%
rename from library/src/scala/compat/java8/JFunction.java
rename to library/src/dotty/runtime/function/JFunction.java
index d68805d08f15..a5f43a6d5b0c 100644
--- a/library/src/scala/compat/java8/JFunction.java
+++ b/library/src/dotty/runtime/function/JFunction.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JFunction0$mcB$sp.java b/library/src/dotty/runtime/function/JFunction0$mcB$sp.java
similarity index 88%
rename from library/src/scala/compat/java8/JFunction0$mcB$sp.java
rename to library/src/dotty/runtime/function/JFunction0$mcB$sp.java
index 354667b63c16..9c9697569f3a 100644
--- a/library/src/scala/compat/java8/JFunction0$mcB$sp.java
+++ b/library/src/dotty/runtime/function/JFunction0$mcB$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction0$mcB$sp extends JFunction0 {
diff --git a/library/src/scala/compat/java8/JFunction0$mcC$sp.java b/library/src/dotty/runtime/function/JFunction0$mcC$sp.java
similarity index 88%
rename from library/src/scala/compat/java8/JFunction0$mcC$sp.java
rename to library/src/dotty/runtime/function/JFunction0$mcC$sp.java
index 85c1d25e85a2..3db431e45160 100644
--- a/library/src/scala/compat/java8/JFunction0$mcC$sp.java
+++ b/library/src/dotty/runtime/function/JFunction0$mcC$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction0$mcC$sp extends JFunction0 {
diff --git a/library/src/scala/compat/java8/JFunction0$mcD$sp.java b/library/src/dotty/runtime/function/JFunction0$mcD$sp.java
similarity index 88%
rename from library/src/scala/compat/java8/JFunction0$mcD$sp.java
rename to library/src/dotty/runtime/function/JFunction0$mcD$sp.java
index e430cddd77bb..1a0622b5ea10 100644
--- a/library/src/scala/compat/java8/JFunction0$mcD$sp.java
+++ b/library/src/dotty/runtime/function/JFunction0$mcD$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction0$mcD$sp extends JFunction0 {
diff --git a/library/src/scala/compat/java8/JFunction0$mcF$sp.java b/library/src/dotty/runtime/function/JFunction0$mcF$sp.java
similarity index 88%
rename from library/src/scala/compat/java8/JFunction0$mcF$sp.java
rename to library/src/dotty/runtime/function/JFunction0$mcF$sp.java
index e839d1edf5e1..e207447dd8dc 100644
--- a/library/src/scala/compat/java8/JFunction0$mcF$sp.java
+++ b/library/src/dotty/runtime/function/JFunction0$mcF$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction0$mcF$sp extends JFunction0 {
diff --git a/library/src/scala/compat/java8/JFunction0$mcI$sp.java b/library/src/dotty/runtime/function/JFunction0$mcI$sp.java
similarity index 88%
rename from library/src/scala/compat/java8/JFunction0$mcI$sp.java
rename to library/src/dotty/runtime/function/JFunction0$mcI$sp.java
index 6d592a41edf6..f983fb344606 100644
--- a/library/src/scala/compat/java8/JFunction0$mcI$sp.java
+++ b/library/src/dotty/runtime/function/JFunction0$mcI$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction0$mcI$sp extends JFunction0 {
diff --git a/library/src/scala/compat/java8/JFunction0$mcJ$sp.java b/library/src/dotty/runtime/function/JFunction0$mcJ$sp.java
similarity index 88%
rename from library/src/scala/compat/java8/JFunction0$mcJ$sp.java
rename to library/src/dotty/runtime/function/JFunction0$mcJ$sp.java
index 8347b0df1a35..d45e4a54d8be 100644
--- a/library/src/scala/compat/java8/JFunction0$mcJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction0$mcJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction0$mcJ$sp extends JFunction0 {
diff --git a/library/src/scala/compat/java8/JFunction0$mcS$sp.java b/library/src/dotty/runtime/function/JFunction0$mcS$sp.java
similarity index 88%
rename from library/src/scala/compat/java8/JFunction0$mcS$sp.java
rename to library/src/dotty/runtime/function/JFunction0$mcS$sp.java
index dede12cf1189..8b89d6c05645 100644
--- a/library/src/scala/compat/java8/JFunction0$mcS$sp.java
+++ b/library/src/dotty/runtime/function/JFunction0$mcS$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction0$mcS$sp extends JFunction0 {
diff --git a/library/src/scala/compat/java8/JFunction0$mcV$sp.java b/library/src/dotty/runtime/function/JFunction0$mcV$sp.java
similarity index 89%
rename from library/src/scala/compat/java8/JFunction0$mcV$sp.java
rename to library/src/dotty/runtime/function/JFunction0$mcV$sp.java
index 933c9a28a43d..4ff93e1808f5 100644
--- a/library/src/scala/compat/java8/JFunction0$mcV$sp.java
+++ b/library/src/dotty/runtime/function/JFunction0$mcV$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction0$mcV$sp extends JFunction0 {
diff --git a/library/src/scala/compat/java8/JFunction0$mcZ$sp.java b/library/src/dotty/runtime/function/JFunction0$mcZ$sp.java
similarity index 88%
rename from library/src/scala/compat/java8/JFunction0$mcZ$sp.java
rename to library/src/dotty/runtime/function/JFunction0$mcZ$sp.java
index c51141b00d03..0c64d841d01e 100644
--- a/library/src/scala/compat/java8/JFunction0$mcZ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction0$mcZ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction0$mcZ$sp extends JFunction0 {
diff --git a/library/src/scala/compat/java8/JFunction0.java b/library/src/dotty/runtime/function/JFunction0.java
similarity index 97%
rename from library/src/scala/compat/java8/JFunction0.java
rename to library/src/dotty/runtime/function/JFunction0.java
index 87a9e26f8b61..a5ffe005eb5d 100644
--- a/library/src/scala/compat/java8/JFunction0.java
+++ b/library/src/dotty/runtime/function/JFunction0.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction0<R> extends scala.Function0<R>, java.io.Serializable {
diff --git a/library/src/scala/compat/java8/JFunction1$mcDD$sp.java b/library/src/dotty/runtime/function/JFunction1$mcDD$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcDD$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcDD$sp.java
index 70d022190b71..3f9b7e183af0 100644
--- a/library/src/scala/compat/java8/JFunction1$mcDD$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcDD$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcDD$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcDF$sp.java b/library/src/dotty/runtime/function/JFunction1$mcDF$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcDF$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcDF$sp.java
index f2f9b9f4a2da..7b570cfee3cb 100644
--- a/library/src/scala/compat/java8/JFunction1$mcDF$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcDF$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcDF$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcDI$sp.java b/library/src/dotty/runtime/function/JFunction1$mcDI$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcDI$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcDI$sp.java
index 69831d571d5e..ee20690bae11 100644
--- a/library/src/scala/compat/java8/JFunction1$mcDI$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcDI$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcDI$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcDJ$sp.java b/library/src/dotty/runtime/function/JFunction1$mcDJ$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcDJ$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcDJ$sp.java
index 1ee4888915e0..df3b8f29dafa 100644
--- a/library/src/scala/compat/java8/JFunction1$mcDJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcDJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcDJ$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcFD$sp.java b/library/src/dotty/runtime/function/JFunction1$mcFD$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcFD$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcFD$sp.java
index a5ccf1f8636a..2fb150fedc3e 100644
--- a/library/src/scala/compat/java8/JFunction1$mcFD$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcFD$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcFD$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcFF$sp.java b/library/src/dotty/runtime/function/JFunction1$mcFF$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcFF$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcFF$sp.java
index ae154e7594b4..84454e9eed1d 100644
--- a/library/src/scala/compat/java8/JFunction1$mcFF$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcFF$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcFF$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcFI$sp.java b/library/src/dotty/runtime/function/JFunction1$mcFI$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcFI$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcFI$sp.java
index 8df70b9bc1ba..9a4140eb71b0 100644
--- a/library/src/scala/compat/java8/JFunction1$mcFI$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcFI$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcFI$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcFJ$sp.java b/library/src/dotty/runtime/function/JFunction1$mcFJ$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcFJ$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcFJ$sp.java
index 5499557c4f13..07b890be6bcb 100644
--- a/library/src/scala/compat/java8/JFunction1$mcFJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcFJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcFJ$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcID$sp.java b/library/src/dotty/runtime/function/JFunction1$mcID$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcID$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcID$sp.java
index bea137f5e4d7..fdf45522747d 100644
--- a/library/src/scala/compat/java8/JFunction1$mcID$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcID$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcID$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcIF$sp.java b/library/src/dotty/runtime/function/JFunction1$mcIF$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcIF$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcIF$sp.java
index 497b6288b930..34cb92bf9321 100644
--- a/library/src/scala/compat/java8/JFunction1$mcIF$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcIF$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcIF$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcII$sp.java b/library/src/dotty/runtime/function/JFunction1$mcII$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcII$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcII$sp.java
index feea8ab7412c..f9dd9eb42339 100644
--- a/library/src/scala/compat/java8/JFunction1$mcII$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcII$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcII$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcIJ$sp.java b/library/src/dotty/runtime/function/JFunction1$mcIJ$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcIJ$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcIJ$sp.java
index 7da145410314..14fe725ab591 100644
--- a/library/src/scala/compat/java8/JFunction1$mcIJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcIJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcIJ$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcJD$sp.java b/library/src/dotty/runtime/function/JFunction1$mcJD$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcJD$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcJD$sp.java
index ab9e8b9c778a..ae72d57ce6ea 100644
--- a/library/src/scala/compat/java8/JFunction1$mcJD$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcJD$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcJD$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcJF$sp.java b/library/src/dotty/runtime/function/JFunction1$mcJF$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcJF$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcJF$sp.java
index f664ffd14f0f..3dd9043cf3a6 100644
--- a/library/src/scala/compat/java8/JFunction1$mcJF$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcJF$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcJF$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcJI$sp.java b/library/src/dotty/runtime/function/JFunction1$mcJI$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcJI$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcJI$sp.java
index 2914e4d66852..58d24f4dfa05 100644
--- a/library/src/scala/compat/java8/JFunction1$mcJI$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcJI$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcJI$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcJJ$sp.java b/library/src/dotty/runtime/function/JFunction1$mcJJ$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcJJ$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcJJ$sp.java
index cf61bd20ff8b..7bc1122975ce 100644
--- a/library/src/scala/compat/java8/JFunction1$mcJJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcJJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcJJ$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcVD$sp.java b/library/src/dotty/runtime/function/JFunction1$mcVD$sp.java
similarity index 91%
rename from library/src/scala/compat/java8/JFunction1$mcVD$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcVD$sp.java
index eadc0ebd8a21..d2bd8add39ad 100644
--- a/library/src/scala/compat/java8/JFunction1$mcVD$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcVD$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcVD$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcVF$sp.java b/library/src/dotty/runtime/function/JFunction1$mcVF$sp.java
similarity index 91%
rename from library/src/scala/compat/java8/JFunction1$mcVF$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcVF$sp.java
index a684e83257db..996f2b4eb7c4 100644
--- a/library/src/scala/compat/java8/JFunction1$mcVF$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcVF$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcVF$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcVI$sp.java b/library/src/dotty/runtime/function/JFunction1$mcVI$sp.java
similarity index 91%
rename from library/src/scala/compat/java8/JFunction1$mcVI$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcVI$sp.java
index 0e9fe5786d3b..bb859ffee4d8 100644
--- a/library/src/scala/compat/java8/JFunction1$mcVI$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcVI$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcVI$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcVJ$sp.java b/library/src/dotty/runtime/function/JFunction1$mcVJ$sp.java
similarity index 91%
rename from library/src/scala/compat/java8/JFunction1$mcVJ$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcVJ$sp.java
index a3f3fb2a327a..343a82158fca 100644
--- a/library/src/scala/compat/java8/JFunction1$mcVJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcVJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcVJ$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcZD$sp.java b/library/src/dotty/runtime/function/JFunction1$mcZD$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcZD$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcZD$sp.java
index 8b4f880e55d6..4042c3710521 100644
--- a/library/src/scala/compat/java8/JFunction1$mcZD$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcZD$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcZD$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcZF$sp.java b/library/src/dotty/runtime/function/JFunction1$mcZF$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcZF$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcZF$sp.java
index 8e52ef672b26..6dcddbae8f04 100644
--- a/library/src/scala/compat/java8/JFunction1$mcZF$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcZF$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcZF$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcZI$sp.java b/library/src/dotty/runtime/function/JFunction1$mcZI$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcZI$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcZI$sp.java
index 9ba30ee63841..a0d129807dce 100644
--- a/library/src/scala/compat/java8/JFunction1$mcZI$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcZI$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcZI$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1$mcZJ$sp.java b/library/src/dotty/runtime/function/JFunction1$mcZJ$sp.java
similarity index 90%
rename from library/src/scala/compat/java8/JFunction1$mcZJ$sp.java
rename to library/src/dotty/runtime/function/JFunction1$mcZJ$sp.java
index f08b41c252d0..b1e76ca39f50 100644
--- a/library/src/scala/compat/java8/JFunction1$mcZJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction1$mcZJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1$mcZJ$sp extends JFunction1 {
diff --git a/library/src/scala/compat/java8/JFunction1.java b/library/src/dotty/runtime/function/JFunction1.java
similarity index 99%
rename from library/src/scala/compat/java8/JFunction1.java
rename to library/src/dotty/runtime/function/JFunction1.java
index d1b526d5b5b8..718f90bc6e46 100644
--- a/library/src/scala/compat/java8/JFunction1.java
+++ b/library/src/dotty/runtime/function/JFunction1.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction1<T1, R> extends scala.Function1<T1, R>, java.io.Serializable {
diff --git a/library/src/scala/compat/java8/JFunction10.java b/library/src/dotty/runtime/function/JFunction10.java
similarity index 96%
rename from library/src/scala/compat/java8/JFunction10.java
rename to library/src/dotty/runtime/function/JFunction10.java
index a31517e551fe..97ac03e6a8c6 100644
--- a/library/src/scala/compat/java8/JFunction10.java
+++ b/library/src/dotty/runtime/function/JFunction10.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R> extends scala.Function10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R>, java.io.Serializable {
diff --git a/library/src/scala/compat/java8/JFunction11.java b/library/src/dotty/runtime/function/JFunction11.java
similarity index 96%
rename from library/src/scala/compat/java8/JFunction11.java
rename to library/src/dotty/runtime/function/JFunction11.java
index 123ae015361b..a71bf06e249e 100644
--- a/library/src/scala/compat/java8/JFunction11.java
+++ b/library/src/dotty/runtime/function/JFunction11.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R> extends scala.Function11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, R>, java.io.Serializable {
diff --git a/library/src/scala/compat/java8/JFunction12.java b/library/src/dotty/runtime/function/JFunction12.java
similarity index 96%
rename from library/src/scala/compat/java8/JFunction12.java
rename to library/src/dotty/runtime/function/JFunction12.java
index 9da50de2edbd..5c36a2f3be9f 100644
--- a/library/src/scala/compat/java8/JFunction12.java
+++ b/library/src/dotty/runtime/function/JFunction12.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R> extends scala.Function12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, R>, java.io.Serializable {
diff --git a/library/src/scala/compat/java8/JFunction13.java b/library/src/dotty/runtime/function/JFunction13.java
similarity index 96%
rename from library/src/scala/compat/java8/JFunction13.java
rename to library/src/dotty/runtime/function/JFunction13.java
index 76c78158ab44..e0ea5e4b46d0 100644
--- a/library/src/scala/compat/java8/JFunction13.java
+++ b/library/src/dotty/runtime/function/JFunction13.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, R> extends scala.Function13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, R>, java.io.Serializable {
diff --git a/library/src/scala/compat/java8/JFunction14.java b/library/src/dotty/runtime/function/JFunction14.java
similarity index 96%
rename from library/src/scala/compat/java8/JFunction14.java
rename to library/src/dotty/runtime/function/JFunction14.java
index 74c37e64571f..1997832b3b65 100644
--- a/library/src/scala/compat/java8/JFunction14.java
+++ b/library/src/dotty/runtime/function/JFunction14.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, R> extends scala.Function14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, R>, java.io.Serializable {
diff --git a/library/src/scala/compat/java8/JFunction15.java b/library/src/dotty/runtime/function/JFunction15.java
similarity index 96%
rename from library/src/scala/compat/java8/JFunction15.java
rename to library/src/dotty/runtime/function/JFunction15.java
index 68dd9b7cfcc3..98cdc2d0fbdc 100644
--- a/library/src/scala/compat/java8/JFunction15.java
+++ b/library/src/dotty/runtime/function/JFunction15.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, R> extends scala.Function15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, R>, java.io.Serializable {
diff --git a/library/src/scala/compat/java8/JFunction16.java b/library/src/dotty/runtime/function/JFunction16.java
similarity index 97%
rename from library/src/scala/compat/java8/JFunction16.java
rename to library/src/dotty/runtime/function/JFunction16.java
index 73aa9328b36e..46860c1ae072 100644
--- a/library/src/scala/compat/java8/JFunction16.java
+++ b/library/src/dotty/runtime/function/JFunction16.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, R> extends scala.Function16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, R>, java.io.Serializable {
diff --git a/library/src/scala/compat/java8/JFunction17.java b/library/src/dotty/runtime/function/JFunction17.java
similarity index 97%
rename from library/src/scala/compat/java8/JFunction17.java
rename to library/src/dotty/runtime/function/JFunction17.java
index fb225de5ed1a..0424be70e002 100644
--- a/library/src/scala/compat/java8/JFunction17.java
+++ b/library/src/dotty/runtime/function/JFunction17.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, R> extends scala.Function17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, R>, java.io.Serializable {
diff --git a/library/src/scala/compat/java8/JFunction18.java b/library/src/dotty/runtime/function/JFunction18.java
similarity index 97%
rename from library/src/scala/compat/java8/JFunction18.java
rename to library/src/dotty/runtime/function/JFunction18.java
index a1f796df9030..66df833ff5da 100644
--- a/library/src/scala/compat/java8/JFunction18.java
+++ b/library/src/dotty/runtime/function/JFunction18.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, R> extends scala.Function18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, R>, java.io.Serializable {
diff --git a/library/src/scala/compat/java8/JFunction19.java b/library/src/dotty/runtime/function/JFunction19.java
similarity index 97%
rename from library/src/scala/compat/java8/JFunction19.java
rename to library/src/dotty/runtime/function/JFunction19.java
index c446f6c21815..fb11b0ec6c22 100644
--- a/library/src/scala/compat/java8/JFunction19.java
+++ b/library/src/dotty/runtime/function/JFunction19.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, R> extends scala.Function19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, R>, java.io.Serializable {
diff --git a/library/src/scala/compat/java8/JFunction2$mcDDD$sp.java b/library/src/dotty/runtime/function/JFunction2$mcDDD$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcDDD$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcDDD$sp.java
index 25c00fa389ac..e3fd5f5a6769 100644
--- a/library/src/scala/compat/java8/JFunction2$mcDDD$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcDDD$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcDDD$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcDDI$sp.java b/library/src/dotty/runtime/function/JFunction2$mcDDI$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcDDI$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcDDI$sp.java
index 60c5ba09ea86..53c936350894 100644
--- a/library/src/scala/compat/java8/JFunction2$mcDDI$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcDDI$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcDDI$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcDDJ$sp.java b/library/src/dotty/runtime/function/JFunction2$mcDDJ$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcDDJ$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcDDJ$sp.java
index 411f6344e142..383ad215c3da 100644
--- a/library/src/scala/compat/java8/JFunction2$mcDDJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcDDJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcDDJ$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcDID$sp.java b/library/src/dotty/runtime/function/JFunction2$mcDID$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcDID$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcDID$sp.java
index 0421e7cf32d3..443ebb76dde1 100644
--- a/library/src/scala/compat/java8/JFunction2$mcDID$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcDID$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcDID$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcDII$sp.java b/library/src/dotty/runtime/function/JFunction2$mcDII$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcDII$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcDII$sp.java
index 0cffa4a58795..bf0499d3b4f9 100644
--- a/library/src/scala/compat/java8/JFunction2$mcDII$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcDII$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcDII$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcDIJ$sp.java b/library/src/dotty/runtime/function/JFunction2$mcDIJ$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcDIJ$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcDIJ$sp.java
index 7df47601509d..589af38ddf72 100644
--- a/library/src/scala/compat/java8/JFunction2$mcDIJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcDIJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcDIJ$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcDJD$sp.java b/library/src/dotty/runtime/function/JFunction2$mcDJD$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcDJD$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcDJD$sp.java
index 30022821af7c..203fd3164e35 100644
--- a/library/src/scala/compat/java8/JFunction2$mcDJD$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcDJD$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcDJD$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcDJI$sp.java b/library/src/dotty/runtime/function/JFunction2$mcDJI$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcDJI$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcDJI$sp.java
index 43722952f6ab..f1c889c66cd0 100644
--- a/library/src/scala/compat/java8/JFunction2$mcDJI$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcDJI$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcDJI$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcDJJ$sp.java b/library/src/dotty/runtime/function/JFunction2$mcDJJ$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcDJJ$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcDJJ$sp.java
index f8cae017ac41..18f4f6a005c5 100644
--- a/library/src/scala/compat/java8/JFunction2$mcDJJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcDJJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcDJJ$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcFDD$sp.java b/library/src/dotty/runtime/function/JFunction2$mcFDD$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcFDD$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcFDD$sp.java
index eab9f2b08f49..9fcb2489aceb 100644
--- a/library/src/scala/compat/java8/JFunction2$mcFDD$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcFDD$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcFDD$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcFDI$sp.java b/library/src/dotty/runtime/function/JFunction2$mcFDI$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcFDI$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcFDI$sp.java
index c7c589c329cc..9880b607e793 100644
--- a/library/src/scala/compat/java8/JFunction2$mcFDI$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcFDI$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcFDI$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcFDJ$sp.java b/library/src/dotty/runtime/function/JFunction2$mcFDJ$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcFDJ$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcFDJ$sp.java
index 0711b7323f90..d514e77af3cb 100644
--- a/library/src/scala/compat/java8/JFunction2$mcFDJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcFDJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcFDJ$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcFID$sp.java b/library/src/dotty/runtime/function/JFunction2$mcFID$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcFID$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcFID$sp.java
index ddaa6d041be1..c59974f0ab7d 100644
--- a/library/src/scala/compat/java8/JFunction2$mcFID$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcFID$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcFID$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcFII$sp.java b/library/src/dotty/runtime/function/JFunction2$mcFII$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcFII$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcFII$sp.java
index 81a864e780f8..7c3e7af963c2 100644
--- a/library/src/scala/compat/java8/JFunction2$mcFII$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcFII$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcFII$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcFIJ$sp.java b/library/src/dotty/runtime/function/JFunction2$mcFIJ$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcFIJ$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcFIJ$sp.java
index 3e5d4a8fc28a..2fdeac11d8d2 100644
--- a/library/src/scala/compat/java8/JFunction2$mcFIJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcFIJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcFIJ$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcFJD$sp.java b/library/src/dotty/runtime/function/JFunction2$mcFJD$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcFJD$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcFJD$sp.java
index 40f999d39c39..74e7252e41e3 100644
--- a/library/src/scala/compat/java8/JFunction2$mcFJD$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcFJD$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcFJD$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcFJI$sp.java b/library/src/dotty/runtime/function/JFunction2$mcFJI$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcFJI$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcFJI$sp.java
index ffda55e5977c..a8a53d7097d9 100644
--- a/library/src/scala/compat/java8/JFunction2$mcFJI$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcFJI$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcFJI$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcFJJ$sp.java b/library/src/dotty/runtime/function/JFunction2$mcFJJ$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcFJJ$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcFJJ$sp.java
index 73585756fd62..2c96fc46275e 100644
--- a/library/src/scala/compat/java8/JFunction2$mcFJJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcFJJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcFJJ$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcIDD$sp.java b/library/src/dotty/runtime/function/JFunction2$mcIDD$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcIDD$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcIDD$sp.java
index 55a679cfaea1..daf6f5308a74 100644
--- a/library/src/scala/compat/java8/JFunction2$mcIDD$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcIDD$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcIDD$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcIDI$sp.java b/library/src/dotty/runtime/function/JFunction2$mcIDI$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcIDI$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcIDI$sp.java
index 93bb1097f41d..47efcf768558 100644
--- a/library/src/scala/compat/java8/JFunction2$mcIDI$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcIDI$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcIDI$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcIDJ$sp.java b/library/src/dotty/runtime/function/JFunction2$mcIDJ$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcIDJ$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcIDJ$sp.java
index 1f9da5b89b02..fc744d121477 100644
--- a/library/src/scala/compat/java8/JFunction2$mcIDJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcIDJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcIDJ$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcIID$sp.java b/library/src/dotty/runtime/function/JFunction2$mcIID$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcIID$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcIID$sp.java
index 11010f979f85..107f247d65ab 100644
--- a/library/src/scala/compat/java8/JFunction2$mcIID$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcIID$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcIID$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcIII$sp.java b/library/src/dotty/runtime/function/JFunction2$mcIII$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcIII$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcIII$sp.java
index 052c24879146..58f921f8097c 100644
--- a/library/src/scala/compat/java8/JFunction2$mcIII$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcIII$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcIII$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcIIJ$sp.java b/library/src/dotty/runtime/function/JFunction2$mcIIJ$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcIIJ$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcIIJ$sp.java
index 08b4b7d81209..41ed81ea43d5 100644
--- a/library/src/scala/compat/java8/JFunction2$mcIIJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcIIJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcIIJ$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcIJD$sp.java b/library/src/dotty/runtime/function/JFunction2$mcIJD$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcIJD$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcIJD$sp.java
index 57781e32c481..273495e31fa9 100644
--- a/library/src/scala/compat/java8/JFunction2$mcIJD$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcIJD$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcIJD$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcIJI$sp.java b/library/src/dotty/runtime/function/JFunction2$mcIJI$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcIJI$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcIJI$sp.java
index 468cbe15b5cf..7520ba068226 100644
--- a/library/src/scala/compat/java8/JFunction2$mcIJI$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcIJI$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcIJI$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcIJJ$sp.java b/library/src/dotty/runtime/function/JFunction2$mcIJJ$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcIJJ$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcIJJ$sp.java
index 842eb85f3840..4ac15744f061 100644
--- a/library/src/scala/compat/java8/JFunction2$mcIJJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcIJJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcIJJ$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcJDD$sp.java b/library/src/dotty/runtime/function/JFunction2$mcJDD$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcJDD$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcJDD$sp.java
index 3526b439bce9..ea57c0427c58 100644
--- a/library/src/scala/compat/java8/JFunction2$mcJDD$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcJDD$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcJDD$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcJDI$sp.java b/library/src/dotty/runtime/function/JFunction2$mcJDI$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcJDI$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcJDI$sp.java
index 437785cb0736..cf4d13f3a37c 100644
--- a/library/src/scala/compat/java8/JFunction2$mcJDI$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcJDI$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcJDI$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcJDJ$sp.java b/library/src/dotty/runtime/function/JFunction2$mcJDJ$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcJDJ$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcJDJ$sp.java
index 67bc4f239011..5eff9ba6db21 100644
--- a/library/src/scala/compat/java8/JFunction2$mcJDJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcJDJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcJDJ$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcJID$sp.java b/library/src/dotty/runtime/function/JFunction2$mcJID$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcJID$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcJID$sp.java
index 1cf83f4611eb..ffa488229e4b 100644
--- a/library/src/scala/compat/java8/JFunction2$mcJID$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcJID$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcJID$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcJII$sp.java b/library/src/dotty/runtime/function/JFunction2$mcJII$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcJII$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcJII$sp.java
index 1eee4266d747..b7a08689a805 100644
--- a/library/src/scala/compat/java8/JFunction2$mcJII$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcJII$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcJII$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcJIJ$sp.java b/library/src/dotty/runtime/function/JFunction2$mcJIJ$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcJIJ$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcJIJ$sp.java
index 105a311e6b30..72d37ccdbcc6 100644
--- a/library/src/scala/compat/java8/JFunction2$mcJIJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcJIJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcJIJ$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcJJD$sp.java b/library/src/dotty/runtime/function/JFunction2$mcJJD$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcJJD$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcJJD$sp.java
index abb1341913a8..6e99b3457fd2 100644
--- a/library/src/scala/compat/java8/JFunction2$mcJJD$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcJJD$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcJJD$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcJJI$sp.java b/library/src/dotty/runtime/function/JFunction2$mcJJI$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcJJI$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcJJI$sp.java
index eb2160d7c375..c2a77ad99be8 100644
--- a/library/src/scala/compat/java8/JFunction2$mcJJI$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcJJI$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcJJI$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcJJJ$sp.java b/library/src/dotty/runtime/function/JFunction2$mcJJJ$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcJJJ$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcJJJ$sp.java
index 6d0c50b59a3b..badd63219a61 100644
--- a/library/src/scala/compat/java8/JFunction2$mcJJJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcJJJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcJJJ$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcVDD$sp.java b/library/src/dotty/runtime/function/JFunction2$mcVDD$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcVDD$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcVDD$sp.java
index d84aaa614097..8e786e1ac9ff 100644
--- a/library/src/scala/compat/java8/JFunction2$mcVDD$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcVDD$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcVDD$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcVDI$sp.java b/library/src/dotty/runtime/function/JFunction2$mcVDI$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcVDI$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcVDI$sp.java
index 62fcfd5814a1..4d7a42587685 100644
--- a/library/src/scala/compat/java8/JFunction2$mcVDI$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcVDI$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcVDI$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcVDJ$sp.java b/library/src/dotty/runtime/function/JFunction2$mcVDJ$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcVDJ$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcVDJ$sp.java
index 7df894603d51..ed0aab94bb6c 100644
--- a/library/src/scala/compat/java8/JFunction2$mcVDJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcVDJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcVDJ$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcVID$sp.java b/library/src/dotty/runtime/function/JFunction2$mcVID$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcVID$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcVID$sp.java
index f97fe2ca8e13..e8bda5799866 100644
--- a/library/src/scala/compat/java8/JFunction2$mcVID$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcVID$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcVID$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcVII$sp.java b/library/src/dotty/runtime/function/JFunction2$mcVII$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcVII$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcVII$sp.java
index 787b6ea8b9cc..9ca34e6722be 100644
--- a/library/src/scala/compat/java8/JFunction2$mcVII$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcVII$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcVII$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcVIJ$sp.java b/library/src/dotty/runtime/function/JFunction2$mcVIJ$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcVIJ$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcVIJ$sp.java
index 768924559fca..ef358c0d35bd 100644
--- a/library/src/scala/compat/java8/JFunction2$mcVIJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcVIJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcVIJ$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcVJD$sp.java b/library/src/dotty/runtime/function/JFunction2$mcVJD$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcVJD$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcVJD$sp.java
index e5fa769fc58e..03b8d7bf431f 100644
--- a/library/src/scala/compat/java8/JFunction2$mcVJD$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcVJD$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcVJD$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcVJI$sp.java b/library/src/dotty/runtime/function/JFunction2$mcVJI$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcVJI$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcVJI$sp.java
index 304e72943ee1..60269e52c7ca 100644
--- a/library/src/scala/compat/java8/JFunction2$mcVJI$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcVJI$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcVJI$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcVJJ$sp.java b/library/src/dotty/runtime/function/JFunction2$mcVJJ$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcVJJ$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcVJJ$sp.java
index 5c88bfa2833f..c957803c3f40 100644
--- a/library/src/scala/compat/java8/JFunction2$mcVJJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcVJJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcVJJ$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcZDD$sp.java b/library/src/dotty/runtime/function/JFunction2$mcZDD$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcZDD$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcZDD$sp.java
index e271b7c22023..5b0d95b9594c 100644
--- a/library/src/scala/compat/java8/JFunction2$mcZDD$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcZDD$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcZDD$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcZDI$sp.java b/library/src/dotty/runtime/function/JFunction2$mcZDI$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcZDI$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcZDI$sp.java
index e74d25cbcbe9..e29eb8bb9905 100644
--- a/library/src/scala/compat/java8/JFunction2$mcZDI$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcZDI$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcZDI$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcZDJ$sp.java b/library/src/dotty/runtime/function/JFunction2$mcZDJ$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcZDJ$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcZDJ$sp.java
index bc05f8d36594..69cdcd8fe189 100644
--- a/library/src/scala/compat/java8/JFunction2$mcZDJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcZDJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcZDJ$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcZID$sp.java b/library/src/dotty/runtime/function/JFunction2$mcZID$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcZID$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcZID$sp.java
index 458cc6a1ef2e..66a68bb8aeec 100644
--- a/library/src/scala/compat/java8/JFunction2$mcZID$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcZID$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcZID$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcZII$sp.java b/library/src/dotty/runtime/function/JFunction2$mcZII$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcZII$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcZII$sp.java
index 2ae9684ecbd1..2c51b28f19d6 100644
--- a/library/src/scala/compat/java8/JFunction2$mcZII$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcZII$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcZII$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcZIJ$sp.java b/library/src/dotty/runtime/function/JFunction2$mcZIJ$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcZIJ$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcZIJ$sp.java
index f8074eb4b6a9..246b94e36ac9 100644
--- a/library/src/scala/compat/java8/JFunction2$mcZIJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcZIJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcZIJ$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcZJD$sp.java b/library/src/dotty/runtime/function/JFunction2$mcZJD$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcZJD$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcZJD$sp.java
index b091ff62da70..e9f0ad8c651c 100644
--- a/library/src/scala/compat/java8/JFunction2$mcZJD$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcZJD$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcZJD$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcZJI$sp.java b/library/src/dotty/runtime/function/JFunction2$mcZJI$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcZJI$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcZJI$sp.java
index 6f820cd6bd9c..c5b20f94f102 100644
--- a/library/src/scala/compat/java8/JFunction2$mcZJI$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcZJI$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcZJI$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2$mcZJJ$sp.java b/library/src/dotty/runtime/function/JFunction2$mcZJJ$sp.java
similarity index 92%
rename from library/src/scala/compat/java8/JFunction2$mcZJJ$sp.java
rename to library/src/dotty/runtime/function/JFunction2$mcZJJ$sp.java
index 69bf5636270f..0f11186d78c5 100644
--- a/library/src/scala/compat/java8/JFunction2$mcZJJ$sp.java
+++ b/library/src/dotty/runtime/function/JFunction2$mcZJJ$sp.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction2$mcZJJ$sp extends JFunction2 {
diff --git a/library/src/scala/compat/java8/JFunction2.java b/library/src/dotty/runtime/function/JFunction2.java
similarity index 99%
rename from library/src/scala/compat/java8/JFunction2.java
rename to library/src/dotty/runtime/function/JFunction2.java
index 2984a9746335..af6f62158cce 100644
--- a/library/src/scala/compat/java8/JFunction2.java
+++ b/library/src/dotty/runtime/function/JFunction2.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.MatchError;
 
diff --git a/library/src/scala/compat/java8/JFunction20.java b/library/src/dotty/runtime/function/JFunction20.java
similarity index 97%
rename from library/src/scala/compat/java8/JFunction20.java
rename to library/src/dotty/runtime/function/JFunction20.java
index 82fe356f57f3..fc3bd14c614e 100644
--- a/library/src/scala/compat/java8/JFunction20.java
+++ b/library/src/dotty/runtime/function/JFunction20.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, R> extends scala.Function20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, R>, java.io.Serializable {
diff --git a/library/src/scala/compat/java8/JFunction21.java b/library/src/dotty/runtime/function/JFunction21.java
similarity index 97%
rename from library/src/scala/compat/java8/JFunction21.java
rename to library/src/dotty/runtime/function/JFunction21.java
index 8b6b476da1d4..222d01b5e59b 100644
--- a/library/src/scala/compat/java8/JFunction21.java
+++ b/library/src/dotty/runtime/function/JFunction21.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, R> extends scala.Function21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, R>, java.io.Serializable {
diff --git a/library/src/scala/compat/java8/JFunction22.java b/library/src/dotty/runtime/function/JFunction22.java
similarity index 97%
rename from library/src/scala/compat/java8/JFunction22.java
rename to library/src/dotty/runtime/function/JFunction22.java
index 7e635391798f..518d3f51aa53 100644
--- a/library/src/scala/compat/java8/JFunction22.java
+++ b/library/src/dotty/runtime/function/JFunction22.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, R> extends scala.Function22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, R>, java.io.Serializable {
diff --git a/library/src/scala/compat/java8/JFunction3.java b/library/src/dotty/runtime/function/JFunction3.java
similarity index 96%
rename from library/src/scala/compat/java8/JFunction3.java
rename to library/src/dotty/runtime/function/JFunction3.java
index 5147e73600d9..867aaba23933 100644
--- a/library/src/scala/compat/java8/JFunction3.java
+++ b/library/src/dotty/runtime/function/JFunction3.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.MatchError;
 
diff --git a/library/src/scala/compat/java8/JFunction4.java b/library/src/dotty/runtime/function/JFunction4.java
similarity index 96%
rename from library/src/scala/compat/java8/JFunction4.java
rename to library/src/dotty/runtime/function/JFunction4.java
index 6d39a3a06cd4..0db0ddce054b 100644
--- a/library/src/scala/compat/java8/JFunction4.java
+++ b/library/src/dotty/runtime/function/JFunction4.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.MatchError;
 
diff --git a/library/src/scala/compat/java8/JFunction5.java b/library/src/dotty/runtime/function/JFunction5.java
similarity index 95%
rename from library/src/scala/compat/java8/JFunction5.java
rename to library/src/dotty/runtime/function/JFunction5.java
index 9a36af977387..150c0a3ac18c 100644
--- a/library/src/scala/compat/java8/JFunction5.java
+++ b/library/src/dotty/runtime/function/JFunction5.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.MatchError;
 
diff --git a/library/src/scala/compat/java8/JFunction6.java b/library/src/dotty/runtime/function/JFunction6.java
similarity index 95%
rename from library/src/scala/compat/java8/JFunction6.java
rename to library/src/dotty/runtime/function/JFunction6.java
index 6cd79beaeb8f..8a128bf3d9e8 100644
--- a/library/src/scala/compat/java8/JFunction6.java
+++ b/library/src/dotty/runtime/function/JFunction6.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.MatchError;
 
diff --git a/library/src/scala/compat/java8/JFunction7.java b/library/src/dotty/runtime/function/JFunction7.java
similarity index 95%
rename from library/src/scala/compat/java8/JFunction7.java
rename to library/src/dotty/runtime/function/JFunction7.java
index 34f48cc31114..9a29d2dc1569 100644
--- a/library/src/scala/compat/java8/JFunction7.java
+++ b/library/src/dotty/runtime/function/JFunction7.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.MatchError;
 
diff --git a/library/src/scala/compat/java8/JFunction8.java b/library/src/dotty/runtime/function/JFunction8.java
similarity index 96%
rename from library/src/scala/compat/java8/JFunction8.java
rename to library/src/dotty/runtime/function/JFunction8.java
index af7d5a99bdf9..35fd63083f0b 100644
--- a/library/src/scala/compat/java8/JFunction8.java
+++ b/library/src/dotty/runtime/function/JFunction8.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.MatchError;
 
diff --git a/library/src/scala/compat/java8/JFunction9.java b/library/src/dotty/runtime/function/JFunction9.java
similarity index 96%
rename from library/src/scala/compat/java8/JFunction9.java
rename to library/src/dotty/runtime/function/JFunction9.java
index 9157c23a80a3..4f3192a1cc29 100644
--- a/library/src/scala/compat/java8/JFunction9.java
+++ b/library/src/dotty/runtime/function/JFunction9.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 @FunctionalInterface
 public interface JFunction9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> extends scala.Function9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R>, java.io.Serializable {
diff --git a/library/src/scala/compat/java8/JProcedure0.java b/library/src/dotty/runtime/function/JProcedure0.java
similarity index 91%
rename from library/src/scala/compat/java8/JProcedure0.java
rename to library/src/dotty/runtime/function/JProcedure0.java
index 1cb975e2a781..c3430b76d75c 100644
--- a/library/src/scala/compat/java8/JProcedure0.java
+++ b/library/src/dotty/runtime/function/JProcedure0.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure1.java b/library/src/dotty/runtime/function/JProcedure1.java
similarity index 92%
rename from library/src/scala/compat/java8/JProcedure1.java
rename to library/src/dotty/runtime/function/JProcedure1.java
index b524810614c3..193c7e289980 100644
--- a/library/src/scala/compat/java8/JProcedure1.java
+++ b/library/src/dotty/runtime/function/JProcedure1.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure10.java b/library/src/dotty/runtime/function/JProcedure10.java
similarity index 95%
rename from library/src/scala/compat/java8/JProcedure10.java
rename to library/src/dotty/runtime/function/JProcedure10.java
index 4a94f53951f7..e7fb4bf05abc 100644
--- a/library/src/scala/compat/java8/JProcedure10.java
+++ b/library/src/dotty/runtime/function/JProcedure10.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure11.java b/library/src/dotty/runtime/function/JProcedure11.java
similarity index 95%
rename from library/src/scala/compat/java8/JProcedure11.java
rename to library/src/dotty/runtime/function/JProcedure11.java
index bdf09102062c..aa93dcfb8a4c 100644
--- a/library/src/scala/compat/java8/JProcedure11.java
+++ b/library/src/dotty/runtime/function/JProcedure11.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure12.java b/library/src/dotty/runtime/function/JProcedure12.java
similarity index 95%
rename from library/src/scala/compat/java8/JProcedure12.java
rename to library/src/dotty/runtime/function/JProcedure12.java
index fc6033f593cc..a64415f9bdd7 100644
--- a/library/src/scala/compat/java8/JProcedure12.java
+++ b/library/src/dotty/runtime/function/JProcedure12.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure13.java b/library/src/dotty/runtime/function/JProcedure13.java
similarity index 95%
rename from library/src/scala/compat/java8/JProcedure13.java
rename to library/src/dotty/runtime/function/JProcedure13.java
index 8db24920b21c..b77724e3782e 100644
--- a/library/src/scala/compat/java8/JProcedure13.java
+++ b/library/src/dotty/runtime/function/JProcedure13.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure14.java b/library/src/dotty/runtime/function/JProcedure14.java
similarity index 95%
rename from library/src/scala/compat/java8/JProcedure14.java
rename to library/src/dotty/runtime/function/JProcedure14.java
index 7cc807a87d9d..330a4ae11c42 100644
--- a/library/src/scala/compat/java8/JProcedure14.java
+++ b/library/src/dotty/runtime/function/JProcedure14.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure15.java b/library/src/dotty/runtime/function/JProcedure15.java
similarity index 96%
rename from library/src/scala/compat/java8/JProcedure15.java
rename to library/src/dotty/runtime/function/JProcedure15.java
index 456671e5d004..a1ae0d756a3d 100644
--- a/library/src/scala/compat/java8/JProcedure15.java
+++ b/library/src/dotty/runtime/function/JProcedure15.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure16.java b/library/src/dotty/runtime/function/JProcedure16.java
similarity index 96%
rename from library/src/scala/compat/java8/JProcedure16.java
rename to library/src/dotty/runtime/function/JProcedure16.java
index cb06658e4c68..fcb17c9e37ec 100644
--- a/library/src/scala/compat/java8/JProcedure16.java
+++ b/library/src/dotty/runtime/function/JProcedure16.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure17.java b/library/src/dotty/runtime/function/JProcedure17.java
similarity index 96%
rename from library/src/scala/compat/java8/JProcedure17.java
rename to library/src/dotty/runtime/function/JProcedure17.java
index 7924877ced54..5fabd706de46 100644
--- a/library/src/scala/compat/java8/JProcedure17.java
+++ b/library/src/dotty/runtime/function/JProcedure17.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure18.java b/library/src/dotty/runtime/function/JProcedure18.java
similarity index 96%
rename from library/src/scala/compat/java8/JProcedure18.java
rename to library/src/dotty/runtime/function/JProcedure18.java
index dec8ee18382f..8a5d0f18fb86 100644
--- a/library/src/scala/compat/java8/JProcedure18.java
+++ b/library/src/dotty/runtime/function/JProcedure18.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure19.java b/library/src/dotty/runtime/function/JProcedure19.java
similarity index 96%
rename from library/src/scala/compat/java8/JProcedure19.java
rename to library/src/dotty/runtime/function/JProcedure19.java
index ce92050b67e6..7b2b4b76bd6f 100644
--- a/library/src/scala/compat/java8/JProcedure19.java
+++ b/library/src/dotty/runtime/function/JProcedure19.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure2.java b/library/src/dotty/runtime/function/JProcedure2.java
similarity index 92%
rename from library/src/scala/compat/java8/JProcedure2.java
rename to library/src/dotty/runtime/function/JProcedure2.java
index 256cb0efa00e..d8cd06dd47e8 100644
--- a/library/src/scala/compat/java8/JProcedure2.java
+++ b/library/src/dotty/runtime/function/JProcedure2.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure20.java b/library/src/dotty/runtime/function/JProcedure20.java
similarity index 96%
rename from library/src/scala/compat/java8/JProcedure20.java
rename to library/src/dotty/runtime/function/JProcedure20.java
index 11dbda1b0712..4183512277fb 100644
--- a/library/src/scala/compat/java8/JProcedure20.java
+++ b/library/src/dotty/runtime/function/JProcedure20.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure21.java b/library/src/dotty/runtime/function/JProcedure21.java
similarity index 96%
rename from library/src/scala/compat/java8/JProcedure21.java
rename to library/src/dotty/runtime/function/JProcedure21.java
index e59b6074768e..26170003a94b 100644
--- a/library/src/scala/compat/java8/JProcedure21.java
+++ b/library/src/dotty/runtime/function/JProcedure21.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure22.java b/library/src/dotty/runtime/function/JProcedure22.java
similarity index 96%
rename from library/src/scala/compat/java8/JProcedure22.java
rename to library/src/dotty/runtime/function/JProcedure22.java
index 2a39864e1ef6..a104b4f4aff4 100644
--- a/library/src/scala/compat/java8/JProcedure22.java
+++ b/library/src/dotty/runtime/function/JProcedure22.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure3.java b/library/src/dotty/runtime/function/JProcedure3.java
similarity index 93%
rename from library/src/scala/compat/java8/JProcedure3.java
rename to library/src/dotty/runtime/function/JProcedure3.java
index ed13ae0d6b03..4d66557b5035 100644
--- a/library/src/scala/compat/java8/JProcedure3.java
+++ b/library/src/dotty/runtime/function/JProcedure3.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure4.java b/library/src/dotty/runtime/function/JProcedure4.java
similarity index 93%
rename from library/src/scala/compat/java8/JProcedure4.java
rename to library/src/dotty/runtime/function/JProcedure4.java
index d4840458fd99..8bf7282c8c7b 100644
--- a/library/src/scala/compat/java8/JProcedure4.java
+++ b/library/src/dotty/runtime/function/JProcedure4.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure5.java b/library/src/dotty/runtime/function/JProcedure5.java
similarity index 93%
rename from library/src/scala/compat/java8/JProcedure5.java
rename to library/src/dotty/runtime/function/JProcedure5.java
index c8e9f7e1bd4a..07fbb0c2d239 100644
--- a/library/src/scala/compat/java8/JProcedure5.java
+++ b/library/src/dotty/runtime/function/JProcedure5.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure6.java b/library/src/dotty/runtime/function/JProcedure6.java
similarity index 94%
rename from library/src/scala/compat/java8/JProcedure6.java
rename to library/src/dotty/runtime/function/JProcedure6.java
index 15f0adf9f348..da044b203e5b 100644
--- a/library/src/scala/compat/java8/JProcedure6.java
+++ b/library/src/dotty/runtime/function/JProcedure6.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure7.java b/library/src/dotty/runtime/function/JProcedure7.java
similarity index 94%
rename from library/src/scala/compat/java8/JProcedure7.java
rename to library/src/dotty/runtime/function/JProcedure7.java
index f81ae878acf9..3583e3a6a24a 100644
--- a/library/src/scala/compat/java8/JProcedure7.java
+++ b/library/src/dotty/runtime/function/JProcedure7.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure8.java b/library/src/dotty/runtime/function/JProcedure8.java
similarity index 94%
rename from library/src/scala/compat/java8/JProcedure8.java
rename to library/src/dotty/runtime/function/JProcedure8.java
index 77bfec22802e..ec7a54d346c4 100644
--- a/library/src/scala/compat/java8/JProcedure8.java
+++ b/library/src/dotty/runtime/function/JProcedure8.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;
 
diff --git a/library/src/scala/compat/java8/JProcedure9.java b/library/src/dotty/runtime/function/JProcedure9.java
similarity index 94%
rename from library/src/scala/compat/java8/JProcedure9.java
rename to library/src/dotty/runtime/function/JProcedure9.java
index ebeb59f522ed..1de9b280a6e9 100644
--- a/library/src/scala/compat/java8/JProcedure9.java
+++ b/library/src/dotty/runtime/function/JProcedure9.java
@@ -3,7 +3,7 @@
  * Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package scala.compat.java8;
+package dotty.runtime.function;
 
 import scala.runtime.BoxedUnit;