diff --git a/akka-actor/src/main/scala/actor/Actor.scala b/akka-actor/src/main/scala/akka/actor/Actor.scala
similarity index 97%
rename from akka-actor/src/main/scala/actor/Actor.scala
rename to akka-actor/src/main/scala/akka/actor/Actor.scala
index 6667f7fbc4..8a7b045475 100644
--- a/akka-actor/src/main/scala/actor/Actor.scala
+++ b/akka-actor/src/main/scala/akka/actor/Actor.scala
@@ -34,8 +34,16 @@ abstract class RemoteActor(address: InetSocketAddress) extends Actor {
  */
 @serializable sealed trait LifeCycleMessage
 
-case class HotSwap(code: Actor.Receive) extends LifeCycleMessage {
-  def this(behavior: Procedure[Any]) = this({ case msg => behavior.apply(msg) }: Actor.Receive)
+case class HotSwap(code: ActorRef => Actor.Receive) extends LifeCycleMessage {
+  /**
+   * Java API
+   */
+  def this(code: akka.japi.Function[ActorRef,Procedure[Any]]) =
+    this( (self: ActorRef) => {
+      val behavior = code(self)
+      val result: Actor.Receive = { case msg => behavior(msg) }
+      result
+    })
 }
 
 case object RevertHotSwap extends LifeCycleMessage
@@ -66,7 +74,7 @@ class ActorInitializationException private[akka](message: String) extends AkkaEx
 class ActorTimeoutException private[akka](message: String) extends AkkaException(message)
 
 /**
- * This message is thrown by default when an Actors behavior doesn't match a message
+ *   This message is thrown by default when an Actors behavior doesn't match a message
  */
 case class UnhandledMessageException(msg: Any, ref: ActorRef) extends Exception {
   override def getMessage() = "Actor %s does not handle [%s]".format(ref,msg)
@@ -426,7 +434,7 @@ trait Actor extends Logging {
   private lazy val processingBehavior: Receive = {
     lazy val defaultBehavior = receive
     val actorBehavior: Receive = {
-      case HotSwap(code)                             => become(code)
+      case HotSwap(code)                             => become(code(self))
       case RevertHotSwap                             => unbecome
       case Exit(dead, reason)                        => self.handleTrapExit(dead, reason)
       case Link(child)                               => self.link(child)
@@ -444,7 +452,7 @@ trait Actor extends Logging {
   private lazy val fullBehavior: Receive = {
     lazy val defaultBehavior = receive
     val actorBehavior: Receive = {
-      case HotSwap(code)                             => become(code)
+      case HotSwap(code)                             => become(code(self))
       case RevertHotSwap                             => unbecome
       case Exit(dead, reason)                        => self.handleTrapExit(dead, reason)
       case Link(child)                               => self.link(child)
diff --git a/akka-actor/src/main/scala/actor/ActorRef.scala b/akka-actor/src/main/scala/akka/actor/ActorRef.scala
similarity index 100%
rename from akka-actor/src/main/scala/actor/ActorRef.scala
rename to akka-actor/src/main/scala/akka/actor/ActorRef.scala
diff --git a/akka-actor/src/main/scala/actor/ActorRegistry.scala b/akka-actor/src/main/scala/akka/actor/ActorRegistry.scala
similarity index 100%
rename from akka-actor/src/main/scala/actor/ActorRegistry.scala
rename to akka-actor/src/main/scala/akka/actor/ActorRegistry.scala
diff --git a/akka-actor/src/main/scala/actor/BootableActorLoaderService.scala b/akka-actor/src/main/scala/akka/actor/BootableActorLoaderService.scala
similarity index 100%
rename from akka-actor/src/main/scala/actor/BootableActorLoaderService.scala
rename to akka-actor/src/main/scala/akka/actor/BootableActorLoaderService.scala
diff --git a/akka-actor/src/main/scala/actor/FSM.scala b/akka-actor/src/main/scala/akka/actor/FSM.scala
similarity index 100%
rename from akka-actor/src/main/scala/actor/FSM.scala
rename to akka-actor/src/main/scala/akka/actor/FSM.scala
diff --git a/akka-actor/src/main/scala/actor/Implicits.scala b/akka-actor/src/main/scala/akka/actor/Implicits.scala
similarity index 100%
rename from akka-actor/src/main/scala/actor/Implicits.scala
rename to akka-actor/src/main/scala/akka/actor/Implicits.scala
diff --git a/akka-actor/src/main/scala/actor/Scheduler.scala b/akka-actor/src/main/scala/akka/actor/Scheduler.scala
similarity index 100%
rename from akka-actor/src/main/scala/actor/Scheduler.scala
rename to akka-actor/src/main/scala/akka/actor/Scheduler.scala
diff --git a/akka-actor/src/main/scala/actor/Supervisor.scala b/akka-actor/src/main/scala/akka/actor/Supervisor.scala
similarity index 100%
rename from akka-actor/src/main/scala/actor/Supervisor.scala
rename to akka-actor/src/main/scala/akka/actor/Supervisor.scala
diff --git a/akka-actor/src/main/scala/actor/UntypedActor.scala b/akka-actor/src/main/scala/akka/actor/UntypedActor.scala
similarity index 98%
rename from akka-actor/src/main/scala/actor/UntypedActor.scala
rename to akka-actor/src/main/scala/akka/actor/UntypedActor.scala
index cce41a92a7..9eec8cbb5d 100644
--- a/akka-actor/src/main/scala/actor/UntypedActor.scala
+++ b/akka-actor/src/main/scala/akka/actor/UntypedActor.scala
@@ -6,7 +6,7 @@ package akka.actor
 
 import akka.dispatch._
 import akka.config.Supervision._
-import akka.japi.Procedure
+import akka.japi.{Creator, Procedure}
 
 import java.net.InetSocketAddress
 
@@ -90,9 +90,7 @@ abstract class UntypedActor extends Actor {
  *
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
-trait UntypedActorFactory {
- def create: UntypedActor
-}
+trait UntypedActorFactory extends Creator[Actor]
 
 /**
  * Extend this abstract class to create a remote UntypedActor.
diff --git a/akka-actor/src/main/scala/config/Config.scala b/akka-actor/src/main/scala/akka/config/Config.scala
similarity index 100%
rename from akka-actor/src/main/scala/config/Config.scala
rename to akka-actor/src/main/scala/akka/config/Config.scala
diff --git a/akka-actor/src/main/scala/config/Configuration.scala b/akka-actor/src/main/scala/akka/config/Configuration.scala
similarity index 100%
rename from akka-actor/src/main/scala/config/Configuration.scala
rename to akka-actor/src/main/scala/akka/config/Configuration.scala
diff --git a/akka-actor/src/main/scala/config/Configurator.scala b/akka-actor/src/main/scala/akka/config/Configurator.scala
similarity index 100%
rename from akka-actor/src/main/scala/config/Configurator.scala
rename to akka-actor/src/main/scala/akka/config/Configurator.scala
diff --git a/akka-actor/src/main/scala/config/SupervisionConfig.scala b/akka-actor/src/main/scala/akka/config/SupervisionConfig.scala
similarity index 100%
rename from akka-actor/src/main/scala/config/SupervisionConfig.scala
rename to akka-actor/src/main/scala/akka/config/SupervisionConfig.scala
diff --git a/akka-actor/src/main/scala/dataflow/DataFlowVariable.scala b/akka-actor/src/main/scala/akka/dataflow/DataFlowVariable.scala
similarity index 100%
rename from akka-actor/src/main/scala/dataflow/DataFlowVariable.scala
rename to akka-actor/src/main/scala/akka/dataflow/DataFlowVariable.scala
diff --git a/akka-actor/src/main/scala/dispatch/Dispatchers.scala b/akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala
similarity index 100%
rename from akka-actor/src/main/scala/dispatch/Dispatchers.scala
rename to akka-actor/src/main/scala/akka/dispatch/Dispatchers.scala
diff --git a/akka-actor/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/ExecutorBasedEventDrivenDispatcher.scala
similarity index 100%
rename from akka-actor/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala
rename to akka-actor/src/main/scala/akka/dispatch/ExecutorBasedEventDrivenDispatcher.scala
diff --git a/akka-actor/src/main/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala
similarity index 100%
rename from akka-actor/src/main/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala
rename to akka-actor/src/main/scala/akka/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala
diff --git a/akka-actor/src/main/scala/dispatch/Future.scala b/akka-actor/src/main/scala/akka/dispatch/Future.scala
similarity index 100%
rename from akka-actor/src/main/scala/dispatch/Future.scala
rename to akka-actor/src/main/scala/akka/dispatch/Future.scala
diff --git a/akka-actor/src/main/scala/dispatch/HawtDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/HawtDispatcher.scala
similarity index 100%
rename from akka-actor/src/main/scala/dispatch/HawtDispatcher.scala
rename to akka-actor/src/main/scala/akka/dispatch/HawtDispatcher.scala
diff --git a/akka-actor/src/main/scala/dispatch/MailboxHandling.scala b/akka-actor/src/main/scala/akka/dispatch/MailboxHandling.scala
similarity index 100%
rename from akka-actor/src/main/scala/dispatch/MailboxHandling.scala
rename to akka-actor/src/main/scala/akka/dispatch/MailboxHandling.scala
diff --git a/akka-actor/src/main/scala/dispatch/MessageHandling.scala b/akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
similarity index 100%
rename from akka-actor/src/main/scala/dispatch/MessageHandling.scala
rename to akka-actor/src/main/scala/akka/dispatch/MessageHandling.scala
diff --git a/akka-actor/src/main/scala/dispatch/ThreadBasedDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/ThreadBasedDispatcher.scala
similarity index 100%
rename from akka-actor/src/main/scala/dispatch/ThreadBasedDispatcher.scala
rename to akka-actor/src/main/scala/akka/dispatch/ThreadBasedDispatcher.scala
diff --git a/akka-actor/src/main/scala/dispatch/ThreadPoolBuilder.scala b/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala
similarity index 100%
rename from akka-actor/src/main/scala/dispatch/ThreadPoolBuilder.scala
rename to akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala
diff --git a/akka-actor/src/main/scala/japi/JavaAPI.scala b/akka-actor/src/main/scala/akka/japi/JavaAPI.scala
similarity index 93%
rename from akka-actor/src/main/scala/japi/JavaAPI.scala
rename to akka-actor/src/main/scala/akka/japi/JavaAPI.scala
index f3dd89d91b..88732a4efc 100644
--- a/akka-actor/src/main/scala/japi/JavaAPI.scala
+++ b/akka-actor/src/main/scala/akka/japi/JavaAPI.scala
@@ -20,6 +20,14 @@ trait SideEffect {
   def apply: Unit
 }
 
+/**
+ + * A constructor/factory, takes no parameters but creates a new value of type T every call
+ + */
+trait Creator[T] {
+  def create: T
+}
+
+
 /**
  * This class represents optional values. Instances of <code>Option</code>
  * are either instances of case class <code>Some</code> or it is case
diff --git a/akka-actor/src/main/scala/routing/Iterators.scala b/akka-actor/src/main/scala/akka/routing/Iterators.scala
similarity index 100%
rename from akka-actor/src/main/scala/routing/Iterators.scala
rename to akka-actor/src/main/scala/akka/routing/Iterators.scala
diff --git a/akka-actor/src/main/scala/routing/Listeners.scala b/akka-actor/src/main/scala/akka/routing/Listeners.scala
similarity index 100%
rename from akka-actor/src/main/scala/routing/Listeners.scala
rename to akka-actor/src/main/scala/akka/routing/Listeners.scala
diff --git a/akka-actor/src/main/scala/routing/Routers.scala b/akka-actor/src/main/scala/akka/routing/Routers.scala
similarity index 100%
rename from akka-actor/src/main/scala/routing/Routers.scala
rename to akka-actor/src/main/scala/akka/routing/Routers.scala
diff --git a/akka-actor/src/main/scala/routing/Routing.scala b/akka-actor/src/main/scala/akka/routing/Routing.scala
similarity index 100%
rename from akka-actor/src/main/scala/routing/Routing.scala
rename to akka-actor/src/main/scala/akka/routing/Routing.scala
diff --git a/akka-actor/src/main/scala/util/Address.scala b/akka-actor/src/main/scala/akka/util/Address.scala
similarity index 100%
rename from akka-actor/src/main/scala/util/Address.scala
rename to akka-actor/src/main/scala/akka/util/Address.scala
diff --git a/akka-actor/src/main/scala/util/AkkaException.scala b/akka-actor/src/main/scala/akka/util/AkkaException.scala
similarity index 100%
rename from akka-actor/src/main/scala/util/AkkaException.scala
rename to akka-actor/src/main/scala/akka/util/AkkaException.scala
diff --git a/akka-actor/src/main/scala/util/Bootable.scala b/akka-actor/src/main/scala/akka/util/Bootable.scala
similarity index 100%
rename from akka-actor/src/main/scala/util/Bootable.scala
rename to akka-actor/src/main/scala/akka/util/Bootable.scala
diff --git a/akka-actor/src/main/scala/util/Crypt.scala b/akka-actor/src/main/scala/akka/util/Crypt.scala
similarity index 100%
rename from akka-actor/src/main/scala/util/Crypt.scala
rename to akka-actor/src/main/scala/akka/util/Crypt.scala
diff --git a/akka-actor/src/main/scala/util/Duration.scala b/akka-actor/src/main/scala/akka/util/Duration.scala
similarity index 100%
rename from akka-actor/src/main/scala/util/Duration.scala
rename to akka-actor/src/main/scala/akka/util/Duration.scala
diff --git a/akka-actor/src/main/scala/util/HashCode.scala b/akka-actor/src/main/scala/akka/util/HashCode.scala
similarity index 100%
rename from akka-actor/src/main/scala/util/HashCode.scala
rename to akka-actor/src/main/scala/akka/util/HashCode.scala
diff --git a/akka-actor/src/main/scala/util/Helpers.scala b/akka-actor/src/main/scala/akka/util/Helpers.scala
similarity index 100%
rename from akka-actor/src/main/scala/util/Helpers.scala
rename to akka-actor/src/main/scala/akka/util/Helpers.scala
diff --git a/akka-actor/src/main/scala/util/ListenerManagement.scala b/akka-actor/src/main/scala/akka/util/ListenerManagement.scala
similarity index 100%
rename from akka-actor/src/main/scala/util/ListenerManagement.scala
rename to akka-actor/src/main/scala/akka/util/ListenerManagement.scala
diff --git a/akka-actor/src/main/scala/util/LockUtil.scala b/akka-actor/src/main/scala/akka/util/LockUtil.scala
similarity index 100%
rename from akka-actor/src/main/scala/util/LockUtil.scala
rename to akka-actor/src/main/scala/akka/util/LockUtil.scala
diff --git a/akka-actor/src/main/scala/util/Logging.scala b/akka-actor/src/main/scala/akka/util/Logging.scala
similarity index 100%
rename from akka-actor/src/main/scala/util/Logging.scala
rename to akka-actor/src/main/scala/akka/util/Logging.scala
diff --git a/akka-actor/src/main/scala/util/ReflectiveAccess.scala b/akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala
similarity index 100%
rename from akka-actor/src/main/scala/util/ReflectiveAccess.scala
rename to akka-actor/src/main/scala/akka/util/ReflectiveAccess.scala
diff --git a/akka-actor/src/test/scala/Messages.scala b/akka-actor/src/test/scala/akka/Messages.scala
similarity index 100%
rename from akka-actor/src/test/scala/Messages.scala
rename to akka-actor/src/test/scala/akka/Messages.scala
diff --git a/akka-actor/src/test/scala/actor/actor/ActorFireForgetRequestReplySpec.scala b/akka-actor/src/test/scala/akka/actor/actor/ActorFireForgetRequestReplySpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/actor/actor/ActorFireForgetRequestReplySpec.scala
rename to akka-actor/src/test/scala/akka/actor/actor/ActorFireForgetRequestReplySpec.scala
diff --git a/akka-actor/src/test/scala/actor/actor/ActorRefSpec.scala b/akka-actor/src/test/scala/akka/actor/actor/ActorRefSpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/actor/actor/ActorRefSpec.scala
rename to akka-actor/src/test/scala/akka/actor/actor/ActorRefSpec.scala
diff --git a/akka-actor/src/test/scala/actor/actor/Bench.scala b/akka-actor/src/test/scala/akka/actor/actor/Bench.scala
similarity index 100%
rename from akka-actor/src/test/scala/actor/actor/Bench.scala
rename to akka-actor/src/test/scala/akka/actor/actor/Bench.scala
diff --git a/akka-actor/src/test/scala/actor/actor/FSMActorSpec.scala b/akka-actor/src/test/scala/akka/actor/actor/FSMActorSpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/actor/actor/FSMActorSpec.scala
rename to akka-actor/src/test/scala/akka/actor/actor/FSMActorSpec.scala
diff --git a/akka-actor/src/test/scala/actor/actor/ForwardActorSpec.scala b/akka-actor/src/test/scala/akka/actor/actor/ForwardActorSpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/actor/actor/ForwardActorSpec.scala
rename to akka-actor/src/test/scala/akka/actor/actor/ForwardActorSpec.scala
diff --git a/akka-actor/src/test/scala/actor/actor/HotSwapSpec.scala b/akka-actor/src/test/scala/akka/actor/actor/HotSwapSpec.scala
similarity index 97%
rename from akka-actor/src/test/scala/actor/actor/HotSwapSpec.scala
rename to akka-actor/src/test/scala/akka/actor/actor/HotSwapSpec.scala
index 5fc9e119a0..011141c746 100644
--- a/akka-actor/src/test/scala/actor/actor/HotSwapSpec.scala
+++ b/akka-actor/src/test/scala/akka/actor/actor/HotSwapSpec.scala
@@ -16,11 +16,11 @@ class HotSwapSpec extends WordSpec with MustMatchers {
       val a = actorOf( new Actor {
         def receive = { case _ => _log += "default" }
       }).start
-      a ! HotSwap {
+      a ! HotSwap( self => {
         case _ =>
           _log += "swapped"
           barrier.await
-      }
+      })
       a ! "swapped"
       barrier.await
       _log must be ("swapped")
@@ -71,11 +71,11 @@ class HotSwapSpec extends WordSpec with MustMatchers {
 
       barrier.reset
       _log = ""
-      a ! HotSwap {
+      a ! HotSwap(self => {
         case "swapped" =>
           _log += "swapped"
           barrier.await
-      }
+      })
 
       a ! "swapped"
       barrier.await
diff --git a/akka-actor/src/test/scala/actor/actor/ReceiveTimeoutSpec.scala b/akka-actor/src/test/scala/akka/actor/actor/ReceiveTimeoutSpec.scala
similarity index 98%
rename from akka-actor/src/test/scala/actor/actor/ReceiveTimeoutSpec.scala
rename to akka-actor/src/test/scala/akka/actor/actor/ReceiveTimeoutSpec.scala
index b47b6830b4..e469ab43d1 100644
--- a/akka-actor/src/test/scala/actor/actor/ReceiveTimeoutSpec.scala
+++ b/akka-actor/src/test/scala/akka/actor/actor/ReceiveTimeoutSpec.scala
@@ -41,7 +41,7 @@ class ReceiveTimeoutSpec extends JUnitSuite {
     assert(timeoutLatch.tryAwait(3, TimeUnit.SECONDS))
 
     val swappedLatch = new StandardLatch
-    timeoutActor ! HotSwap({
+    timeoutActor ! HotSwap(self => {
       case ReceiveTimeout => swappedLatch.open
     })
 
diff --git a/akka-actor/src/test/scala/actor/supervisor/RestartStrategySpec.scala b/akka-actor/src/test/scala/akka/actor/supervisor/RestartStrategySpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/actor/supervisor/RestartStrategySpec.scala
rename to akka-actor/src/test/scala/akka/actor/supervisor/RestartStrategySpec.scala
diff --git a/akka-actor/src/test/scala/actor/supervisor/SupervisorHierarchySpec.scala b/akka-actor/src/test/scala/akka/actor/supervisor/SupervisorHierarchySpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/actor/supervisor/SupervisorHierarchySpec.scala
rename to akka-actor/src/test/scala/akka/actor/supervisor/SupervisorHierarchySpec.scala
diff --git a/akka-actor/src/test/scala/actor/supervisor/SupervisorMiscSpec.scala b/akka-actor/src/test/scala/akka/actor/supervisor/SupervisorMiscSpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/actor/supervisor/SupervisorMiscSpec.scala
rename to akka-actor/src/test/scala/akka/actor/supervisor/SupervisorMiscSpec.scala
diff --git a/akka-actor/src/test/scala/actor/supervisor/SupervisorSpec.scala b/akka-actor/src/test/scala/akka/actor/supervisor/SupervisorSpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/actor/supervisor/SupervisorSpec.scala
rename to akka-actor/src/test/scala/akka/actor/supervisor/SupervisorSpec.scala
diff --git a/akka-actor/src/test/scala/dataflow/DataFlowSpec.scala b/akka-actor/src/test/scala/akka/dataflow/DataFlowSpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/dataflow/DataFlowSpec.scala
rename to akka-actor/src/test/scala/akka/dataflow/DataFlowSpec.scala
diff --git a/akka-actor/src/test/scala/dispatch/ActorModelSpec.scala b/akka-actor/src/test/scala/akka/dispatch/ActorModelSpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/dispatch/ActorModelSpec.scala
rename to akka-actor/src/test/scala/akka/dispatch/ActorModelSpec.scala
diff --git a/akka-actor/src/test/scala/dispatch/DispatchersSpec.scala b/akka-actor/src/test/scala/akka/dispatch/DispatchersSpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/dispatch/DispatchersSpec.scala
rename to akka-actor/src/test/scala/akka/dispatch/DispatchersSpec.scala
diff --git a/akka-actor/src/test/scala/dispatch/ExecutorBasedEventDrivenDispatcherActorSpec.scala b/akka-actor/src/test/scala/akka/dispatch/ExecutorBasedEventDrivenDispatcherActorSpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/dispatch/ExecutorBasedEventDrivenDispatcherActorSpec.scala
rename to akka-actor/src/test/scala/akka/dispatch/ExecutorBasedEventDrivenDispatcherActorSpec.scala
diff --git a/akka-actor/src/test/scala/dispatch/ExecutorBasedEventDrivenDispatcherActorsSpec.scala b/akka-actor/src/test/scala/akka/dispatch/ExecutorBasedEventDrivenDispatcherActorsSpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/dispatch/ExecutorBasedEventDrivenDispatcherActorsSpec.scala
rename to akka-actor/src/test/scala/akka/dispatch/ExecutorBasedEventDrivenDispatcherActorsSpec.scala
diff --git a/akka-actor/src/test/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala b/akka-actor/src/test/scala/akka/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala
rename to akka-actor/src/test/scala/akka/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala
diff --git a/akka-actor/src/test/scala/dispatch/FutureSpec.scala b/akka-actor/src/test/scala/akka/dispatch/FutureSpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/dispatch/FutureSpec.scala
rename to akka-actor/src/test/scala/akka/dispatch/FutureSpec.scala
diff --git a/akka-actor/src/test/scala/dispatch/HawtDispatcherActorSpec.scala b/akka-actor/src/test/scala/akka/dispatch/HawtDispatcherActorSpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/dispatch/HawtDispatcherActorSpec.scala
rename to akka-actor/src/test/scala/akka/dispatch/HawtDispatcherActorSpec.scala
diff --git a/akka-actor/src/test/scala/dispatch/HawtDispatcherEchoServer.scala b/akka-actor/src/test/scala/akka/dispatch/HawtDispatcherEchoServer.scala
similarity index 100%
rename from akka-actor/src/test/scala/dispatch/HawtDispatcherEchoServer.scala
rename to akka-actor/src/test/scala/akka/dispatch/HawtDispatcherEchoServer.scala
diff --git a/akka-actor/src/test/scala/dispatch/MailboxConfigSpec.scala b/akka-actor/src/test/scala/akka/dispatch/MailboxConfigSpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/dispatch/MailboxConfigSpec.scala
rename to akka-actor/src/test/scala/akka/dispatch/MailboxConfigSpec.scala
diff --git a/akka-actor/src/test/scala/dispatch/ThreadBasedActorSpec.scala b/akka-actor/src/test/scala/akka/dispatch/ThreadBasedActorSpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/dispatch/ThreadBasedActorSpec.scala
rename to akka-actor/src/test/scala/akka/dispatch/ThreadBasedActorSpec.scala
diff --git a/akka-actor/src/test/scala/dispatch/ThreadBasedDispatcherSpec.scala b/akka-actor/src/test/scala/akka/dispatch/ThreadBasedDispatcherSpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/dispatch/ThreadBasedDispatcherSpec.scala
rename to akka-actor/src/test/scala/akka/dispatch/ThreadBasedDispatcherSpec.scala
diff --git a/akka-actor/src/test/scala/japi/JavaAPITest.scala b/akka-actor/src/test/scala/akka/japi/JavaAPITest.scala
similarity index 100%
rename from akka-actor/src/test/scala/japi/JavaAPITest.scala
rename to akka-actor/src/test/scala/akka/japi/JavaAPITest.scala
diff --git a/akka-actor/src/test/scala/misc/ActorRegistrySpec.scala b/akka-actor/src/test/scala/akka/misc/ActorRegistrySpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/misc/ActorRegistrySpec.scala
rename to akka-actor/src/test/scala/akka/misc/ActorRegistrySpec.scala
diff --git a/akka-actor/src/test/scala/misc/SchedulerSpec.scala b/akka-actor/src/test/scala/akka/misc/SchedulerSpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/misc/SchedulerSpec.scala
rename to akka-actor/src/test/scala/akka/misc/SchedulerSpec.scala
diff --git a/akka-actor/src/test/scala/routing/RoutingSpec.scala b/akka-actor/src/test/scala/akka/routing/RoutingSpec.scala
similarity index 100%
rename from akka-actor/src/test/scala/routing/RoutingSpec.scala
rename to akka-actor/src/test/scala/akka/routing/RoutingSpec.scala
diff --git a/akka-actor/src/test/scala/ticket/Ticket001Spec.scala b/akka-actor/src/test/scala/akka/ticket/Ticket001Spec.scala
similarity index 100%
rename from akka-actor/src/test/scala/ticket/Ticket001Spec.scala
rename to akka-actor/src/test/scala/akka/ticket/Ticket001Spec.scala
diff --git a/akka-camel/src/main/scala/CamelContextLifecycle.scala b/akka-camel/src/main/scala/akka/CamelContextLifecycle.scala
similarity index 100%
rename from akka-camel/src/main/scala/CamelContextLifecycle.scala
rename to akka-camel/src/main/scala/akka/CamelContextLifecycle.scala
diff --git a/akka-camel/src/main/scala/CamelService.scala b/akka-camel/src/main/scala/akka/CamelService.scala
similarity index 100%
rename from akka-camel/src/main/scala/CamelService.scala
rename to akka-camel/src/main/scala/akka/CamelService.scala
diff --git a/akka-camel/src/main/scala/Consumer.scala b/akka-camel/src/main/scala/akka/Consumer.scala
similarity index 100%
rename from akka-camel/src/main/scala/Consumer.scala
rename to akka-camel/src/main/scala/akka/Consumer.scala
diff --git a/akka-camel/src/main/scala/ConsumerPublisher.scala b/akka-camel/src/main/scala/akka/ConsumerPublisher.scala
similarity index 100%
rename from akka-camel/src/main/scala/ConsumerPublisher.scala
rename to akka-camel/src/main/scala/akka/ConsumerPublisher.scala
diff --git a/akka-camel/src/main/scala/Message.scala b/akka-camel/src/main/scala/akka/Message.scala
similarity index 100%
rename from akka-camel/src/main/scala/Message.scala
rename to akka-camel/src/main/scala/akka/Message.scala
diff --git a/akka-camel/src/main/scala/Producer.scala b/akka-camel/src/main/scala/akka/Producer.scala
similarity index 100%
rename from akka-camel/src/main/scala/Producer.scala
rename to akka-camel/src/main/scala/akka/Producer.scala
diff --git a/akka-camel/src/main/scala/component/ActorComponent.scala b/akka-camel/src/main/scala/akka/component/ActorComponent.scala
similarity index 100%
rename from akka-camel/src/main/scala/component/ActorComponent.scala
rename to akka-camel/src/main/scala/akka/component/ActorComponent.scala
diff --git a/akka-camel/src/main/scala/component/TypedActorComponent.scala b/akka-camel/src/main/scala/akka/component/TypedActorComponent.scala
similarity index 100%
rename from akka-camel/src/main/scala/component/TypedActorComponent.scala
rename to akka-camel/src/main/scala/akka/component/TypedActorComponent.scala
diff --git a/akka-camel/src/test/scala/CamelContextLifecycleTest.scala b/akka-camel/src/test/scala/akka/CamelContextLifecycleTest.scala
similarity index 100%
rename from akka-camel/src/test/scala/CamelContextLifecycleTest.scala
rename to akka-camel/src/test/scala/akka/CamelContextLifecycleTest.scala
diff --git a/akka-camel/src/test/scala/CamelExchangeAdapterTest.scala b/akka-camel/src/test/scala/akka/CamelExchangeAdapterTest.scala
similarity index 100%
rename from akka-camel/src/test/scala/CamelExchangeAdapterTest.scala
rename to akka-camel/src/test/scala/akka/CamelExchangeAdapterTest.scala
diff --git a/akka-camel/src/test/scala/CamelMessageAdapterTest.scala b/akka-camel/src/test/scala/akka/CamelMessageAdapterTest.scala
similarity index 100%
rename from akka-camel/src/test/scala/CamelMessageAdapterTest.scala
rename to akka-camel/src/test/scala/akka/CamelMessageAdapterTest.scala
diff --git a/akka-camel/src/test/scala/CamelServiceManagerTest.scala b/akka-camel/src/test/scala/akka/CamelServiceManagerTest.scala
similarity index 100%
rename from akka-camel/src/test/scala/CamelServiceManagerTest.scala
rename to akka-camel/src/test/scala/akka/CamelServiceManagerTest.scala
diff --git a/akka-camel/src/test/scala/ConsumerJavaTest.scala b/akka-camel/src/test/scala/akka/ConsumerJavaTest.scala
similarity index 100%
rename from akka-camel/src/test/scala/ConsumerJavaTest.scala
rename to akka-camel/src/test/scala/akka/ConsumerJavaTest.scala
diff --git a/akka-camel/src/test/scala/ConsumerRegisteredTest.scala b/akka-camel/src/test/scala/akka/ConsumerRegisteredTest.scala
similarity index 100%
rename from akka-camel/src/test/scala/ConsumerRegisteredTest.scala
rename to akka-camel/src/test/scala/akka/ConsumerRegisteredTest.scala
diff --git a/akka-camel/src/test/scala/ConsumerScalaTest.scala b/akka-camel/src/test/scala/akka/ConsumerScalaTest.scala
similarity index 100%
rename from akka-camel/src/test/scala/ConsumerScalaTest.scala
rename to akka-camel/src/test/scala/akka/ConsumerScalaTest.scala
diff --git a/akka-camel/src/test/scala/MessageJavaTest.scala b/akka-camel/src/test/scala/akka/MessageJavaTest.scala
similarity index 100%
rename from akka-camel/src/test/scala/MessageJavaTest.scala
rename to akka-camel/src/test/scala/akka/MessageJavaTest.scala
diff --git a/akka-camel/src/test/scala/MessageScalaTest.scala b/akka-camel/src/test/scala/akka/MessageScalaTest.scala
similarity index 100%
rename from akka-camel/src/test/scala/MessageScalaTest.scala
rename to akka-camel/src/test/scala/akka/MessageScalaTest.scala
diff --git a/akka-camel/src/test/scala/ProducerFeatureTest.scala b/akka-camel/src/test/scala/akka/ProducerFeatureTest.scala
similarity index 100%
rename from akka-camel/src/test/scala/ProducerFeatureTest.scala
rename to akka-camel/src/test/scala/akka/ProducerFeatureTest.scala
diff --git a/akka-camel/src/test/scala/PublishRequestorTest.scala b/akka-camel/src/test/scala/akka/PublishRequestorTest.scala
similarity index 100%
rename from akka-camel/src/test/scala/PublishRequestorTest.scala
rename to akka-camel/src/test/scala/akka/PublishRequestorTest.scala
diff --git a/akka-camel/src/test/scala/RemoteConsumerTest.scala b/akka-camel/src/test/scala/akka/RemoteConsumerTest.scala
similarity index 100%
rename from akka-camel/src/test/scala/RemoteConsumerTest.scala
rename to akka-camel/src/test/scala/akka/RemoteConsumerTest.scala
diff --git a/akka-camel/src/test/scala/UntypedProducerFeatureTest.scala b/akka-camel/src/test/scala/akka/UntypedProducerFeatureTest.scala
similarity index 100%
rename from akka-camel/src/test/scala/UntypedProducerFeatureTest.scala
rename to akka-camel/src/test/scala/akka/UntypedProducerFeatureTest.scala
diff --git a/akka-camel/src/test/scala/component/ActorComponentFeatureTest.scala b/akka-camel/src/test/scala/akka/component/ActorComponentFeatureTest.scala
similarity index 100%
rename from akka-camel/src/test/scala/component/ActorComponentFeatureTest.scala
rename to akka-camel/src/test/scala/akka/component/ActorComponentFeatureTest.scala
diff --git a/akka-camel/src/test/scala/component/ActorComponentTest.scala b/akka-camel/src/test/scala/akka/component/ActorComponentTest.scala
similarity index 100%
rename from akka-camel/src/test/scala/component/ActorComponentTest.scala
rename to akka-camel/src/test/scala/akka/component/ActorComponentTest.scala
diff --git a/akka-camel/src/test/scala/component/ActorProducerTest.scala b/akka-camel/src/test/scala/akka/component/ActorProducerTest.scala
similarity index 100%
rename from akka-camel/src/test/scala/component/ActorProducerTest.scala
rename to akka-camel/src/test/scala/akka/component/ActorProducerTest.scala
diff --git a/akka-camel/src/test/scala/component/TypedActorComponentFeatureTest.scala b/akka-camel/src/test/scala/akka/component/TypedActorComponentFeatureTest.scala
similarity index 100%
rename from akka-camel/src/test/scala/component/TypedActorComponentFeatureTest.scala
rename to akka-camel/src/test/scala/akka/component/TypedActorComponentFeatureTest.scala
diff --git a/akka-camel/src/test/scala/support/TestSupport.scala b/akka-camel/src/test/scala/akka/support/TestSupport.scala
similarity index 100%
rename from akka-camel/src/test/scala/support/TestSupport.scala
rename to akka-camel/src/test/scala/akka/support/TestSupport.scala
diff --git a/akka-http/src/main/scala/AkkaBroadcaster.scala b/akka-http/src/main/scala/akka/AkkaBroadcaster.scala
similarity index 100%
rename from akka-http/src/main/scala/AkkaBroadcaster.scala
rename to akka-http/src/main/scala/akka/AkkaBroadcaster.scala
diff --git a/akka-http/src/main/scala/AkkaCometServlet.scala b/akka-http/src/main/scala/akka/AkkaCometServlet.scala
similarity index 100%
rename from akka-http/src/main/scala/AkkaCometServlet.scala
rename to akka-http/src/main/scala/akka/AkkaCometServlet.scala
diff --git a/akka-http/src/main/scala/AkkaLoader.scala b/akka-http/src/main/scala/akka/AkkaLoader.scala
similarity index 100%
rename from akka-http/src/main/scala/AkkaLoader.scala
rename to akka-http/src/main/scala/akka/AkkaLoader.scala
diff --git a/akka-http/src/main/scala/DefaultAkkaLoader.scala b/akka-http/src/main/scala/akka/DefaultAkkaLoader.scala
similarity index 100%
rename from akka-http/src/main/scala/DefaultAkkaLoader.scala
rename to akka-http/src/main/scala/akka/DefaultAkkaLoader.scala
diff --git a/akka-http/src/main/scala/EmbeddedAppServer.scala b/akka-http/src/main/scala/akka/EmbeddedAppServer.scala
similarity index 100%
rename from akka-http/src/main/scala/EmbeddedAppServer.scala
rename to akka-http/src/main/scala/akka/EmbeddedAppServer.scala
diff --git a/akka-http/src/main/scala/Initializer.scala b/akka-http/src/main/scala/akka/Initializer.scala
similarity index 100%
rename from akka-http/src/main/scala/Initializer.scala
rename to akka-http/src/main/scala/akka/Initializer.scala
diff --git a/akka-http/src/main/scala/ListWriter.scala b/akka-http/src/main/scala/akka/ListWriter.scala
similarity index 100%
rename from akka-http/src/main/scala/ListWriter.scala
rename to akka-http/src/main/scala/akka/ListWriter.scala
diff --git a/akka-http/src/main/scala/Security.scala b/akka-http/src/main/scala/akka/Security.scala
similarity index 100%
rename from akka-http/src/main/scala/Security.scala
rename to akka-http/src/main/scala/akka/Security.scala
diff --git a/akka-jta/src/main/scala/AtomikosTransactionService.scala b/akka-jta/src/main/scala/akka/AtomikosTransactionService.scala
similarity index 100%
rename from akka-jta/src/main/scala/AtomikosTransactionService.scala
rename to akka-jta/src/main/scala/akka/AtomikosTransactionService.scala
diff --git a/akka-jta/src/main/scala/JTA.scala b/akka-jta/src/main/scala/akka/JTA.scala
similarity index 100%
rename from akka-jta/src/main/scala/JTA.scala
rename to akka-jta/src/main/scala/akka/JTA.scala
diff --git a/akka-jta/src/main/scala/TransactionContext.scala b/akka-jta/src/main/scala/akka/TransactionContext.scala
similarity index 100%
rename from akka-jta/src/main/scala/TransactionContext.scala
rename to akka-jta/src/main/scala/akka/TransactionContext.scala
diff --git a/akka-jta/src/main/scala/TransactionProtocol.scala b/akka-jta/src/main/scala/akka/TransactionProtocol.scala
similarity index 100%
rename from akka-jta/src/main/scala/TransactionProtocol.scala
rename to akka-jta/src/main/scala/akka/TransactionProtocol.scala
diff --git a/akka-kernel/src/main/scala/Kernel.scala b/akka-kernel/src/main/scala/akka/Kernel.scala
similarity index 100%
rename from akka-kernel/src/main/scala/Kernel.scala
rename to akka-kernel/src/main/scala/akka/Kernel.scala
diff --git a/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraSession.scala b/akka-persistence/akka-persistence-cassandra/src/main/scala/akka/CassandraSession.scala
similarity index 100%
rename from akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraSession.scala
rename to akka-persistence/akka-persistence-cassandra/src/main/scala/akka/CassandraSession.scala
diff --git a/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorage.scala b/akka-persistence/akka-persistence-cassandra/src/main/scala/akka/CassandraStorage.scala
similarity index 100%
rename from akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorage.scala
rename to akka-persistence/akka-persistence-cassandra/src/main/scala/akka/CassandraStorage.scala
diff --git a/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorageBackend.scala b/akka-persistence/akka-persistence-cassandra/src/main/scala/akka/CassandraStorageBackend.scala
similarity index 100%
rename from akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorageBackend.scala
rename to akka-persistence/akka-persistence-cassandra/src/main/scala/akka/CassandraStorageBackend.scala
diff --git a/akka-persistence/akka-persistence-common/src/main/scala/CommonStorageBackend.scala b/akka-persistence/akka-persistence-common/src/main/scala/akka/CommonStorageBackend.scala
similarity index 100%
rename from akka-persistence/akka-persistence-common/src/main/scala/CommonStorageBackend.scala
rename to akka-persistence/akka-persistence-common/src/main/scala/akka/CommonStorageBackend.scala
diff --git a/akka-persistence/akka-persistence-common/src/main/scala/Pool.scala b/akka-persistence/akka-persistence-common/src/main/scala/akka/Pool.scala
similarity index 100%
rename from akka-persistence/akka-persistence-common/src/main/scala/Pool.scala
rename to akka-persistence/akka-persistence-common/src/main/scala/akka/Pool.scala
diff --git a/akka-persistence/akka-persistence-common/src/main/scala/Storage.scala b/akka-persistence/akka-persistence-common/src/main/scala/akka/Storage.scala
similarity index 100%
rename from akka-persistence/akka-persistence-common/src/main/scala/Storage.scala
rename to akka-persistence/akka-persistence-common/src/main/scala/akka/Storage.scala
diff --git a/akka-persistence/akka-persistence-common/src/main/scala/StorageBackend.scala b/akka-persistence/akka-persistence-common/src/main/scala/akka/StorageBackend.scala
similarity index 100%
rename from akka-persistence/akka-persistence-common/src/main/scala/StorageBackend.scala
rename to akka-persistence/akka-persistence-common/src/main/scala/akka/StorageBackend.scala
diff --git a/akka-persistence/akka-persistence-couchdb/src/main/scala/CouchDBStorage.scala b/akka-persistence/akka-persistence-couchdb/src/main/scala/akka/CouchDBStorage.scala
similarity index 100%
rename from akka-persistence/akka-persistence-couchdb/src/main/scala/CouchDBStorage.scala
rename to akka-persistence/akka-persistence-couchdb/src/main/scala/akka/CouchDBStorage.scala
diff --git a/akka-persistence/akka-persistence-couchdb/src/main/scala/CouchDBStorageBackend.scala b/akka-persistence/akka-persistence-couchdb/src/main/scala/akka/CouchDBStorageBackend.scala
similarity index 100%
rename from akka-persistence/akka-persistence-couchdb/src/main/scala/CouchDBStorageBackend.scala
rename to akka-persistence/akka-persistence-couchdb/src/main/scala/akka/CouchDBStorageBackend.scala
diff --git a/akka-persistence/akka-persistence-hbase/src/main/scala/HbaseStorage.scala b/akka-persistence/akka-persistence-hbase/src/main/scala/akka/HbaseStorage.scala
similarity index 100%
rename from akka-persistence/akka-persistence-hbase/src/main/scala/HbaseStorage.scala
rename to akka-persistence/akka-persistence-hbase/src/main/scala/akka/HbaseStorage.scala
diff --git a/akka-persistence/akka-persistence-hbase/src/main/scala/HbaseStorageBackend.scala b/akka-persistence/akka-persistence-hbase/src/main/scala/akka/HbaseStorageBackend.scala
similarity index 100%
rename from akka-persistence/akka-persistence-hbase/src/main/scala/HbaseStorageBackend.scala
rename to akka-persistence/akka-persistence-hbase/src/main/scala/akka/HbaseStorageBackend.scala
diff --git a/akka-persistence/akka-persistence-memcached/src/main/scala/MemcachedStorage.scala b/akka-persistence/akka-persistence-memcached/src/main/scala/akka/MemcachedStorage.scala
similarity index 100%
rename from akka-persistence/akka-persistence-memcached/src/main/scala/MemcachedStorage.scala
rename to akka-persistence/akka-persistence-memcached/src/main/scala/akka/MemcachedStorage.scala
diff --git a/akka-persistence/akka-persistence-memcached/src/main/scala/MemcachedStorageBackend.scala b/akka-persistence/akka-persistence-memcached/src/main/scala/akka/MemcachedStorageBackend.scala
similarity index 100%
rename from akka-persistence/akka-persistence-memcached/src/main/scala/MemcachedStorageBackend.scala
rename to akka-persistence/akka-persistence-memcached/src/main/scala/akka/MemcachedStorageBackend.scala
diff --git a/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorage.scala b/akka-persistence/akka-persistence-mongo/src/main/scala/akka/MongoStorage.scala
similarity index 100%
rename from akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorage.scala
rename to akka-persistence/akka-persistence-mongo/src/main/scala/akka/MongoStorage.scala
diff --git a/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala b/akka-persistence/akka-persistence-mongo/src/main/scala/akka/MongoStorageBackend.scala
similarity index 100%
rename from akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala
rename to akka-persistence/akka-persistence-mongo/src/main/scala/akka/MongoStorageBackend.scala
diff --git a/akka-persistence/akka-persistence-redis/src/main/scala/RedisPubSubServer.scala b/akka-persistence/akka-persistence-redis/src/main/scala/akka/RedisPubSubServer.scala
similarity index 100%
rename from akka-persistence/akka-persistence-redis/src/main/scala/RedisPubSubServer.scala
rename to akka-persistence/akka-persistence-redis/src/main/scala/akka/RedisPubSubServer.scala
diff --git a/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorage.scala b/akka-persistence/akka-persistence-redis/src/main/scala/akka/RedisStorage.scala
similarity index 100%
rename from akka-persistence/akka-persistence-redis/src/main/scala/RedisStorage.scala
rename to akka-persistence/akka-persistence-redis/src/main/scala/akka/RedisStorage.scala
diff --git a/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala b/akka-persistence/akka-persistence-redis/src/main/scala/akka/RedisStorageBackend.scala
similarity index 100%
rename from akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala
rename to akka-persistence/akka-persistence-redis/src/main/scala/akka/RedisStorageBackend.scala
diff --git a/akka-persistence/akka-persistence-riak/src/main/scala/RiakStorage.scala b/akka-persistence/akka-persistence-riak/src/main/scala/akka/RiakStorage.scala
similarity index 100%
rename from akka-persistence/akka-persistence-riak/src/main/scala/RiakStorage.scala
rename to akka-persistence/akka-persistence-riak/src/main/scala/akka/RiakStorage.scala
diff --git a/akka-persistence/akka-persistence-riak/src/main/scala/RiakStorageBackend.scala b/akka-persistence/akka-persistence-riak/src/main/scala/akka/RiakStorageBackend.scala
similarity index 100%
rename from akka-persistence/akka-persistence-riak/src/main/scala/RiakStorageBackend.scala
rename to akka-persistence/akka-persistence-riak/src/main/scala/akka/RiakStorageBackend.scala
diff --git a/akka-persistence/akka-persistence-simpledb/src/main/scala/SimpledbStorage.scala b/akka-persistence/akka-persistence-simpledb/src/main/scala/akka/SimpledbStorage.scala
similarity index 100%
rename from akka-persistence/akka-persistence-simpledb/src/main/scala/SimpledbStorage.scala
rename to akka-persistence/akka-persistence-simpledb/src/main/scala/akka/SimpledbStorage.scala
diff --git a/akka-persistence/akka-persistence-simpledb/src/main/scala/SimpledbStorageBackend.scala b/akka-persistence/akka-persistence-simpledb/src/main/scala/akka/SimpledbStorageBackend.scala
similarity index 100%
rename from akka-persistence/akka-persistence-simpledb/src/main/scala/SimpledbStorageBackend.scala
rename to akka-persistence/akka-persistence-simpledb/src/main/scala/akka/SimpledbStorageBackend.scala
diff --git a/akka-persistence/akka-persistence-voldemort/src/main/scala/VoldemortStorage.scala b/akka-persistence/akka-persistence-voldemort/src/main/scala/akka/VoldemortStorage.scala
similarity index 100%
rename from akka-persistence/akka-persistence-voldemort/src/main/scala/VoldemortStorage.scala
rename to akka-persistence/akka-persistence-voldemort/src/main/scala/akka/VoldemortStorage.scala
diff --git a/akka-persistence/akka-persistence-voldemort/src/main/scala/VoldemortStorageBackend.scala b/akka-persistence/akka-persistence-voldemort/src/main/scala/akka/VoldemortStorageBackend.scala
similarity index 100%
rename from akka-persistence/akka-persistence-voldemort/src/main/scala/VoldemortStorageBackend.scala
rename to akka-persistence/akka-persistence-voldemort/src/main/scala/akka/VoldemortStorageBackend.scala
diff --git a/akka-remote/src/main/scala/remote/BootableRemoteActorService.scala b/akka-remote/src/main/scala/akka/remote/BootableRemoteActorService.scala
similarity index 100%
rename from akka-remote/src/main/scala/remote/BootableRemoteActorService.scala
rename to akka-remote/src/main/scala/akka/remote/BootableRemoteActorService.scala
diff --git a/akka-remote/src/main/scala/remote/MessageSerializer.scala b/akka-remote/src/main/scala/akka/remote/MessageSerializer.scala
similarity index 100%
rename from akka-remote/src/main/scala/remote/MessageSerializer.scala
rename to akka-remote/src/main/scala/akka/remote/MessageSerializer.scala
diff --git a/akka-remote/src/main/scala/remote/RemoteClient.scala b/akka-remote/src/main/scala/akka/remote/RemoteClient.scala
similarity index 100%
rename from akka-remote/src/main/scala/remote/RemoteClient.scala
rename to akka-remote/src/main/scala/akka/remote/RemoteClient.scala
diff --git a/akka-remote/src/main/scala/remote/RemoteServer.scala b/akka-remote/src/main/scala/akka/remote/RemoteServer.scala
similarity index 100%
rename from akka-remote/src/main/scala/remote/RemoteServer.scala
rename to akka-remote/src/main/scala/akka/remote/RemoteServer.scala
diff --git a/akka-remote/src/main/scala/serialization/Binary.scala b/akka-remote/src/main/scala/akka/serialization/Binary.scala
similarity index 100%
rename from akka-remote/src/main/scala/serialization/Binary.scala
rename to akka-remote/src/main/scala/akka/serialization/Binary.scala
diff --git a/akka-remote/src/main/scala/serialization/Compression.scala b/akka-remote/src/main/scala/akka/serialization/Compression.scala
similarity index 100%
rename from akka-remote/src/main/scala/serialization/Compression.scala
rename to akka-remote/src/main/scala/akka/serialization/Compression.scala
diff --git a/akka-remote/src/main/scala/serialization/Serializable.scala b/akka-remote/src/main/scala/akka/serialization/Serializable.scala
similarity index 100%
rename from akka-remote/src/main/scala/serialization/Serializable.scala
rename to akka-remote/src/main/scala/akka/serialization/Serializable.scala
diff --git a/akka-remote/src/main/scala/serialization/SerializationProtocol.scala b/akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
similarity index 100%
rename from akka-remote/src/main/scala/serialization/SerializationProtocol.scala
rename to akka-remote/src/main/scala/akka/serialization/SerializationProtocol.scala
diff --git a/akka-remote/src/main/scala/serialization/Serializer.scala b/akka-remote/src/main/scala/akka/serialization/Serializer.scala
similarity index 100%
rename from akka-remote/src/main/scala/serialization/Serializer.scala
rename to akka-remote/src/main/scala/akka/serialization/Serializer.scala
diff --git a/akka-remote/src/main/scala/serialization/package.scala b/akka-remote/src/main/scala/akka/serialization/package.scala
similarity index 100%
rename from akka-remote/src/main/scala/serialization/package.scala
rename to akka-remote/src/main/scala/akka/serialization/package.scala
diff --git a/akka-spring/src/main/scala/ActorBeanDefinitionParser.scala b/akka-spring/src/main/scala/akka/ActorBeanDefinitionParser.scala
similarity index 100%
rename from akka-spring/src/main/scala/ActorBeanDefinitionParser.scala
rename to akka-spring/src/main/scala/akka/ActorBeanDefinitionParser.scala
diff --git a/akka-spring/src/main/scala/ActorFactoryBean.scala b/akka-spring/src/main/scala/akka/ActorFactoryBean.scala
similarity index 100%
rename from akka-spring/src/main/scala/ActorFactoryBean.scala
rename to akka-spring/src/main/scala/akka/ActorFactoryBean.scala
diff --git a/akka-spring/src/main/scala/ActorParser.scala b/akka-spring/src/main/scala/akka/ActorParser.scala
similarity index 100%
rename from akka-spring/src/main/scala/ActorParser.scala
rename to akka-spring/src/main/scala/akka/ActorParser.scala
diff --git a/akka-spring/src/main/scala/ActorProperties.scala b/akka-spring/src/main/scala/akka/ActorProperties.scala
similarity index 100%
rename from akka-spring/src/main/scala/ActorProperties.scala
rename to akka-spring/src/main/scala/akka/ActorProperties.scala
diff --git a/akka-spring/src/main/scala/AkkaNamespaceHandler.scala b/akka-spring/src/main/scala/akka/AkkaNamespaceHandler.scala
similarity index 100%
rename from akka-spring/src/main/scala/AkkaNamespaceHandler.scala
rename to akka-spring/src/main/scala/akka/AkkaNamespaceHandler.scala
diff --git a/akka-spring/src/main/scala/AkkaSpringConfigurationTags.scala b/akka-spring/src/main/scala/akka/AkkaSpringConfigurationTags.scala
similarity index 100%
rename from akka-spring/src/main/scala/AkkaSpringConfigurationTags.scala
rename to akka-spring/src/main/scala/akka/AkkaSpringConfigurationTags.scala
diff --git a/akka-spring/src/main/scala/CamelServiceBeanDefinitionParser.scala b/akka-spring/src/main/scala/akka/CamelServiceBeanDefinitionParser.scala
similarity index 100%
rename from akka-spring/src/main/scala/CamelServiceBeanDefinitionParser.scala
rename to akka-spring/src/main/scala/akka/CamelServiceBeanDefinitionParser.scala
diff --git a/akka-spring/src/main/scala/CamelServiceFactoryBean.scala b/akka-spring/src/main/scala/akka/CamelServiceFactoryBean.scala
similarity index 100%
rename from akka-spring/src/main/scala/CamelServiceFactoryBean.scala
rename to akka-spring/src/main/scala/akka/CamelServiceFactoryBean.scala
diff --git a/akka-spring/src/main/scala/ConfiggyPropertyPlaceholderConfigurer.scala b/akka-spring/src/main/scala/akka/ConfiggyPropertyPlaceholderConfigurer.scala
similarity index 100%
rename from akka-spring/src/main/scala/ConfiggyPropertyPlaceholderConfigurer.scala
rename to akka-spring/src/main/scala/akka/ConfiggyPropertyPlaceholderConfigurer.scala
diff --git a/akka-spring/src/main/scala/DispatcherBeanDefinitionParser.scala b/akka-spring/src/main/scala/akka/DispatcherBeanDefinitionParser.scala
similarity index 100%
rename from akka-spring/src/main/scala/DispatcherBeanDefinitionParser.scala
rename to akka-spring/src/main/scala/akka/DispatcherBeanDefinitionParser.scala
diff --git a/akka-spring/src/main/scala/DispatcherFactoryBean.scala b/akka-spring/src/main/scala/akka/DispatcherFactoryBean.scala
similarity index 100%
rename from akka-spring/src/main/scala/DispatcherFactoryBean.scala
rename to akka-spring/src/main/scala/akka/DispatcherFactoryBean.scala
diff --git a/akka-spring/src/main/scala/DispatcherProperties.scala b/akka-spring/src/main/scala/akka/DispatcherProperties.scala
similarity index 100%
rename from akka-spring/src/main/scala/DispatcherProperties.scala
rename to akka-spring/src/main/scala/akka/DispatcherProperties.scala
diff --git a/akka-spring/src/main/scala/PropertyEntries.scala b/akka-spring/src/main/scala/akka/PropertyEntries.scala
similarity index 100%
rename from akka-spring/src/main/scala/PropertyEntries.scala
rename to akka-spring/src/main/scala/akka/PropertyEntries.scala
diff --git a/akka-spring/src/main/scala/StringReflect.scala b/akka-spring/src/main/scala/akka/StringReflect.scala
similarity index 100%
rename from akka-spring/src/main/scala/StringReflect.scala
rename to akka-spring/src/main/scala/akka/StringReflect.scala
diff --git a/akka-spring/src/main/scala/SupervisionBeanDefinitionParser.scala b/akka-spring/src/main/scala/akka/SupervisionBeanDefinitionParser.scala
similarity index 100%
rename from akka-spring/src/main/scala/SupervisionBeanDefinitionParser.scala
rename to akka-spring/src/main/scala/akka/SupervisionBeanDefinitionParser.scala
diff --git a/akka-spring/src/main/scala/SupervisionFactoryBean.scala b/akka-spring/src/main/scala/akka/SupervisionFactoryBean.scala
similarity index 100%
rename from akka-spring/src/main/scala/SupervisionFactoryBean.scala
rename to akka-spring/src/main/scala/akka/SupervisionFactoryBean.scala
diff --git a/akka-stm/src/main/scala/agent/Agent.scala b/akka-stm/src/main/scala/akka/agent/Agent.scala
similarity index 100%
rename from akka-stm/src/main/scala/agent/Agent.scala
rename to akka-stm/src/main/scala/akka/agent/Agent.scala
diff --git a/akka-stm/src/main/scala/stm/Atomic.scala b/akka-stm/src/main/scala/akka/stm/Atomic.scala
similarity index 100%
rename from akka-stm/src/main/scala/stm/Atomic.scala
rename to akka-stm/src/main/scala/akka/stm/Atomic.scala
diff --git a/akka-stm/src/main/scala/stm/Ref.scala b/akka-stm/src/main/scala/akka/stm/Ref.scala
similarity index 100%
rename from akka-stm/src/main/scala/stm/Ref.scala
rename to akka-stm/src/main/scala/akka/stm/Ref.scala
diff --git a/akka-stm/src/main/scala/stm/Stm.scala b/akka-stm/src/main/scala/akka/stm/Stm.scala
similarity index 100%
rename from akka-stm/src/main/scala/stm/Stm.scala
rename to akka-stm/src/main/scala/akka/stm/Stm.scala
diff --git a/akka-stm/src/main/scala/stm/Transaction.scala b/akka-stm/src/main/scala/akka/stm/Transaction.scala
similarity index 100%
rename from akka-stm/src/main/scala/stm/Transaction.scala
rename to akka-stm/src/main/scala/akka/stm/Transaction.scala
diff --git a/akka-stm/src/main/scala/stm/TransactionFactory.scala b/akka-stm/src/main/scala/akka/stm/TransactionFactory.scala
similarity index 100%
rename from akka-stm/src/main/scala/stm/TransactionFactory.scala
rename to akka-stm/src/main/scala/akka/stm/TransactionFactory.scala
diff --git a/akka-stm/src/main/scala/stm/TransactionFactoryBuilder.scala b/akka-stm/src/main/scala/akka/stm/TransactionFactoryBuilder.scala
similarity index 100%
rename from akka-stm/src/main/scala/stm/TransactionFactoryBuilder.scala
rename to akka-stm/src/main/scala/akka/stm/TransactionFactoryBuilder.scala
diff --git a/akka-stm/src/main/scala/stm/TransactionalMap.scala b/akka-stm/src/main/scala/akka/stm/TransactionalMap.scala
similarity index 100%
rename from akka-stm/src/main/scala/stm/TransactionalMap.scala
rename to akka-stm/src/main/scala/akka/stm/TransactionalMap.scala
diff --git a/akka-stm/src/main/scala/stm/TransactionalVector.scala b/akka-stm/src/main/scala/akka/stm/TransactionalVector.scala
similarity index 100%
rename from akka-stm/src/main/scala/stm/TransactionalVector.scala
rename to akka-stm/src/main/scala/akka/stm/TransactionalVector.scala
diff --git a/akka-stm/src/main/scala/stm/package.scala b/akka-stm/src/main/scala/akka/stm/package.scala
similarity index 100%
rename from akka-stm/src/main/scala/stm/package.scala
rename to akka-stm/src/main/scala/akka/stm/package.scala
diff --git a/akka-stm/src/main/scala/transactor/Atomically.scala b/akka-stm/src/main/scala/akka/transactor/Atomically.scala
similarity index 100%
rename from akka-stm/src/main/scala/transactor/Atomically.scala
rename to akka-stm/src/main/scala/akka/transactor/Atomically.scala
diff --git a/akka-stm/src/main/scala/transactor/Coordinated.scala b/akka-stm/src/main/scala/akka/transactor/Coordinated.scala
similarity index 100%
rename from akka-stm/src/main/scala/transactor/Coordinated.scala
rename to akka-stm/src/main/scala/akka/transactor/Coordinated.scala
diff --git a/akka-stm/src/main/scala/transactor/Transactor.scala b/akka-stm/src/main/scala/akka/transactor/Transactor.scala
similarity index 100%
rename from akka-stm/src/main/scala/transactor/Transactor.scala
rename to akka-stm/src/main/scala/akka/transactor/Transactor.scala
diff --git a/akka-stm/src/main/scala/transactor/UntypedTransactor.scala b/akka-stm/src/main/scala/akka/transactor/UntypedTransactor.scala
similarity index 100%
rename from akka-stm/src/main/scala/transactor/UntypedTransactor.scala
rename to akka-stm/src/main/scala/akka/transactor/UntypedTransactor.scala
diff --git a/akka-typed-actor/src/main/scala/actor/TypedActor.scala b/akka-typed-actor/src/main/scala/akka/actor/TypedActor.scala
similarity index 100%
rename from akka-typed-actor/src/main/scala/actor/TypedActor.scala
rename to akka-typed-actor/src/main/scala/akka/actor/TypedActor.scala
diff --git a/akka-typed-actor/src/main/scala/config/TypedActorConfigurator.scala b/akka-typed-actor/src/main/scala/akka/config/TypedActorConfigurator.scala
similarity index 100%
rename from akka-typed-actor/src/main/scala/config/TypedActorConfigurator.scala
rename to akka-typed-actor/src/main/scala/akka/config/TypedActorConfigurator.scala
diff --git a/akka-typed-actor/src/main/scala/config/TypedActorGuiceConfigurator.scala b/akka-typed-actor/src/main/scala/akka/config/TypedActorGuiceConfigurator.scala
similarity index 100%
rename from akka-typed-actor/src/main/scala/config/TypedActorGuiceConfigurator.scala
rename to akka-typed-actor/src/main/scala/akka/config/TypedActorGuiceConfigurator.scala
diff --git a/akka-typed-actor/src/main/scala/transactor/Coordination.scala b/akka-typed-actor/src/main/scala/akka/transactor/Coordination.scala
similarity index 100%
rename from akka-typed-actor/src/main/scala/transactor/Coordination.scala
rename to akka-typed-actor/src/main/scala/akka/transactor/Coordination.scala
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 79f42869fe..f8a91ad62f 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -30,7 +30,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
   // -------------------------------------------------------------------------------------------------------------------
   // Deploy/dist settings
   // -------------------------------------------------------------------------------------------------------------------
-  def distName = "%s_%s-%s".format(name, buildScalaVersion, version)
+  def distName = "%s-%s".format(name, version)
   lazy val deployPath = info.projectPath / "deploy"
   lazy val distPath = info.projectPath / "dist"
 
@@ -307,6 +307,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
   // -------------------------------------------------------------------------------------------------------------------
   // Miscellaneous
   // -------------------------------------------------------------------------------------------------------------------
+  override def artifactID: String = this.name
 
   override def mainClass = Some("akka.kernel.Main")
 
@@ -328,23 +329,23 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
     .mkString(" ") +
     " config/" +
     " scala-library.jar" +
-    " dist/akka-actor_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-stm_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-typed-actor_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-remote_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-http_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-camel_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-amqp_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-persistence-common_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-persistence-redis_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-persistence-mongo_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-persistence-cassandra_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-persistence-voldemort_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-persistence-riak_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-persistence-hbase_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-kernel_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-spring_%s-%s.jar".format(buildScalaVersion, version) +
-    " dist/akka-jta_%s-%s.jar".format(buildScalaVersion, version)
+    " dist/akka-actor-%s.jar".format(version) +
+    " dist/akka-stm-%s.jar".format(version) +
+    " dist/akka-typed-actor-%s.jar".format(version) +
+    " dist/akka-remote-%s.jar".format(version) +
+    " dist/akka-http-%s.jar".format(version) +
+    " dist/akka-camel-%s.jar".format(version) +
+    " dist/akka-amqp-%s.jar".format(version) +
+    " dist/akka-persistence-common-%s.jar".format(version) +
+    " dist/akka-persistence-redis-%s.jar".format(version) +
+    " dist/akka-persistence-mongo-%s.jar".format(version) +
+    " dist/akka-persistence-cassandra-%s.jar".format(version) +
+    " dist/akka-persistence-voldemort-%s.jar".format(version) +
+    " dist/akka-persistence-riak-%s.jar".format(version) +
+    " dist/akka-persistence-hbase-%s.jar".format(version) +
+    " dist/akka-kernel-%s.jar".format(version) +
+    " dist/akka-spring-%s.jar".format(version) +
+    " dist/akka-jta-%s.jar".format(version)
     )
 
   //Exclude slf4j1.5.11 from the classpath, it's conflicting...
@@ -942,12 +943,13 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
     )
   }
 
-  def akkaArtifacts = descendents(info.projectPath / "dist", "*" + buildScalaVersion  + "-" + version + ".jar")
+  def akkaArtifacts = descendents(info.projectPath / "dist", "*-" + version + ".jar")
   lazy val integrationTestsEnabled = systemOptional[Boolean]("integration.tests",false)
   lazy val stressTestsEnabled = systemOptional[Boolean]("stress.tests",false)
 
   // ------------------------------------------------------------
   class AkkaDefaultProject(info: ProjectInfo, val deployPath: Path) extends DefaultProject(info) with DeployProject with OSGiProject {
+    override def artifactID: String = this.name
     lazy val sourceArtifact = Artifact(this.artifactID, "source", "jar", Some("sources"), Nil, None)
     lazy val docsArtifact = Artifact(this.artifactID, "doc", "jar", Some("docs"), Nil, None)
     override def runClasspath = super.runClasspath +++ (AkkaParentProject.this.info.projectPath / "config")