13 files changed, 31 insertions, 17 deletions
diff --git a/src/actors-migration/scala/actors/MigrationSystem.scala b/src/actors-migration/scala/actors/MigrationSystem.scala
index ffc93d9c6f..3dcb38e634 100644
--- a/src/actors-migration/scala/actors/MigrationSystem.scala
+++ b/src/actors-migration/scala/actors/MigrationSystem.scala
@@ -1,10 +1,11 @@
-package scala.actors
+package scala.actors.migration
 
+import scala.actors._
 import scala.collection._
 
 object MigrationSystem {
 
-  private[actors] val contextStack = new ThreadLocal[immutable.Stack[Boolean]] {
+  private[migration] val contextStack = new ThreadLocal[immutable.Stack[Boolean]] {
     override def initialValue() = immutable.Stack[Boolean]()
   }
 
diff --git a/src/actors-migration/scala/actors/Pattern.scala b/src/actors-migration/scala/actors/Pattern.scala
index 26e9d1bb64..28fd128141 100644
--- a/src/actors-migration/scala/actors/Pattern.scala
+++ b/src/actors-migration/scala/actors/Pattern.scala
@@ -1,5 +1,6 @@
-package scala.actors
+package scala.actors.migration
 
+import scala.actors._
 import scala.concurrent.util.Duration
 import language.implicitConversions
 
diff --git a/src/actors-migration/scala/actors/Props.scala b/src/actors-migration/scala/actors/Props.scala
index 891e23213a..c12384ea55 100644
--- a/src/actors-migration/scala/actors/Props.scala
+++ b/src/actors-migration/scala/actors/Props.scala
@@ -1,4 +1,6 @@
-package scala.actors
+package scala.actors.migration
+
+import scala.actors._
 
 /**
  * ActorRef configuration object. It represents the minimal subset of Akka Props class.
diff --git a/src/actors-migration/scala/actors/StashingActor.scala b/src/actors-migration/scala/actors/StashingActor.scala
index 8f96e1b002..47f73c252a 100644
--- a/src/actors-migration/scala/actors/StashingActor.scala
+++ b/src/actors-migration/scala/actors/StashingActor.scala
@@ -1,5 +1,7 @@
-package scala.actors
+package scala.actors.migration
 
+import scala.actors._
+import scala.actors.Actor._
 import scala.collection._
 import scala.concurrent.util.Duration
 import java.util.concurrent.TimeUnit
diff --git a/src/actors-migration/scala/actors/Timeout.scala b/src/actors-migration/scala/actors/Timeout.scala
index 7e400ab140..78d15e5704 100644
--- a/src/actors-migration/scala/actors/Timeout.scala
+++ b/src/actors-migration/scala/actors/Timeout.scala
@@ -6,7 +6,7 @@
 **                          |/                                          **
 \*                                                                      */
 
-package scala.actors
+package scala.actors.migration
 
 import scala.concurrent.util.Duration
 import java.util.concurrent.TimeUnit
diff --git a/test/files/jvm/actmig-PinS_1.scala b/test/files/jvm/actmig-PinS_1.scala
index 1fb50567b9..7ffff2d889 100644
--- a/test/files/jvm/actmig-PinS_1.scala
+++ b/test/files/jvm/actmig-PinS_1.scala
@@ -1,4 +1,5 @@
 import scala.actors._
+import scala.actors.migration._
 import scala.concurrent.util.duration._
 import scala.concurrent.{ Promise, Await }
 
diff --git a/test/files/jvm/actmig-PinS_2.scala b/test/files/jvm/actmig-PinS_2.scala
index 46277efd43..dd0e6e5f0e 100644
--- a/test/files/jvm/actmig-PinS_2.scala
+++ b/test/files/jvm/actmig-PinS_2.scala
@@ -1,4 +1,5 @@
-import scala.actors.{ MigrationSystem, StashingActor, ActorRef, Props, Exit }
+import scala.actors._
+import scala.actors.migration._
 import scala.concurrent.util.duration._
 import scala.concurrent.{ Promise, Await }
 
diff --git a/test/files/jvm/actmig-PinS_3.scala b/test/files/jvm/actmig-PinS_3.scala
index 321e99b1c2..9261046770 100644
--- a/test/files/jvm/actmig-PinS_3.scala
+++ b/test/files/jvm/actmig-PinS_3.scala
@@ -1,4 +1,5 @@
-import scala.actors.{ MigrationSystem, StashingActor, ActorRef, Terminated, Props }
+import scala.actors._
+import scala.actors.migration._
 import scala.concurrent.util.duration._
 import scala.concurrent.{ Promise, Await }
 
diff --git a/test/files/jvm/actmig-loop-react.scala b/test/files/jvm/actmig-loop-react.scala
index d0cba656f8..828ebf6546 100644
--- a/test/files/jvm/actmig-loop-react.scala
+++ b/test/files/jvm/actmig-loop-react.scala
@@ -1,6 +1,7 @@
-import scala.actors.MigrationSystem._
+import scala.actors.migration.MigrationSystem._
 import scala.actors.Actor._
-import scala.actors.{ Actor, StashingActor, ActorRef, Props, MigrationSystem, PoisonPill }
+import scala.actors._
+import scala.actors.migration._
 import java.util.concurrent.{ TimeUnit, CountDownLatch }
 import scala.collection.mutable.ArrayBuffer
 import scala.concurrent.util.duration._
diff --git a/test/files/jvm/actmig-public-methods_1.scala b/test/files/jvm/actmig-public-methods_1.scala
index 7e5bc24210..59bdb500a5 100644
--- a/test/files/jvm/actmig-public-methods_1.scala
+++ b/test/files/jvm/actmig-public-methods_1.scala
@@ -1,10 +1,11 @@
 import scala.collection.mutable.ArrayBuffer
 import scala.actors.Actor._
 import scala.actors._
+import scala.actors.migration._
 import scala.util._
 import java.util.concurrent.{ TimeUnit, CountDownLatch }
 import scala.concurrent.util.Duration
-import scala.actors.pattern._
+import scala.actors.migration.pattern._
 
 object Test {
   val NUMBER_OF_TESTS = 6
diff --git a/test/files/jvm/actmig-react-receive.scala b/test/files/jvm/actmig-react-receive.scala
index 8464a2af79..4ffdc722fd 100644
--- a/test/files/jvm/actmig-react-receive.scala
+++ b/test/files/jvm/actmig-react-receive.scala
@@ -1,6 +1,7 @@
-import scala.actors.MigrationSystem._
+import scala.actors.migration.MigrationSystem._
 import scala.actors.Actor._
-import scala.actors.{ Actor, StashingActor, ActorRef, Props, MigrationSystem, PoisonPill }
+import scala.actors._
+import scala.actors.migration._
 import java.util.concurrent.{ TimeUnit, CountDownLatch }
 import scala.collection.mutable.ArrayBuffer
 import scala.concurrent.util.duration._
diff --git a/test/files/jvm/actmig-react-within.scala b/test/files/jvm/actmig-react-within.scala
index f0326f885d..5c51508e5d 100644
--- a/test/files/jvm/actmig-react-within.scala
+++ b/test/files/jvm/actmig-react-within.scala
@@ -1,6 +1,7 @@
-import scala.actors.MigrationSystem._
+import scala.actors.migration.MigrationSystem._
 import scala.actors.Actor._
-import scala.actors.{ Actor, StashingActor, ActorRef, Props, MigrationSystem, PoisonPill }
+import scala.actors._
+import scala.actors.migration._
 import java.util.concurrent.{ TimeUnit, CountDownLatch }
 import scala.collection.mutable.ArrayBuffer
 import scala.concurrent.util.duration._
diff --git a/test/files/jvm/actmig-receive.scala b/test/files/jvm/actmig-receive.scala
index 30730e9d87..bd45d6e4ca 100644
--- a/test/files/jvm/actmig-receive.scala
+++ b/test/files/jvm/actmig-receive.scala
@@ -1,6 +1,7 @@
-import scala.actors.MigrationSystem._
+import scala.actors.migration.MigrationSystem._
 import scala.actors.Actor._
-import scala.actors.{ Actor, StashingActor, ActorRef, Props, MigrationSystem, PoisonPill }
+import scala.actors._
+import scala.actors.migration._
 import java.util.concurrent.{ TimeUnit, CountDownLatch }
 import scala.collection.mutable.ArrayBuffer
 import scala.concurrent.util.duration._