From 722d3f24fee7ce5a1d94477753ec24b92d4cc220 Mon Sep 17 00:00:00 2001
From: Martin Krasser <krasserm@googlemail.com>
Date: Fri, 5 Mar 2010 21:38:23 +0100
Subject: [PATCH 1/5] do not include *QSpec.java for testing

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 480ad8723a..49023e42c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -306,7 +306,7 @@
         <configuration>
           <includes>
             <include>**/*Test.java</include>
-            <include>**/*Spec.java</include>
+            <!--include>**/*Spec.java</include-->
           </includes>
           <!--excludes>
             <exclude>**/InMemNestedStateTest.java</exclude>

From a1e58b5b5ee2ea76996dc9ad64d85e8f5b6f5c88 Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Fri, 5 Mar 2010 23:48:36 +0100
Subject: [PATCH 2/5] Default-enabling JGroups

---
 config/akka-reference.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/akka-reference.conf b/config/akka-reference.conf
index 5a1c33497b..d59134d909 100644
--- a/config/akka-reference.conf
+++ b/config/akka-reference.conf
@@ -51,7 +51,7 @@
     <cluster>
       service = on # FIXME add 'service = on' for <cluster>
       name = "default"                                                       # The name of the cluster
-      #actor = "se.scalablesolutions.akka.remote.JGroupsClusterActor"         # FQN of an implementation of ClusterActor
+      actor = "se.scalablesolutions.akka.remote.JGroupsClusterActor"         # FQN of an implementation of ClusterActor
       serializer = "se.scalablesolutions.akka.serialization.Serializer$Java" # FQN of the serializer class
     </cluster>
     

From af8a87749cbf090e96f14e36f9c8299bc06f546a Mon Sep 17 00:00:00 2001
From: "ross.mcdonald" <ross.mcdonald@hal.local>
Date: Sat, 6 Mar 2010 09:29:39 +0000
Subject: [PATCH 3/5] update docs, and comments

---
 config/akka-reference.conf | 2 +-
 config/akka.conf           | 2 +-
 pom.xml                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/akka-reference.conf b/config/akka-reference.conf
index d59134d909..14933a3cac 100644
--- a/config/akka-reference.conf
+++ b/config/akka-reference.conf
@@ -32,7 +32,7 @@
     service = on
     fair = on                     # should transactions be fair or non-fair (non fair yield better performance)
     max-nr-of-retries = 1000      # max nr of retries of a failing transaction before giving up
-    timeout = 10000               # transaction timeout; if transaction have not committed within the timeout then it is aborted
+    timeout = 10000               # transaction timeout; if transaction has not committed within the timeout then it is aborted
     distributed = off             # not implemented yet
   </stm>
  
diff --git a/config/akka.conf b/config/akka.conf
index 94f630089a..84b9bfbbcf 100644
--- a/config/akka.conf
+++ b/config/akka.conf
@@ -1,4 +1,4 @@
-# This config import the Akka reference configuration.
+# This config imports the Akka reference configuration.
 include "akka-reference.conf"
 
 # In this file you can override any option defined in the 'akka-reference.conf' file.
diff --git a/pom.xml b/pom.xml
index 49023e42c9..2e171337fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
     * Persistence: A set of pluggable back-end storage modules that works in sync with the STM.
     * Cassandra distributed and highly scalable database.
     * MongoDB document database.
-    * Redis data structures database (upcoming)
+    * Redis data structures database.
     * REST (JAX-RS): Expose actors as REST services.
     * Comet: Expose actors as Comet services.
     * Security: Digest and Kerberos based security.

From 14579aaaab77fa443a9625d9e37d38978d94b83b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Bon=C3=A9r?= <jonasremove@jonasboner.com>
Date: Sun, 7 Mar 2010 08:35:39 +0100
Subject: [PATCH 4/5] fixed bug in using akka as dep jar in app server

---
 .../src/main/scala/actor/BootableActorLoaderService.scala   | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/akka-core/src/main/scala/actor/BootableActorLoaderService.scala b/akka-core/src/main/scala/actor/BootableActorLoaderService.scala
index 0c84d0965a..60f6ec3781 100644
--- a/akka-core/src/main/scala/actor/BootableActorLoaderService.scala
+++ b/akka-core/src/main/scala/actor/BootableActorLoaderService.scala
@@ -31,11 +31,7 @@ trait BootableActorLoaderService extends Bootable with Logging {
       val toDeploy = for (f <- DEPLOY_DIR.listFiles().toArray.toList.asInstanceOf[List[File]]) yield f.toURL
       log.info("Deploying applications from [%s]: [%s]", DEPLOY, toDeploy.toArray.toList)
       new URLClassLoader(toDeploy.toArray, ClassLoader.getSystemClassLoader)
-    } else if (getClass.getClassLoader.getResourceAsStream("aop.xml") ne null) {
-      getClass.getClassLoader
-    } else throw new IllegalStateException(
-      "AKKA_HOME is not defined and akka-<version>.jar can not be found on the classpath; aborting...")
-    )
+    } else getClass.getClassLoader)
   }
 
   abstract override def onLoad = {

From bb4945b0a6dc8efdb07e4882085d667a3a42a52f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Bon=C3=A9r?= <jonasremove@jonasboner.com>
Date: Wed, 10 Mar 2010 22:38:52 +0100
Subject: [PATCH 5/5] Renamed packages in the whole project to be
 OSGi-friendly, A LOT of breaking changes

---
 .../src/main/scala/JGroupsClusterActor.scala  |  10 +-
 .../src/main/scala/ShoalClusterActor.scala    |  37 +--
 .../scala/AkkaClusterBroadcastFilter.scala    |   8 +-
 .../scala/BootableCometActorService.scala     |  11 +-
 akka-core/src/main/scala/actor/Actor.scala    |   2 +-
 .../actor/BootableActorLoaderService.scala    |   4 +-
 .../src/main/scala/actor/Scheduler.scala      |   2 +-
 akka-core/src/main/scala/config/Config.scala  | 272 ++++--------------
 .../scala/config/ConfiguratorRepository.scala |   2 +-
 .../main/scala/config/SupervisionConfig.scala | 234 +++++++++++++++
 .../remote/BootableRemoteActorService.scala   |   4 +-
 akka-core/src/main/scala/remote/Cluster.scala |  36 +--
 .../src/main/scala/remote/RemoteClient.scala  |   2 +-
 .../src/main/scala/remote/RemoteServer.scala  |   2 +-
 .../scala/serialization/Serializable.scala    |   7 +-
 .../src/main/scala/stm/DataFlowVariable.scala |   2 +-
 akka-core/src/main/scala/stm/HashTrie.scala   |  18 +-
 .../src/main/scala/stm/ResultOrFailure.scala  |   4 +-
 .../src/main/scala/stm/Transaction.scala      |   3 +-
 .../scala/stm/TransactionManagement.scala     |   2 +-
 .../main/scala/stm/TransactionalState.scala   |   5 +-
 akka-core/src/main/scala/stm/Vector.scala     |  10 +-
 .../src/test/scala/AgentTest.scala            |   0
 .../ClientInitiatedRemoteActorTest.scala      |   2 +-
 .../src/test/scala/InMemoryActorTest.scala    |   2 +-
 .../src/test/scala/RemoteSupervisorTest.scala |   2 +-
 .../ServerInitiatedRemoteActorTest.scala      |   2 +-
 akka-kernel/src/main/scala/Kernel.scala       |  34 ++-
 akka-patterns/src/main/scala/Agent.scala      | 146 ----------
 akka-patterns/src/main/scala/Patterns.scala   |   2 +-
 .../src/test/scala/ActorPatternsTest.scala    |   3 +-
 .../src/main/scala/CassandraSession.scala     |   5 +-
 .../src/main/scala/CassandraStorage.scala     |  12 +-
 .../main/scala/CassandraStorageBackend.scala  |   6 +-
 .../scala/CassandraPersistentActorSpec.scala  |   2 +-
 .../src/main/scala/Pool.scala                 |   2 +-
 .../src/main/scala/Storage.scala              |   4 +-
 .../src/main/scala/StorageBackend.scala       |   2 +-
 .../src/main/scala/MongoStorage.scala         |  12 +-
 .../src/main/scala/MongoStorageBackend.scala  |   6 +-
 .../test/scala/MongoPersistentActorSpec.scala |   2 +-
 .../src/test/scala/MongoStorageSpec.scala     |   2 +-
 .../src/main/scala/RedisStorage.scala         |  14 +-
 .../src/main/scala/RedisStorageBackend.scala  |   6 +-
 .../test/scala/RedisPersistentActorSpec.scala |   2 +-
 .../src/test/scala/RedisPersistentQSpec.scala |   2 +-
 .../main/scala/ActorComponentProvider.scala   |   4 +-
 akka-rest/src/main/scala/AkkaServlet.scala    |   5 +-
 .../src/main/scala/ChatServer.scala           |   4 +-
 .../src/main/scala/akka/SimpleService.scala   |   3 +-
 .../sample/java/PersistentSimpleService.java  |   4 +-
 .../main/java/sample/java/SimpleService.java  |   4 +-
 .../src/main/scala/SimpleService.scala        |   5 +-
 .../src/main/scala/SecuritySpec.scala         |  74 +++++
 .../src/main/scala/SimpleService.scala        |   2 +-
 akka-security/src/main/scala/Security.scala   |  49 ++--
 .../src/test/scala/SecuritySpec.scala         |   6 +-
 akka-util/src/main/scala/Bootable.scala       |   4 +-
 akka-util/src/main/scala/Config.scala         |  74 -----
 akka-util/src/main/scala/Helpers.scala        |   1 -
 akka-util/src/main/scala/Logging.scala        |   9 +-
 config/akka-reference.conf                    |   2 +-
 62 files changed, 570 insertions(+), 629 deletions(-)
 rename {akka-kernel => akka-comet}/src/main/scala/BootableCometActorService.scala (92%)
 create mode 100644 akka-core/src/main/scala/config/SupervisionConfig.scala
 rename {akka-patterns => akka-core}/src/test/scala/AgentTest.scala (100%)
 delete mode 100644 akka-patterns/src/main/scala/Agent.scala
 create mode 100644 akka-samples/akka-sample-security/src/main/scala/SecuritySpec.scala
 delete mode 100644 akka-util/src/main/scala/Config.scala

diff --git a/akka-cluster/akka-cluster-jgroups/src/main/scala/JGroupsClusterActor.scala b/akka-cluster/akka-cluster-jgroups/src/main/scala/JGroupsClusterActor.scala
index 12d93ef272..7d56bb1539 100644
--- a/akka-cluster/akka-cluster-jgroups/src/main/scala/JGroupsClusterActor.scala
+++ b/akka-cluster/akka-cluster-jgroups/src/main/scala/JGroupsClusterActor.scala
@@ -1,15 +1,17 @@
-package se.scalablesolutions.akka.remote
+package se.scalablesolutions.akka.cluster.jgroups
 
 import org.jgroups.{JChannel, View => JG_VIEW, Address, Message => JG_MSG, ExtendedMembershipListener, Receiver}
 
+import se.scalablesolutions.akka.remote.ClusterActor._
+import se.scalablesolutions.akka.remote.BasicClusterActor
+
+import org.scala_tools.javautils.Imports._
+
 /**
  * Clustering support via JGroups.
  * @Author Viktor Klang
  */
 class JGroupsClusterActor extends BasicClusterActor {
-  import ClusterActor._
-  import org.scala_tools.javautils.Imports._
-
   type ADDR_T = Address
 
   @volatile private var isActive = false
diff --git a/akka-cluster/akka-cluster-shoal/src/main/scala/ShoalClusterActor.scala b/akka-cluster/akka-cluster-shoal/src/main/scala/ShoalClusterActor.scala
index 3d83a46ef3..068d3a4345 100644
--- a/akka-cluster/akka-cluster-shoal/src/main/scala/ShoalClusterActor.scala
+++ b/akka-cluster/akka-cluster-shoal/src/main/scala/ShoalClusterActor.scala
@@ -1,29 +1,16 @@
 /**
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
-package se.scalablesolutions.akka.remote
+package se.scalablesolutions.akka.cluster.shoal
 
-import se.scalablesolutions.akka.Config.config
 import java.util.Properties
 
-import com.sun.enterprise.ee.cms.core.{CallBack,
-                                       GMSConstants,
-                                       GMSFactory,
-                                       GroupManagementService,
-                                       MessageSignal,
-                                       Signal,
-                                       GMSException,
-                                       SignalAcquireException,
-                                       SignalReleaseException,
-                                       JoinNotificationSignal,
-                                       FailureSuspectedSignal,
-                                       FailureNotificationSignal }
-import com.sun.enterprise.ee.cms.impl.client.{FailureNotificationActionFactoryImpl,
-                                       FailureSuspectedActionFactoryImpl,
-                                       JoinNotificationActionFactoryImpl,
-                                       MessageActionFactoryImpl,
-                                       PlannedShutdownActionFactoryImpl
-}
+import se.scalablesolutions.akka.config.Config.config
+import se.scalablesolutions.akka.remote.{ClusterActor, BasicClusterActor, RemoteServer}
+
+import com.sun.enterprise.ee.cms.core._
+import com.sun.enterprise.ee.cms.impl.client._
+
 /**
  * Clustering support via Shoal.
  */
@@ -67,9 +54,9 @@ class ShoalClusterActor extends BasicClusterActor {
    * Adds callbacks and boots up the cluster
    */
   protected def createGMS : GroupManagementService = {
-
-    val g = GMSFactory.startGMSModule(serverName,name, GroupManagementService.MemberType.CORE, properties()).asInstanceOf[GroupManagementService]
-
+    val g = GMSFactory
+      .startGMSModule(serverName,name, GroupManagementService.MemberType.CORE, properties())
+      .asInstanceOf[GroupManagementService]
     val callback = createCallback
     g.addActionFactory(new JoinNotificationActionFactoryImpl(callback))
     g.addActionFactory(new FailureSuspectedActionFactoryImpl(callback))
@@ -102,8 +89,8 @@ class ShoalClusterActor extends BasicClusterActor {
           }
           signal.release()
         } catch {
-            case e : SignalAcquireException => log.warning(e,"SignalAcquireException")
-            case e : SignalReleaseException => log.warning(e,"SignalReleaseException")
+          case e : SignalAcquireException => log.warning(e,"SignalAcquireException")
+          case e : SignalReleaseException => log.warning(e,"SignalReleaseException")
         }
       }
     }
diff --git a/akka-comet/src/main/scala/AkkaClusterBroadcastFilter.scala b/akka-comet/src/main/scala/AkkaClusterBroadcastFilter.scala
index 724c82432e..8fdd47fddd 100644
--- a/akka-comet/src/main/scala/AkkaClusterBroadcastFilter.scala
+++ b/akka-comet/src/main/scala/AkkaClusterBroadcastFilter.scala
@@ -4,13 +4,13 @@
  
 package se.scalablesolutions.akka.comet
 
-import se.scalablesolutions.akka.actor.{Actor}
-import se.scalablesolutions.akka.remote.{Cluster}
-import scala.reflect.{BeanProperty}
+import se.scalablesolutions.akka.actor.Actor
+import se.scalablesolutions.akka.remote.Cluster
+import scala.reflect.BeanProperty
 import org.atmosphere.cpr.{BroadcastFilter, ClusterBroadcastFilter, Broadcaster}
 
 sealed trait ClusterCometMessageType
-case class ClusterCometBroadcast(val name : String, val msg : AnyRef) extends ClusterCometMessageType
+case class ClusterCometBroadcast(name: String, msg: AnyRef) extends ClusterCometMessageType
 
 /**
  * Enables explicit clustering of Atmosphere (Comet) resources
diff --git a/akka-kernel/src/main/scala/BootableCometActorService.scala b/akka-comet/src/main/scala/BootableCometActorService.scala
similarity index 92%
rename from akka-kernel/src/main/scala/BootableCometActorService.scala
rename to akka-comet/src/main/scala/BootableCometActorService.scala
index b014fcb9ad..f6895aeee9 100644
--- a/akka-kernel/src/main/scala/BootableCometActorService.scala
+++ b/akka-comet/src/main/scala/BootableCometActorService.scala
@@ -2,16 +2,16 @@
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
  
-package se.scalablesolutions.akka
+package se.scalablesolutions.akka.comet
 
 import com.sun.grizzly.http.SelectorThread
 import com.sun.grizzly.http.servlet.ServletAdapter
 import com.sun.grizzly.standalone.StaticStreamAlgorithm
 
 import javax.ws.rs.core.UriBuilder
-import se.scalablesolutions.akka.comet.AkkaServlet
+
 import se.scalablesolutions.akka.actor.BootableActorLoaderService
-import se.scalablesolutions.akka.util.{Bootable,Logging}
+import se.scalablesolutions.akka.util.{Bootable, Logging}
 
 /**
  * Handles the Akka Comet Support (load/unload)
@@ -19,16 +19,17 @@ import se.scalablesolutions.akka.util.{Bootable,Logging}
 trait BootableCometActorService extends Bootable with Logging {
   self : BootableActorLoaderService =>
   
-  import Config._
+  import config.Config._
   
   val REST_HOSTNAME = config.getString("akka.rest.hostname", "localhost")
   val REST_URL = "http://" + REST_HOSTNAME
   val REST_PORT = config.getInt("akka.rest.port", 9998)
+  
   protected var jerseySelectorThread: Option[SelectorThread] = None
   
   abstract override def onLoad   = {
     super.onLoad
-    if(config.getBool("akka.rest.service", true)){
+    if (config.getBool("akka.rest.service", true)) {
     
       val uri = UriBuilder.fromUri(REST_URL).port(REST_PORT).build()
 
diff --git a/akka-core/src/main/scala/actor/Actor.scala b/akka-core/src/main/scala/actor/Actor.scala
index 60f3967e6c..5f48f1cc1e 100644
--- a/akka-core/src/main/scala/actor/Actor.scala
+++ b/akka-core/src/main/scala/actor/Actor.scala
@@ -4,8 +4,8 @@
 
 package se.scalablesolutions.akka.actor
 
-import se.scalablesolutions.akka.Config._
 import se.scalablesolutions.akka.dispatch._
+import se.scalablesolutions.akka.config.Config._
 import se.scalablesolutions.akka.config.{AllForOneStrategy, OneForOneStrategy, FaultHandlingStrategy}
 import se.scalablesolutions.akka.config.ScalaConfig._
 import se.scalablesolutions.akka.stm.Transaction._
diff --git a/akka-core/src/main/scala/actor/BootableActorLoaderService.scala b/akka-core/src/main/scala/actor/BootableActorLoaderService.scala
index 60f6ec3781..d6e87ef027 100644
--- a/akka-core/src/main/scala/actor/BootableActorLoaderService.scala
+++ b/akka-core/src/main/scala/actor/BootableActorLoaderService.scala
@@ -7,8 +7,8 @@ package se.scalablesolutions.akka.actor
 import java.io.File
 import java.net.URLClassLoader
 
-import se.scalablesolutions.akka.util.{Bootable,Logging}
-import se.scalablesolutions.akka.Config._
+import se.scalablesolutions.akka.util.{Bootable, Logging}
+import se.scalablesolutions.akka.config.Config._
 
 /**
  * Handles all modules in the deploy directory (load and unload)
diff --git a/akka-core/src/main/scala/actor/Scheduler.scala b/akka-core/src/main/scala/actor/Scheduler.scala
index 8205db5843..be23149b61 100644
--- a/akka-core/src/main/scala/actor/Scheduler.scala
+++ b/akka-core/src/main/scala/actor/Scheduler.scala
@@ -17,7 +17,7 @@ import java.util.concurrent._
 
 import se.scalablesolutions.akka.config.ScalaConfig._
 import se.scalablesolutions.akka.config.{AllForOneStrategy, OneForOneStrategy, FaultHandlingStrategy}
-import se.scalablesolutions.akka.util.{Logging}
+import se.scalablesolutions.akka.util.Logging
 
 import org.scala_tools.javautils.Imports._
 
diff --git a/akka-core/src/main/scala/config/Config.scala b/akka-core/src/main/scala/config/Config.scala
index e993573972..ecbdf33d81 100644
--- a/akka-core/src/main/scala/config/Config.scala
+++ b/akka-core/src/main/scala/config/Config.scala
@@ -4,231 +4,71 @@
 
 package se.scalablesolutions.akka.config
 
-import se.scalablesolutions.akka.actor.Actor
-import se.scalablesolutions.akka.dispatch.MessageDispatcher
+import se.scalablesolutions.akka.util.Logging
 
-sealed abstract class FaultHandlingStrategy
-case class AllForOneStrategy(maxNrOfRetries: Int, withinTimeRange: Int) extends FaultHandlingStrategy
-case class OneForOneStrategy(maxNrOfRetries: Int, withinTimeRange: Int) extends FaultHandlingStrategy
-
-/**
- * Configuration classes - not to be used as messages.
- *
- * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
- */
-object ScalaConfig {
-  sealed abstract class ConfigElement
-
-  abstract class Server extends ConfigElement
-  abstract class FailOverScheme extends ConfigElement
-  abstract class Scope extends ConfigElement
-
-  case class SupervisorConfig(restartStrategy: RestartStrategy, worker: List[Server]) extends Server
-  
-  class Supervise(val actor: Actor, val lifeCycle: LifeCycle, _remoteAddress: RemoteAddress) extends Server {
-    val remoteAddress: Option[RemoteAddress] = if (_remoteAddress eq null) None else Some(_remoteAddress)
-  }
-  object Supervise {
-    def apply(actor: Actor, lifeCycle: LifeCycle, remoteAddress: RemoteAddress) = new Supervise(actor, lifeCycle, remoteAddress)
-    def apply(actor: Actor, lifeCycle: LifeCycle) = new Supervise(actor, lifeCycle, null)
-    def unapply(supervise: Supervise) = Some((supervise.actor, supervise.lifeCycle, supervise.remoteAddress))
-  }
-
-  case class RestartStrategy(
-      scheme: FailOverScheme,
-      maxNrOfRetries: Int,
-      withinTimeRange: Int,
-      trapExceptions: List[Class[_ <: Throwable]]) extends ConfigElement
-
-  case object AllForOne extends FailOverScheme
-  case object OneForOne extends FailOverScheme
-
-  case class LifeCycle(scope: Scope, callbacks: Option[RestartCallbacks]) extends ConfigElement
-  object LifeCycle {
-    def apply(scope: Scope) = new LifeCycle(scope, None)
-  }
-  case class RestartCallbacks(preRestart: String, postRestart: String) {
-    if ((preRestart eq null) || (postRestart eq null)) throw new IllegalArgumentException("Restart callback methods can't be null")
-  }
-
-  case object Permanent extends Scope
-  case object Temporary extends Scope
-
-  case class RemoteAddress(val hostname: String, val port: Int) extends ConfigElement
-
-  class Component(_intf: Class[_],
-                  val target: Class[_],
-                  val lifeCycle: LifeCycle,
-                  val timeout: Int,
-                  val transactionRequired: Boolean,
-                  _dispatcher: MessageDispatcher, // optional
-                  _remoteAddress: RemoteAddress   // optional
-          ) extends Server {
-    val intf: Option[Class[_]] = if (_intf eq null) None else Some(_intf)
-    val dispatcher: Option[MessageDispatcher] = if (_dispatcher eq null) None else Some(_dispatcher)
-    val remoteAddress: Option[RemoteAddress] = if (_remoteAddress eq null) None else Some(_remoteAddress)
-  }
-  object Component {
-    def apply(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int) =
-      new Component(intf, target, lifeCycle, timeout, false, null, null)
-
-    def apply(target: Class[_], lifeCycle: LifeCycle, timeout: Int) =
-      new Component(null, target, lifeCycle, timeout, false, null, null)
-
-    def apply(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, dispatcher: MessageDispatcher) =
-      new Component(intf, target, lifeCycle, timeout, false, dispatcher, null)
-
-    def apply(target: Class[_], lifeCycle: LifeCycle, timeout: Int, dispatcher: MessageDispatcher) =
-      new Component(null, target, lifeCycle, timeout, false, dispatcher, null)
-
-    def apply(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, remoteAddress: RemoteAddress) =
-      new Component(intf, target, lifeCycle, timeout, false, null, remoteAddress)
-
-    def apply(target: Class[_], lifeCycle: LifeCycle, timeout: Int, remoteAddress: RemoteAddress) =
-      new Component(null, target, lifeCycle, timeout, false, null, remoteAddress)
-
-    def apply(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, dispatcher: MessageDispatcher, remoteAddress: RemoteAddress) =
-      new Component(intf, target, lifeCycle, timeout, false, dispatcher, remoteAddress)
-
-    def apply(target: Class[_], lifeCycle: LifeCycle, timeout: Int, dispatcher: MessageDispatcher, remoteAddress: RemoteAddress) =
-      new Component(null, target, lifeCycle, timeout, false, dispatcher, remoteAddress)
-
-    def apply(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean) =
-      new Component(intf, target, lifeCycle, timeout, transactionRequired, null, null)
-
-    def apply(target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean) =
-      new Component(null, target, lifeCycle, timeout, transactionRequired, null, null)
-
-    def apply(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, dispatcher: MessageDispatcher) =
-      new Component(intf, target, lifeCycle, timeout, transactionRequired, dispatcher, null)
-
-    def apply(target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, dispatcher: MessageDispatcher) =
-      new Component(null, target, lifeCycle, timeout, transactionRequired, dispatcher, null)
-
-    def apply(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, remoteAddress: RemoteAddress) =
-      new Component(intf, target, lifeCycle, timeout, transactionRequired, null, remoteAddress)
-
-    def apply(target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, remoteAddress: RemoteAddress) =
-      new Component(null, target, lifeCycle, timeout, transactionRequired, null, remoteAddress)
-
-    def apply(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, dispatcher: MessageDispatcher, remoteAddress: RemoteAddress) =
-      new Component(intf, target, lifeCycle, timeout, transactionRequired, dispatcher, remoteAddress)
-
-    def apply(target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, dispatcher: MessageDispatcher, remoteAddress: RemoteAddress) =
-      new Component(null, target, lifeCycle, timeout, transactionRequired, dispatcher, remoteAddress)
-  }
-}
+import net.lag.configgy.{Configgy, ParseException}
 
 /**
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
-object JavaConfig {
-  import scala.reflect.BeanProperty
+object Config extends Logging {
+  val VERSION = "0.7-SNAPSHOT"
 
-  sealed abstract class ConfigElement
+  // Set Multiverse options for max speed
+  System.setProperty("org.multiverse.MuliverseConstants.sanityChecks", "false")
+  System.setProperty("org.multiverse.api.GlobalStmInstance.factorymethod", "org.multiverse.stms.alpha.AlphaStm.createFast")
 
-  class RestartStrategy(
-      @BeanProperty val scheme: FailOverScheme,
-      @BeanProperty val maxNrOfRetries: Int,
-      @BeanProperty val withinTimeRange: Int,
-      @BeanProperty val trapExceptions: Array[Class[_ <: Throwable]]) extends ConfigElement {
-    def transform = se.scalablesolutions.akka.config.ScalaConfig.RestartStrategy(
-      scheme.transform, maxNrOfRetries, withinTimeRange, trapExceptions.toList)
+  val HOME = {
+    val systemHome = System.getenv("AKKA_HOME")
+    if (systemHome == null || systemHome.length == 0 || systemHome == ".") {
+      val optionHome = System.getProperty("akka.home", "")
+      if (optionHome.length != 0) Some(optionHome)
+      else None
+    } else Some(systemHome)
   }
-  
-  class LifeCycle(@BeanProperty val scope: Scope, @BeanProperty val callbacks: RestartCallbacks) extends ConfigElement {
-    def this(scope: Scope) = this(scope, null)
-    def transform = {
-      val callbackOption = if (callbacks eq null) None else Some(callbacks.transform)
-      se.scalablesolutions.akka.config.ScalaConfig.LifeCycle(scope.transform, callbackOption)
+
+  val config = {
+    if (HOME.isDefined) {
+      try {
+        val configFile = HOME.get + "/config/akka.conf"
+        Configgy.configure(configFile)
+        log.info("AKKA_HOME is defined to [%s], config loaded from [%s].", HOME.get, configFile)
+      } catch {
+        case e: ParseException => throw new IllegalStateException(
+          "'akka.conf' config file can not be found in [" + HOME + "/config/akka.conf] aborting." +
+          "\n\tEither add it in the 'config' directory or add it to the classpath.")
+      }
+    } else if (System.getProperty("akka.config", "") != "") {
+      val configFile = System.getProperty("akka.config", "")
+      try {
+        Configgy.configure(configFile)
+        log.info("Config loaded from -Dakka.config=%s", configFile)
+      } catch {
+        case e: ParseException => throw new IllegalStateException(
+          "Config could not be loaded from -Dakka.config=" + configFile)
+      }
+    } else {
+      try {
+        Configgy.configureFromResource("akka.conf", getClass.getClassLoader)
+        log.info("Config loaded from the application classpath.")
+      } catch {
+        case e: ParseException => throw new IllegalStateException(
+          "\nCan't find 'akka.conf' configuration file." + 
+          "\nOne of the three ways of locating the 'akka.conf' file needs to be defined:" +
+          "\n\t1. Define 'AKKA_HOME' environment variable to the root of the Akka distribution." +
+          "\n\t2. Define the '-Dakka.config=...' system property option." +
+          "\n\t3. Put the 'akka.conf' file on the classpath." +
+          "\nI have no way of finding the 'akka.conf' configuration file." +
+          "\nAborting.")
+      }
     }
+    Configgy.config
   }
 
-  class RestartCallbacks(@BeanProperty val preRestart: String, @BeanProperty val postRestart: String) {
-    def transform = se.scalablesolutions.akka.config.ScalaConfig.RestartCallbacks(preRestart, postRestart)
-  }
+  val CONFIG_VERSION = config.getString("akka.version", "0")
+  if (VERSION != CONFIG_VERSION) throw new IllegalStateException(
+    "Akka JAR version [" + VERSION + "] is different than the provided config ('akka.conf') version [" + CONFIG_VERSION + "]")
+  val startTime = System.currentTimeMillis
 
-  abstract class Scope extends ConfigElement {
-    def transform: se.scalablesolutions.akka.config.ScalaConfig.Scope
-  }
-  class Permanent extends Scope {
-    override def transform = se.scalablesolutions.akka.config.ScalaConfig.Permanent
-  }
-  class Temporary extends Scope {
-    override def transform = se.scalablesolutions.akka.config.ScalaConfig.Temporary
-  }
-
-  abstract class FailOverScheme extends ConfigElement {
-    def transform: se.scalablesolutions.akka.config.ScalaConfig.FailOverScheme
-  }
-  class AllForOne extends FailOverScheme {
-    override def transform = se.scalablesolutions.akka.config.ScalaConfig.AllForOne
-  }
-  class OneForOne extends FailOverScheme {
-    override def transform = se.scalablesolutions.akka.config.ScalaConfig.OneForOne
-  }
-
-  class RemoteAddress(@BeanProperty val hostname: String, @BeanProperty val port: Int)
-
-  abstract class Server extends ConfigElement
-  class Component(@BeanProperty val intf: Class[_],
-                  @BeanProperty val target: Class[_],
-                  @BeanProperty val lifeCycle: LifeCycle,
-                  @BeanProperty val timeout: Int,
-                  @BeanProperty val transactionRequired: Boolean,  // optional
-                  @BeanProperty val dispatcher: MessageDispatcher, // optional
-                  @BeanProperty val remoteAddress: RemoteAddress   // optional
-          ) extends Server {
-
-    def this(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int) =
-      this(intf, target, lifeCycle, timeout, false, null, null)
-
-    def this(target: Class[_], lifeCycle: LifeCycle, timeout: Int) =
-      this(null, target, lifeCycle, timeout, false, null, null)
-
-    def this(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, remoteAddress: RemoteAddress) =
-      this(intf, target, lifeCycle, timeout, false, null, remoteAddress)
-
-    def this(target: Class[_], lifeCycle: LifeCycle, timeout: Int, remoteAddress: RemoteAddress) =
-      this(null, target, lifeCycle, timeout, false, null, remoteAddress)
-
-    def this(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, dispatcher: MessageDispatcher) =
-      this(intf, target, lifeCycle, timeout, false, dispatcher, null)
-
-    def this(target: Class[_], lifeCycle: LifeCycle, timeout: Int, dispatcher: MessageDispatcher) =
-      this(null, target, lifeCycle, timeout, false, dispatcher, null)
-
-    def this(target: Class[_], lifeCycle: LifeCycle, timeout: Int, dispatcher: MessageDispatcher, remoteAddress: RemoteAddress) =
-      this(null, target, lifeCycle, timeout, false, dispatcher, remoteAddress)
-
-    def this(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean) =
-      this(intf, target, lifeCycle, timeout, transactionRequired, null, null)
-
-    def this(target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean) =
-      this(null, target, lifeCycle, timeout, transactionRequired, null, null)
-
-    def this(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, remoteAddress: RemoteAddress) =
-      this(intf, target, lifeCycle, timeout, transactionRequired, null, remoteAddress)
-
-    def this(target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, remoteAddress: RemoteAddress) =
-      this(null, target, lifeCycle, timeout, transactionRequired, null, remoteAddress)
-
-    def this(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, dispatcher: MessageDispatcher) =
-      this(intf, target, lifeCycle, timeout, transactionRequired, dispatcher, null)
-
-    def this(target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, dispatcher: MessageDispatcher) =
-      this(null, target, lifeCycle, timeout, transactionRequired, dispatcher, null)
-
-    def this(target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, dispatcher: MessageDispatcher, remoteAddress: RemoteAddress) =
-      this(null, target, lifeCycle, timeout, transactionRequired, dispatcher, remoteAddress)
-
-    def transform =
-      se.scalablesolutions.akka.config.ScalaConfig.Component(
-        intf, target, lifeCycle.transform, timeout, transactionRequired, dispatcher,
-        if (remoteAddress ne null) se.scalablesolutions.akka.config.ScalaConfig.RemoteAddress(remoteAddress.hostname, remoteAddress.port) else null)
-
-    def newSupervised(actor: Actor) =
-      se.scalablesolutions.akka.config.ScalaConfig.Supervise(actor, lifeCycle.transform)
-  }
-  
-}
\ No newline at end of file
+  def uptime = (System.currentTimeMillis - startTime) / 1000
+}
diff --git a/akka-core/src/main/scala/config/ConfiguratorRepository.scala b/akka-core/src/main/scala/config/ConfiguratorRepository.scala
index 9c12bf4b32..097259164b 100644
--- a/akka-core/src/main/scala/config/ConfiguratorRepository.scala
+++ b/akka-core/src/main/scala/config/ConfiguratorRepository.scala
@@ -6,7 +6,7 @@ package se.scalablesolutions.akka.config
 
 import scala.collection.mutable.HashSet
 
-import util.Logging
+import se.scalablesolutions.akka.util.Logging
 
 object ConfiguratorRepository extends Logging {
 
diff --git a/akka-core/src/main/scala/config/SupervisionConfig.scala b/akka-core/src/main/scala/config/SupervisionConfig.scala
new file mode 100644
index 0000000000..e993573972
--- /dev/null
+++ b/akka-core/src/main/scala/config/SupervisionConfig.scala
@@ -0,0 +1,234 @@
+/**
+ * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ */
+
+package se.scalablesolutions.akka.config
+
+import se.scalablesolutions.akka.actor.Actor
+import se.scalablesolutions.akka.dispatch.MessageDispatcher
+
+sealed abstract class FaultHandlingStrategy
+case class AllForOneStrategy(maxNrOfRetries: Int, withinTimeRange: Int) extends FaultHandlingStrategy
+case class OneForOneStrategy(maxNrOfRetries: Int, withinTimeRange: Int) extends FaultHandlingStrategy
+
+/**
+ * Configuration classes - not to be used as messages.
+ *
+ * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
+ */
+object ScalaConfig {
+  sealed abstract class ConfigElement
+
+  abstract class Server extends ConfigElement
+  abstract class FailOverScheme extends ConfigElement
+  abstract class Scope extends ConfigElement
+
+  case class SupervisorConfig(restartStrategy: RestartStrategy, worker: List[Server]) extends Server
+  
+  class Supervise(val actor: Actor, val lifeCycle: LifeCycle, _remoteAddress: RemoteAddress) extends Server {
+    val remoteAddress: Option[RemoteAddress] = if (_remoteAddress eq null) None else Some(_remoteAddress)
+  }
+  object Supervise {
+    def apply(actor: Actor, lifeCycle: LifeCycle, remoteAddress: RemoteAddress) = new Supervise(actor, lifeCycle, remoteAddress)
+    def apply(actor: Actor, lifeCycle: LifeCycle) = new Supervise(actor, lifeCycle, null)
+    def unapply(supervise: Supervise) = Some((supervise.actor, supervise.lifeCycle, supervise.remoteAddress))
+  }
+
+  case class RestartStrategy(
+      scheme: FailOverScheme,
+      maxNrOfRetries: Int,
+      withinTimeRange: Int,
+      trapExceptions: List[Class[_ <: Throwable]]) extends ConfigElement
+
+  case object AllForOne extends FailOverScheme
+  case object OneForOne extends FailOverScheme
+
+  case class LifeCycle(scope: Scope, callbacks: Option[RestartCallbacks]) extends ConfigElement
+  object LifeCycle {
+    def apply(scope: Scope) = new LifeCycle(scope, None)
+  }
+  case class RestartCallbacks(preRestart: String, postRestart: String) {
+    if ((preRestart eq null) || (postRestart eq null)) throw new IllegalArgumentException("Restart callback methods can't be null")
+  }
+
+  case object Permanent extends Scope
+  case object Temporary extends Scope
+
+  case class RemoteAddress(val hostname: String, val port: Int) extends ConfigElement
+
+  class Component(_intf: Class[_],
+                  val target: Class[_],
+                  val lifeCycle: LifeCycle,
+                  val timeout: Int,
+                  val transactionRequired: Boolean,
+                  _dispatcher: MessageDispatcher, // optional
+                  _remoteAddress: RemoteAddress   // optional
+          ) extends Server {
+    val intf: Option[Class[_]] = if (_intf eq null) None else Some(_intf)
+    val dispatcher: Option[MessageDispatcher] = if (_dispatcher eq null) None else Some(_dispatcher)
+    val remoteAddress: Option[RemoteAddress] = if (_remoteAddress eq null) None else Some(_remoteAddress)
+  }
+  object Component {
+    def apply(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int) =
+      new Component(intf, target, lifeCycle, timeout, false, null, null)
+
+    def apply(target: Class[_], lifeCycle: LifeCycle, timeout: Int) =
+      new Component(null, target, lifeCycle, timeout, false, null, null)
+
+    def apply(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, dispatcher: MessageDispatcher) =
+      new Component(intf, target, lifeCycle, timeout, false, dispatcher, null)
+
+    def apply(target: Class[_], lifeCycle: LifeCycle, timeout: Int, dispatcher: MessageDispatcher) =
+      new Component(null, target, lifeCycle, timeout, false, dispatcher, null)
+
+    def apply(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, remoteAddress: RemoteAddress) =
+      new Component(intf, target, lifeCycle, timeout, false, null, remoteAddress)
+
+    def apply(target: Class[_], lifeCycle: LifeCycle, timeout: Int, remoteAddress: RemoteAddress) =
+      new Component(null, target, lifeCycle, timeout, false, null, remoteAddress)
+
+    def apply(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, dispatcher: MessageDispatcher, remoteAddress: RemoteAddress) =
+      new Component(intf, target, lifeCycle, timeout, false, dispatcher, remoteAddress)
+
+    def apply(target: Class[_], lifeCycle: LifeCycle, timeout: Int, dispatcher: MessageDispatcher, remoteAddress: RemoteAddress) =
+      new Component(null, target, lifeCycle, timeout, false, dispatcher, remoteAddress)
+
+    def apply(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean) =
+      new Component(intf, target, lifeCycle, timeout, transactionRequired, null, null)
+
+    def apply(target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean) =
+      new Component(null, target, lifeCycle, timeout, transactionRequired, null, null)
+
+    def apply(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, dispatcher: MessageDispatcher) =
+      new Component(intf, target, lifeCycle, timeout, transactionRequired, dispatcher, null)
+
+    def apply(target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, dispatcher: MessageDispatcher) =
+      new Component(null, target, lifeCycle, timeout, transactionRequired, dispatcher, null)
+
+    def apply(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, remoteAddress: RemoteAddress) =
+      new Component(intf, target, lifeCycle, timeout, transactionRequired, null, remoteAddress)
+
+    def apply(target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, remoteAddress: RemoteAddress) =
+      new Component(null, target, lifeCycle, timeout, transactionRequired, null, remoteAddress)
+
+    def apply(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, dispatcher: MessageDispatcher, remoteAddress: RemoteAddress) =
+      new Component(intf, target, lifeCycle, timeout, transactionRequired, dispatcher, remoteAddress)
+
+    def apply(target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, dispatcher: MessageDispatcher, remoteAddress: RemoteAddress) =
+      new Component(null, target, lifeCycle, timeout, transactionRequired, dispatcher, remoteAddress)
+  }
+}
+
+/**
+ * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
+ */
+object JavaConfig {
+  import scala.reflect.BeanProperty
+
+  sealed abstract class ConfigElement
+
+  class RestartStrategy(
+      @BeanProperty val scheme: FailOverScheme,
+      @BeanProperty val maxNrOfRetries: Int,
+      @BeanProperty val withinTimeRange: Int,
+      @BeanProperty val trapExceptions: Array[Class[_ <: Throwable]]) extends ConfigElement {
+    def transform = se.scalablesolutions.akka.config.ScalaConfig.RestartStrategy(
+      scheme.transform, maxNrOfRetries, withinTimeRange, trapExceptions.toList)
+  }
+  
+  class LifeCycle(@BeanProperty val scope: Scope, @BeanProperty val callbacks: RestartCallbacks) extends ConfigElement {
+    def this(scope: Scope) = this(scope, null)
+    def transform = {
+      val callbackOption = if (callbacks eq null) None else Some(callbacks.transform)
+      se.scalablesolutions.akka.config.ScalaConfig.LifeCycle(scope.transform, callbackOption)
+    }
+  }
+
+  class RestartCallbacks(@BeanProperty val preRestart: String, @BeanProperty val postRestart: String) {
+    def transform = se.scalablesolutions.akka.config.ScalaConfig.RestartCallbacks(preRestart, postRestart)
+  }
+
+  abstract class Scope extends ConfigElement {
+    def transform: se.scalablesolutions.akka.config.ScalaConfig.Scope
+  }
+  class Permanent extends Scope {
+    override def transform = se.scalablesolutions.akka.config.ScalaConfig.Permanent
+  }
+  class Temporary extends Scope {
+    override def transform = se.scalablesolutions.akka.config.ScalaConfig.Temporary
+  }
+
+  abstract class FailOverScheme extends ConfigElement {
+    def transform: se.scalablesolutions.akka.config.ScalaConfig.FailOverScheme
+  }
+  class AllForOne extends FailOverScheme {
+    override def transform = se.scalablesolutions.akka.config.ScalaConfig.AllForOne
+  }
+  class OneForOne extends FailOverScheme {
+    override def transform = se.scalablesolutions.akka.config.ScalaConfig.OneForOne
+  }
+
+  class RemoteAddress(@BeanProperty val hostname: String, @BeanProperty val port: Int)
+
+  abstract class Server extends ConfigElement
+  class Component(@BeanProperty val intf: Class[_],
+                  @BeanProperty val target: Class[_],
+                  @BeanProperty val lifeCycle: LifeCycle,
+                  @BeanProperty val timeout: Int,
+                  @BeanProperty val transactionRequired: Boolean,  // optional
+                  @BeanProperty val dispatcher: MessageDispatcher, // optional
+                  @BeanProperty val remoteAddress: RemoteAddress   // optional
+          ) extends Server {
+
+    def this(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int) =
+      this(intf, target, lifeCycle, timeout, false, null, null)
+
+    def this(target: Class[_], lifeCycle: LifeCycle, timeout: Int) =
+      this(null, target, lifeCycle, timeout, false, null, null)
+
+    def this(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, remoteAddress: RemoteAddress) =
+      this(intf, target, lifeCycle, timeout, false, null, remoteAddress)
+
+    def this(target: Class[_], lifeCycle: LifeCycle, timeout: Int, remoteAddress: RemoteAddress) =
+      this(null, target, lifeCycle, timeout, false, null, remoteAddress)
+
+    def this(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, dispatcher: MessageDispatcher) =
+      this(intf, target, lifeCycle, timeout, false, dispatcher, null)
+
+    def this(target: Class[_], lifeCycle: LifeCycle, timeout: Int, dispatcher: MessageDispatcher) =
+      this(null, target, lifeCycle, timeout, false, dispatcher, null)
+
+    def this(target: Class[_], lifeCycle: LifeCycle, timeout: Int, dispatcher: MessageDispatcher, remoteAddress: RemoteAddress) =
+      this(null, target, lifeCycle, timeout, false, dispatcher, remoteAddress)
+
+    def this(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean) =
+      this(intf, target, lifeCycle, timeout, transactionRequired, null, null)
+
+    def this(target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean) =
+      this(null, target, lifeCycle, timeout, transactionRequired, null, null)
+
+    def this(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, remoteAddress: RemoteAddress) =
+      this(intf, target, lifeCycle, timeout, transactionRequired, null, remoteAddress)
+
+    def this(target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, remoteAddress: RemoteAddress) =
+      this(null, target, lifeCycle, timeout, transactionRequired, null, remoteAddress)
+
+    def this(intf: Class[_], target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, dispatcher: MessageDispatcher) =
+      this(intf, target, lifeCycle, timeout, transactionRequired, dispatcher, null)
+
+    def this(target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, dispatcher: MessageDispatcher) =
+      this(null, target, lifeCycle, timeout, transactionRequired, dispatcher, null)
+
+    def this(target: Class[_], lifeCycle: LifeCycle, timeout: Int, transactionRequired: Boolean, dispatcher: MessageDispatcher, remoteAddress: RemoteAddress) =
+      this(null, target, lifeCycle, timeout, transactionRequired, dispatcher, remoteAddress)
+
+    def transform =
+      se.scalablesolutions.akka.config.ScalaConfig.Component(
+        intf, target, lifeCycle.transform, timeout, transactionRequired, dispatcher,
+        if (remoteAddress ne null) se.scalablesolutions.akka.config.ScalaConfig.RemoteAddress(remoteAddress.hostname, remoteAddress.port) else null)
+
+    def newSupervised(actor: Actor) =
+      se.scalablesolutions.akka.config.ScalaConfig.Supervise(actor, lifeCycle.transform)
+  }
+  
+}
\ No newline at end of file
diff --git a/akka-core/src/main/scala/remote/BootableRemoteActorService.scala b/akka-core/src/main/scala/remote/BootableRemoteActorService.scala
index 6c3183ef8c..2b8c2aa132 100644
--- a/akka-core/src/main/scala/remote/BootableRemoteActorService.scala
+++ b/akka-core/src/main/scala/remote/BootableRemoteActorService.scala
@@ -5,8 +5,8 @@
 package se.scalablesolutions.akka.remote
 
 import se.scalablesolutions.akka.actor.BootableActorLoaderService
-import se.scalablesolutions.akka.util.{Bootable,Logging}
-import se.scalablesolutions.akka.Config.config
+import se.scalablesolutions.akka.util.{Bootable, Logging}
+import se.scalablesolutions.akka.config.Config.config
 
 /**
  * This bundle/service is responsible for booting up and shutting down the remote actors facility
diff --git a/akka-core/src/main/scala/remote/Cluster.scala b/akka-core/src/main/scala/remote/Cluster.scala
index fb14b6b357..145b07462f 100644
--- a/akka-core/src/main/scala/remote/Cluster.scala
+++ b/akka-core/src/main/scala/remote/Cluster.scala
@@ -4,7 +4,7 @@
 
 package se.scalablesolutions.akka.remote
 
-import se.scalablesolutions.akka.Config.config
+import se.scalablesolutions.akka.config.Config.config
 import se.scalablesolutions.akka.config.ScalaConfig._
 import se.scalablesolutions.akka.serialization.Serializer
 import se.scalablesolutions.akka.actor.{Supervisor, SupervisorFactory, Actor, ActorRegistry}
@@ -44,20 +44,20 @@ trait ClusterActor extends Actor with Cluster {
  *
  * @author Viktor Klang
  */
-private[remote] object ClusterActor {
+private[akka] object ClusterActor {
   sealed trait ClusterMessage
 
-  private[remote] case class RelayedMessage(actorClassFQN: String, msg: AnyRef) extends ClusterMessage
-  private[remote] case class Message[ADDR_T](sender: ADDR_T, msg: Array[Byte])
-  private[remote] case object PapersPlease extends ClusterMessage
-  private[remote] case class Papers(addresses: List[RemoteAddress]) extends ClusterMessage
-  private[remote] case object Block extends ClusterMessage
-  private[remote] case object Unblock extends ClusterMessage
-  private[remote] case class View[ADDR_T](othersPresent: Set[ADDR_T]) extends ClusterMessage
-  private[remote] case class Zombie[ADDR_T](address: ADDR_T) extends ClusterMessage
-  private[remote] case class RegisterLocalNode(server: RemoteAddress) extends ClusterMessage
-  private[remote] case class DeregisterLocalNode(server: RemoteAddress) extends ClusterMessage
-  private[remote] case class Node(endpoints: List[RemoteAddress])
+  private[akka] case class RelayedMessage(actorClassFQN: String, msg: AnyRef) extends ClusterMessage
+  private[akka] case class Message[ADDR_T](sender: ADDR_T, msg: Array[Byte])
+  private[akka] case object PapersPlease extends ClusterMessage
+  private[akka] case class Papers(addresses: List[RemoteAddress]) extends ClusterMessage
+  private[akka] case object Block extends ClusterMessage
+  private[akka] case object Unblock extends ClusterMessage
+  private[akka] case class View[ADDR_T](othersPresent: Set[ADDR_T]) extends ClusterMessage
+  private[akka] case class Zombie[ADDR_T](address: ADDR_T) extends ClusterMessage
+  private[akka] case class RegisterLocalNode(server: RemoteAddress) extends ClusterMessage
+  private[akka] case class DeregisterLocalNode(server: RemoteAddress) extends ClusterMessage
+  private[akka] case class Node(endpoints: List[RemoteAddress])
 }
 
 /**
@@ -205,16 +205,16 @@ abstract class BasicClusterActor extends ClusterActor {
 object Cluster extends Cluster with Logging {
   lazy val DEFAULT_SERIALIZER_CLASS_NAME = Serializer.Java.getClass.getName
 
-  @volatile private[remote] var clusterActor: Option[ClusterActor] = None
+  @volatile private[akka] var clusterActor: Option[ClusterActor] = None
 
   // FIXME Use the supervisor member field
-  @volatile private[remote] var supervisor: Option[Supervisor] = None
+  @volatile private[akka] var supervisor: Option[Supervisor] = None
 
-  private[remote] lazy val serializer: Serializer =
+  private[akka] lazy val serializer: Serializer =
   Class.forName(config.getString("akka.remote.cluster.serializer", DEFAULT_SERIALIZER_CLASS_NAME))
       .newInstance.asInstanceOf[Serializer]
 
-  private[remote] def createClusterActor: Option[ClusterActor] = {
+  private[akka] def createClusterActor: Option[ClusterActor] = {
     val name = config.getString("akka.remote.cluster.actor")
     if (name.isEmpty) throw new IllegalArgumentException(
       "Can't start cluster since the 'akka.remote.cluster.actor' configuration option is not defined")
@@ -229,7 +229,7 @@ object Cluster extends Cluster with Logging {
     }
   }
 
-  private[remote] def createSupervisor(actor: ClusterActor): Option[Supervisor] = {
+  private[akka] def createSupervisor(actor: ClusterActor): Option[Supervisor] = {
     val sup = SupervisorFactory(
       SupervisorConfig(
         RestartStrategy(OneForOne, 5, 1000, List(classOf[Exception])),
diff --git a/akka-core/src/main/scala/remote/RemoteClient.scala b/akka-core/src/main/scala/remote/RemoteClient.scala
index 0887ebcd82..ec3d837c01 100644
--- a/akka-core/src/main/scala/remote/RemoteClient.scala
+++ b/akka-core/src/main/scala/remote/RemoteClient.scala
@@ -8,7 +8,7 @@ import se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.{RemoteRequest,
 import se.scalablesolutions.akka.actor.{Exit, Actor}
 import se.scalablesolutions.akka.dispatch.{DefaultCompletableFuture, CompletableFuture}
 import se.scalablesolutions.akka.util.{UUID, Logging}
-import se.scalablesolutions.akka.Config.config
+import se.scalablesolutions.akka.config.Config.config
 
 import org.jboss.netty.channel._
 import group.DefaultChannelGroup
diff --git a/akka-core/src/main/scala/remote/RemoteServer.scala b/akka-core/src/main/scala/remote/RemoteServer.scala
index 02cf98bcd2..bcd6b55494 100644
--- a/akka-core/src/main/scala/remote/RemoteServer.scala
+++ b/akka-core/src/main/scala/remote/RemoteServer.scala
@@ -12,7 +12,7 @@ import java.util.{Map => JMap}
 import se.scalablesolutions.akka.actor._
 import se.scalablesolutions.akka.util._
 import se.scalablesolutions.akka.remote.protobuf.RemoteProtocol.{RemoteReply, RemoteRequest}
-import se.scalablesolutions.akka.Config.config
+import se.scalablesolutions.akka.config.Config.config
 
 import org.jboss.netty.bootstrap.ServerBootstrap
 import org.jboss.netty.channel._
diff --git a/akka-core/src/main/scala/serialization/Serializable.scala b/akka-core/src/main/scala/serialization/Serializable.scala
index b9a3cf5927..b5998cfb2e 100644
--- a/akka-core/src/main/scala/serialization/Serializable.scala
+++ b/akka-core/src/main/scala/serialization/Serializable.scala
@@ -5,10 +5,15 @@
 package se.scalablesolutions.akka.serialization
 
 import org.codehaus.jackson.map.ObjectMapper
+
 import com.google.protobuf.Message
-import reflect.Manifest
+
+import scala.reflect.Manifest
+
 import sbinary.DefaultProtocol
+
 import java.io.{StringWriter, ByteArrayOutputStream, ObjectOutputStream}
+
 import sjson.json.{Serializer=>SJSONSerializer}
 
 object SerializationProtocol {
diff --git a/akka-core/src/main/scala/stm/DataFlowVariable.scala b/akka-core/src/main/scala/stm/DataFlowVariable.scala
index daed4ec55f..cb1b828db1 100644
--- a/akka-core/src/main/scala/stm/DataFlowVariable.scala
+++ b/akka-core/src/main/scala/stm/DataFlowVariable.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
-package se.scalablesolutions.akka.state
+package se.scalablesolutions.akka.stm
 
 import java.util.concurrent.atomic.AtomicReference
 import java.util.concurrent.{ConcurrentLinkedQueue, LinkedBlockingQueue}
diff --git a/akka-core/src/main/scala/stm/HashTrie.scala b/akka-core/src/main/scala/stm/HashTrie.scala
index 02b7ad2145..fcb35baff3 100644
--- a/akka-core/src/main/scala/stm/HashTrie.scala
+++ b/akka-core/src/main/scala/stm/HashTrie.scala
@@ -32,7 +32,7 @@
  POSSIBILITY OF SUCH DAMAGE.
  **/
 
-package se.scalablesolutions.akka.collection
+package se.scalablesolutions.akka.stm
 
 trait PersistentDataStructure
 
@@ -77,7 +77,7 @@ object HashTrie {
 // nodes
 
 @serializable
-private[collection] sealed trait Node[K, +V] {
+private[stm] sealed trait Node[K, +V] {
   val size: Int
   
   def apply(key: K, hash: Int): Option[V]
@@ -90,7 +90,7 @@ private[collection] sealed trait Node[K, +V] {
 }
 
 @serializable
-private[collection] class EmptyNode[K] extends Node[K, Nothing] {
+private[stm] class EmptyNode[K] extends Node[K, Nothing] {
   val size = 0
   
   def apply(key: K, hash: Int) = None
@@ -106,12 +106,12 @@ private[collection] class EmptyNode[K] extends Node[K, Nothing] {
   }
 }
 
-private[collection] abstract class SingleNode[K, +V] extends Node[K, V] {
+private[stm] abstract class SingleNode[K, +V] extends Node[K, V] {
   val hash: Int
 }
 
 
-private[collection] class LeafNode[K, +V](key: K, val hash: Int, value: V) extends SingleNode[K, V] {
+private[stm] class LeafNode[K, +V](key: K, val hash: Int, value: V) extends SingleNode[K, V] {
   val size = 1
   
   def apply(key: K, hash: Int) = if (this.key == key) Some(value) else None
@@ -141,7 +141,7 @@ private[collection] class LeafNode[K, +V](key: K, val hash: Int, value: V) exten
 }
 
 
-private[collection] class CollisionNode[K, +V](val hash: Int, bucket: List[(K, V)]) extends SingleNode[K, V] {
+private[stm] class CollisionNode[K, +V](val hash: Int, bucket: List[(K, V)]) extends SingleNode[K, V] {
   lazy val size = bucket.length
   
   def this(hash: Int, pairs: (K, V)*) = this(hash, pairs.toList)
@@ -185,7 +185,7 @@ private[collection] class CollisionNode[K, +V](val hash: Int, bucket: List[(K, V
   override def toString = "CollisionNode(" + bucket.toString + ")"
 }
 
-private[collection] class BitmappedNode[K, +V](shift: Int)(table: Array[Node[K, V]], bits: Int) extends Node[K, V] {
+private[stm] class BitmappedNode[K, +V](shift: Int)(table: Array[Node[K, V]], bits: Int) extends Node[K, V] {
   lazy val size = {
     val sizes = for {
       n <- table
@@ -284,7 +284,7 @@ private[collection] class BitmappedNode[K, +V](shift: Int)(table: Array[Node[K,
 }
 
 
-private[collection] object BitmappedNode {
+private[stm] object BitmappedNode {
   def apply[K, V](shift: Int)(node: SingleNode[K, V], key: K, hash: Int, value: V) = {
     val table = new Array[Node[K, V]](Math.max((hash >>> shift) & 0x01f, (node.hash >>> shift) & 0x01f) + 1)
     
@@ -312,7 +312,7 @@ private[collection] object BitmappedNode {
 }
 
 
-private[collection] class FullNode[K, +V](shift: Int)(table: Array[Node[K, V]]) extends Node[K, V] {
+private[stm] class FullNode[K, +V](shift: Int)(table: Array[Node[K, V]]) extends Node[K, V] {
   lazy val size = table.foldLeft(0) { _ + _.size }
   
   def apply(key: K, hash: Int) = table((hash >>> shift) & 0x01f)(key, hash)
diff --git a/akka-core/src/main/scala/stm/ResultOrFailure.scala b/akka-core/src/main/scala/stm/ResultOrFailure.scala
index 51ce6ddf68..ced5572104 100644
--- a/akka-core/src/main/scala/stm/ResultOrFailure.scala
+++ b/akka-core/src/main/scala/stm/ResultOrFailure.scala
@@ -2,9 +2,7 @@
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
-package se.scalablesolutions.akka.util
-
-import stm.Transaction
+package se.scalablesolutions.akka.stm
 
 /**
  * Reference that can hold either a typed value or an exception.
diff --git a/akka-core/src/main/scala/stm/Transaction.scala b/akka-core/src/main/scala/stm/Transaction.scala
index 133c292a6f..a7184e969d 100644
--- a/akka-core/src/main/scala/stm/Transaction.scala
+++ b/akka-core/src/main/scala/stm/Transaction.scala
@@ -6,10 +6,10 @@ package se.scalablesolutions.akka.stm
 
 import java.util.concurrent.atomic.AtomicLong
 import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.TimeUnit
 
 import scala.collection.mutable.HashMap
 
-import se.scalablesolutions.akka.state.Committable
 import se.scalablesolutions.akka.util.Logging
 
 import org.multiverse.api.{Transaction => MultiverseTransaction}
@@ -18,7 +18,6 @@ import org.multiverse.api.ThreadLocalTransaction._
 import org.multiverse.templates.{TransactionTemplate, OrElseTemplate}
 import org.multiverse.utils.backoff.ExponentialBackoffPolicy
 import org.multiverse.stms.alpha.AlphaStm
-import java.util.concurrent.TimeUnit
 
 class NoTransactionInScopeException extends RuntimeException
 class TransactionRetryException(message: String) extends RuntimeException(message)
diff --git a/akka-core/src/main/scala/stm/TransactionManagement.scala b/akka-core/src/main/scala/stm/TransactionManagement.scala
index 60a6ae6de3..96742b9363 100644
--- a/akka-core/src/main/scala/stm/TransactionManagement.scala
+++ b/akka-core/src/main/scala/stm/TransactionManagement.scala
@@ -18,7 +18,7 @@ class TransactionAwareWrapperException(val cause: Throwable, val tx: Option[Tran
 }
 
 object TransactionManagement extends TransactionManagement {
-  import se.scalablesolutions.akka.Config._
+  import se.scalablesolutions.akka.config.Config._
 
   val TRANSACTION_ENABLED =      new AtomicBoolean(config.getBool("akka.stm.service", false))
   val FAIR_TRANSACTIONS =        config.getBool("akka.stm.fair", true)
diff --git a/akka-core/src/main/scala/stm/TransactionalState.scala b/akka-core/src/main/scala/stm/TransactionalState.scala
index 1b52faf969..c74fde4ab0 100644
--- a/akka-core/src/main/scala/stm/TransactionalState.scala
+++ b/akka-core/src/main/scala/stm/TransactionalState.scala
@@ -2,12 +2,11 @@
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
-package se.scalablesolutions.akka.state
+package se.scalablesolutions.akka.stm
 
 import se.scalablesolutions.akka.stm.Transaction.atomic
-import se.scalablesolutions.akka.stm.NoTransactionInScopeException
-import se.scalablesolutions.akka.collection._
 import se.scalablesolutions.akka.util.UUID
+
 import org.multiverse.stms.alpha.AlphaRef
 
 /**
diff --git a/akka-core/src/main/scala/stm/Vector.scala b/akka-core/src/main/scala/stm/Vector.scala
index e341875990..a9667d2521 100644
--- a/akka-core/src/main/scala/stm/Vector.scala
+++ b/akka-core/src/main/scala/stm/Vector.scala
@@ -32,7 +32,7 @@
  POSSIBILITY OF SUCH DAMAGE.
  **/
 
-package se.scalablesolutions.akka.collection
+package se.scalablesolutions.akka.stm
 
 import Vector._
 
@@ -54,7 +54,7 @@ class Vector[+T] private (val length: Int, shift: Int, root: Array[AnyRef], tail
    * (somewhat dynamically-typed) implementation in place.
    */
   
-  private[collection] def this() = this(0, 5, EmptyArray, EmptyArray)
+  private[stm] def this() = this(0, 5, EmptyArray, EmptyArray)
   
   def apply(i: Int): T = {
     if (i >= 0 && i < length) {
@@ -317,14 +317,14 @@ class Vector[+T] private (val length: Int, shift: Int, root: Array[AnyRef], tail
 }
 
 object Vector {
-  private[collection] val EmptyArray = new Array[AnyRef](0)
+  private[stm] val EmptyArray = new Array[AnyRef](0)
   
   def apply[T](elems: T*) = elems.foldLeft(EmptyVector:Vector[T]) { _ + _ }
   
   def unapplySeq[T](vec: Vector[T]): Option[Seq[T]] = Some(vec)
   
   @inline
-  private[collection] def array(elems: AnyRef*) = {
+  private[stm] def array(elems: AnyRef*) = {
     val back = new Array[AnyRef](elems.length)
     Array.copy(elems, 0, back, 0, back.length)
 
@@ -334,7 +334,7 @@ object Vector {
 
 object EmptyVector extends Vector[Nothing]
 
-private[collection] abstract class VectorProjection[+T] extends Vector[T] {
+private[stm] abstract class VectorProjection[+T] extends Vector[T] {
   override val length: Int
   override def apply(i: Int): T
   
diff --git a/akka-patterns/src/test/scala/AgentTest.scala b/akka-core/src/test/scala/AgentTest.scala
similarity index 100%
rename from akka-patterns/src/test/scala/AgentTest.scala
rename to akka-core/src/test/scala/AgentTest.scala
diff --git a/akka-core/src/test/scala/ClientInitiatedRemoteActorTest.scala b/akka-core/src/test/scala/ClientInitiatedRemoteActorTest.scala
index 81fb4780da..ff2843efe8 100644
--- a/akka-core/src/test/scala/ClientInitiatedRemoteActorTest.scala
+++ b/akka-core/src/test/scala/ClientInitiatedRemoteActorTest.scala
@@ -49,7 +49,7 @@ class RemoteActorSpecActorAsyncSender extends Actor {
 class ClientInitiatedRemoteActorTest extends JUnitSuite {
   import Actor.Sender.Self
 
-  akka.Config.config
+  akka.config.Config.config
 
   val HOSTNAME = "localhost"
   val PORT1 = 9990
diff --git a/akka-core/src/test/scala/InMemoryActorTest.scala b/akka-core/src/test/scala/InMemoryActorTest.scala
index d4be98fcaa..5692d7b01f 100644
--- a/akka-core/src/test/scala/InMemoryActorTest.scala
+++ b/akka-core/src/test/scala/InMemoryActorTest.scala
@@ -3,7 +3,7 @@ package se.scalablesolutions.akka.actor
 import org.scalatest.junit.JUnitSuite
 import org.junit.Test
 
-import se.scalablesolutions.akka.state.{TransactionalState, TransactionalMap, TransactionalRef, TransactionalVector}
+import se.scalablesolutions.akka.stm.{TransactionalState, TransactionalMap, TransactionalRef, TransactionalVector}
 
 case class GetMapState(key: String)
 case object GetVectorState
diff --git a/akka-core/src/test/scala/RemoteSupervisorTest.scala b/akka-core/src/test/scala/RemoteSupervisorTest.scala
index 57f01a6dda..7222e68b87 100644
--- a/akka-core/src/test/scala/RemoteSupervisorTest.scala
+++ b/akka-core/src/test/scala/RemoteSupervisorTest.scala
@@ -74,7 +74,7 @@ object Log {
 class RemoteSupervisorTest extends JUnitSuite {
   import Actor.Sender.Self
 
-  akka.Config.config
+  akka.config.Config.config
   new Thread(new Runnable() {
     def run = {
       RemoteNode.start
diff --git a/akka-core/src/test/scala/ServerInitiatedRemoteActorTest.scala b/akka-core/src/test/scala/ServerInitiatedRemoteActorTest.scala
index 2f1ef161c8..22ea078b1e 100644
--- a/akka-core/src/test/scala/ServerInitiatedRemoteActorTest.scala
+++ b/akka-core/src/test/scala/ServerInitiatedRemoteActorTest.scala
@@ -60,7 +60,7 @@ class ServerInitiatedRemoteActorTest extends JUnitSuite {
   import ServerInitiatedRemoteActorTest._
 
   import Actor.Sender.Self
-  akka.Config.config
+  akka.config.Config.config
 
   private val unit = TimeUnit.MILLISECONDS
 
diff --git a/akka-kernel/src/main/scala/Kernel.scala b/akka-kernel/src/main/scala/Kernel.scala
index 7b2b2e4693..30bb49bb71 100644
--- a/akka-kernel/src/main/scala/Kernel.scala
+++ b/akka-kernel/src/main/scala/Kernel.scala
@@ -2,11 +2,12 @@
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
-package se.scalablesolutions.akka
+package se.scalablesolutions.akka.kernel
 
 import se.scalablesolutions.akka.remote.BootableRemoteActorService
+import se.scalablesolutions.akka.comet.BootableCometActorService
 import se.scalablesolutions.akka.actor.BootableActorLoaderService
-import se.scalablesolutions.akka.util.{Logging,Bootable}
+import se.scalablesolutions.akka.util.{Logging, Bootable}
 
 import javax.servlet.{ServletContextListener, ServletContextEvent}
 
@@ -27,12 +28,15 @@ object Kernel extends Logging {
   /**
    * Holds a reference to the services that has been booted
    */
-  @volatile private var bundles : Option[Bootable] = None
+  @volatile private var bundles: Option[Bootable] = None
 
   /**
-   *  Boots up the Kernel with default bootables
+   * Boots up the Kernel with default bootables
    */
-  def boot : Unit = boot(true, new BootableActorLoaderService with BootableRemoteActorService with BootableCometActorService)
+  def boot: Unit = boot(true, 
+    new BootableActorLoaderService 
+    with BootableRemoteActorService 
+    with BootableCometActorService)
 
   /**
    * Boots up the Kernel. 
@@ -63,8 +67,8 @@ object Kernel extends Logging {
   }
 
   //For testing purposes only
-  def startRemoteService : Unit = bundles.foreach( _ match {
-    case x : BootableRemoteActorService => x.startRemoteService
+  def startRemoteService: Unit = bundles.foreach( _ match {
+    case x: BootableRemoteActorService => x.startRemoteService
     case _ =>
   })
 
@@ -79,16 +83,18 @@ object Kernel extends Logging {
  (____  /__|_ \__|_ \(____  /
       \/     \/    \/     \/
 """)
-    log.info("  Running version %s", Config.VERSION)
+    log.info("  Running version %s", config.Config.VERSION)
     log.info("==============================")
   }
 }
  
- /*
-  And this one can be added to web.xml mappings as a listener to boot and shutdown Akka
- */
- 
+ /**
+  * This class can be added to web.xml mappings as a listener to boot and shutdown Akka.
+  */ 
 class Kernel extends ServletContextListener {
-   def contextDestroyed(e : ServletContextEvent) : Unit = Kernel.shutdown
-   def contextInitialized(e : ServletContextEvent) : Unit = Kernel.boot(true,new BootableActorLoaderService with BootableRemoteActorService)
+   def contextDestroyed(e: ServletContextEvent): Unit = 
+     Kernel.shutdown
+     
+   def contextInitialized(e: ServletContextEvent): Unit = 
+     Kernel.boot(true, new BootableActorLoaderService with BootableRemoteActorService)
  }
\ No newline at end of file
diff --git a/akka-patterns/src/main/scala/Agent.scala b/akka-patterns/src/main/scala/Agent.scala
deleted file mode 100644
index aea74530a3..0000000000
--- a/akka-patterns/src/main/scala/Agent.scala
+++ /dev/null
@@ -1,146 +0,0 @@
-// ScalaAgent
-//
-// Copyright © 2008-9 The original author or authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package se.scalablesolutions.akka.actor
-
-import se.scalablesolutions.akka.state.TransactionalState
-import se.scalablesolutions.akka.stm.Transaction.atomic
-
-import java.util.concurrent.atomic.AtomicReference
-import java.util.concurrent.{CountDownLatch}
-
-/**
-* The Agent class was strongly inspired by the agent principle in Clojure. Essentially, an agent wraps a shared mutable state
-* and hides it behind a message-passing interface. Agents accept messages and process them on behalf of the wrapped state.
-* Typically agents accept functions / commands as messages and ensure the submitted commands are executed against the internal
-* agent's state in a thread-safe manner (sequentially).
-* The submitted functions / commands take the internal state as a parameter and their output becomes the new internal state value.
-* The code that is submitted to an agent doesn't need to pay attention to threading or synchronization, the agent will
-* provide such guarantees by itself.
-* See the examples of use for more details.
-*
-* @author Vaclav Pech
-* Date: Oct 18, 2009
-*
-* AKKA retrofit by
-* @author Viktor Klang
-* Date: Jan 24 2010
-*/
-sealed class Agent[T] private (initialValue: T) extends Actor {
-  import Agent._
-
-  private val value = TransactionalState.newRef[T]
-
-  updateData(initialValue)
-
-  /**
-  * Periodically handles incoming messages
-  */
-  def receive = {
-    case FunctionHolder(fun: (T => T)) => updateData(fun(value.getOrWait))
-
-    case ValueHolder(x: T) => updateData(x)
-
-    case ProcedureHolder(fun: (T => Unit)) => fun(copyStrategy(value.getOrWait))
-  }
-
-  /**
-   * Specifies how a copy of the value is made, defaults to using identity
-   */
-  protected def copyStrategy(t: T): T = t
-
-
-  /**
-  * Updates the internal state with the value provided as a by-name parameter
-  */
-  private final def updateData(newData: => T): Unit = value.swap(newData)
-
-  /**
-  * Submits a request to read the internal state.
-  * A copy of the internal state will be returned, depending on the underlying effective copyStrategy.
-  * Internally leverages the asynchronous getValue() method and then waits for its result on a CountDownLatch.
-  */
-  final def get: T = {
-    val ref = new AtomicReference[T]
-    val latch = new CountDownLatch(1)
-    get((x: T) => {ref.set(x); latch.countDown})
-    latch.await
-    ref.get
-  }
-
-  /**
-  * Asynchronously submits a request to read the internal state. The supplied function will be executed on the returned internal state value.
-  * A copy of the internal state will be used, depending on the underlying effective copyStrategy.
-  */
-  final def get(message: (T => Unit)): Unit = this ! ProcedureHolder(message)
-
-  /**
-  * Submits a request to read the internal state.
-  * A copy of the internal state will be returned, depending on the underlying effective copyStrategy.
-  * Internally leverages the asynchronous getValue() method and then waits for its result on a CountDownLatch.
-  */
-  final def apply(): T = get
-
-  /**
-  * Asynchronously submits a request to read the internal state. The supplied function will be executed on the returned internal state value.
-  * A copy of the internal state will be used, depending on the underlying effective copyStrategy.
-  */
-// final def apply(message: (T => Unit)) : Unit = get(message)
-
-  /**
-  * Submits the provided function for execution against the internal agent's state
-  */
-  final def apply(message: (T => T)): Unit = this ! FunctionHolder(message)
-
-  /**
-  * Submits a new value to be set as the new agent's internal state
-  */
-  final def apply(message: T): Unit = this ! ValueHolder(message)
-
-  /**
-  * Submits the provided function for execution against the internal agent's state
-  */
-  final def update(message: (T => T)): Unit = this ! FunctionHolder(message)
-
-  /**
-  * Submits a new value to be set as the new agent's internal state
-  */
-  final def update(message: T): Unit = this ! ValueHolder(message)
-}
-
-/**
-* Provides factory methods to create Agents.
-*/
-object Agent {
-  /**
-  * The internal messages for passing around requests
-  */
-  private case class ProcedureHolder[T](val fun: ((T) => Unit))
-  private case class FunctionHolder[T](val fun: ((T) => T))
-  private case class ValueHolder[T](val value: T)
-
-  /**
-   * Creates a new Agent of type T with the initial value of value
-   */
-  def apply[T](value:T): Agent[T] = new Agent(value)
-
-  /**
-   * Creates a new Agent of type T with the initial value of value and with the specified copy function
-   */
-  def apply[T](value:T, newCopyStrategy: (T) => T) = new Agent(value) {
-    override def copyStrategy(t : T) = newCopyStrategy(t)
-  }
-}
diff --git a/akka-patterns/src/main/scala/Patterns.scala b/akka-patterns/src/main/scala/Patterns.scala
index 9b7e55ccc9..02f2686ba7 100644
--- a/akka-patterns/src/main/scala/Patterns.scala
+++ b/akka-patterns/src/main/scala/Patterns.scala
@@ -1,4 +1,4 @@
-package se.scalablesolutions.akka.actor.patterns
+package se.scalablesolutions.akka.patterns
 
 import se.scalablesolutions.akka.actor.Actor
 
diff --git a/akka-patterns/src/test/scala/ActorPatternsTest.scala b/akka-patterns/src/test/scala/ActorPatternsTest.scala
index ae6ae5c0e8..c76269c5ec 100644
--- a/akka-patterns/src/test/scala/ActorPatternsTest.scala
+++ b/akka-patterns/src/test/scala/ActorPatternsTest.scala
@@ -1,5 +1,4 @@
-package se.scalablesolutions.akka.actor
-
+package se.scalablesolutions.akka.patterns
 
 import config.ScalaConfig._
 
diff --git a/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraSession.scala b/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraSession.scala
index 0b0c5ca43a..5141dc7cb2 100644
--- a/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraSession.scala
+++ b/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraSession.scala
@@ -2,14 +2,15 @@
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
-package se.scalablesolutions.akka.state
+package se.scalablesolutions.akka.persistence.cassandra
 
 import java.io.{Flushable, Closeable}
 
+import se.scalablesolutions.akka.persistence.common._
 import se.scalablesolutions.akka.util.Logging
 import se.scalablesolutions.akka.util.Helpers._
 import se.scalablesolutions.akka.serialization.Serializer
-import se.scalablesolutions.akka.Config.config
+import se.scalablesolutions.akka.config.Config.config
 
 import scala.collection.mutable.Map
 
diff --git a/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorage.scala b/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorage.scala
index 59a27963f4..be5fc4f4c7 100644
--- a/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorage.scala
+++ b/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorage.scala
@@ -2,16 +2,18 @@
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
-package se.scalablesolutions.akka.state
+package se.scalablesolutions.akka.persistence.cassandra
 
-import org.codehaus.aspectwerkz.proxy.Uuid
+import se.scalablesolutions.akka.util.UUID
+import se.scalablesolutions.akka.stm._
+import se.scalablesolutions.akka.persistence.common._
 
 object CassandraStorage extends Storage {
   type ElementType = Array[Byte]
 
-  def newMap: PersistentMap[ElementType, ElementType] = newMap(Uuid.newUuid.toString)
-  def newVector: PersistentVector[ElementType] = newVector(Uuid.newUuid.toString)
-  def newRef: PersistentRef[ElementType] = newRef(Uuid.newUuid.toString)
+  def newMap: PersistentMap[ElementType, ElementType] = newMap(UUID.newUuid.toString)
+  def newVector: PersistentVector[ElementType] = newVector(UUID.newUuid.toString)
+  def newRef: PersistentRef[ElementType] = newRef(UUID.newUuid.toString)
 
   def getMap(id: String): PersistentMap[ElementType, ElementType] = newMap(id)
   def getVector(id: String): PersistentVector[ElementType] = newVector(id)
diff --git a/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorageBackend.scala b/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorageBackend.scala
index d3c011ef79..8e91753211 100644
--- a/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorageBackend.scala
+++ b/akka-persistence/akka-persistence-cassandra/src/main/scala/CassandraStorageBackend.scala
@@ -2,11 +2,13 @@
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
-package se.scalablesolutions.akka.state
+package se.scalablesolutions.akka.persistence.cassandra
 
+import se.scalablesolutions.akka.stm._
+import se.scalablesolutions.akka.persistence.common._
 import se.scalablesolutions.akka.util.Logging
 import se.scalablesolutions.akka.util.Helpers._
-import se.scalablesolutions.akka.Config.config
+import se.scalablesolutions.akka.config.Config.config
 
 import org.apache.cassandra.service._
 
diff --git a/akka-persistence/akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala b/akka-persistence/akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala
index a7fed923eb..46d1b48a2d 100644
--- a/akka-persistence/akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala
+++ b/akka-persistence/akka-persistence-cassandra/src/test/scala/CassandraPersistentActorSpec.scala
@@ -1,4 +1,4 @@
-package se.scalablesolutions.akka.state
+package se.scalablesolutions.akka.persistence.cassandra
 
 import se.scalablesolutions.akka.actor.{Actor, Transactor}
 
diff --git a/akka-persistence/akka-persistence-common/src/main/scala/Pool.scala b/akka-persistence/akka-persistence-common/src/main/scala/Pool.scala
index d290455cad..73b64f3dd5 100644
--- a/akka-persistence/akka-persistence-common/src/main/scala/Pool.scala
+++ b/akka-persistence/akka-persistence-common/src/main/scala/Pool.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
-package se.scalablesolutions.akka.state
+package se.scalablesolutions.akka.persistence.common
 
 import org.apache.commons.pool._
 import org.apache.commons.pool.impl._
diff --git a/akka-persistence/akka-persistence-common/src/main/scala/Storage.scala b/akka-persistence/akka-persistence-common/src/main/scala/Storage.scala
index f52841b817..ff37dde82e 100644
--- a/akka-persistence/akka-persistence-common/src/main/scala/Storage.scala
+++ b/akka-persistence/akka-persistence-common/src/main/scala/Storage.scala
@@ -2,10 +2,10 @@
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
-package se.scalablesolutions.akka.state
+package se.scalablesolutions.akka.persistence.common
 
+import se.scalablesolutions.akka.stm._
 import se.scalablesolutions.akka.stm.TransactionManagement.transaction
-import se.scalablesolutions.akka.collection._
 import se.scalablesolutions.akka.util.Logging
 
 // FIXME move to 'stm' package + add message with more info
diff --git a/akka-persistence/akka-persistence-common/src/main/scala/StorageBackend.scala b/akka-persistence/akka-persistence-common/src/main/scala/StorageBackend.scala
index 94233acd0a..cf08095334 100644
--- a/akka-persistence/akka-persistence-common/src/main/scala/StorageBackend.scala
+++ b/akka-persistence/akka-persistence-common/src/main/scala/StorageBackend.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
-package se.scalablesolutions.akka.state
+package se.scalablesolutions.akka.persistence.common
 
 // abstracts persistence storage
 trait StorageBackend
diff --git a/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorage.scala b/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorage.scala
index 9aaf7a601d..70c7937eae 100644
--- a/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorage.scala
+++ b/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorage.scala
@@ -2,16 +2,18 @@
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
-package se.scalablesolutions.akka.state
+package se.scalablesolutions.akka.persistence.mongo
 
-import org.codehaus.aspectwerkz.proxy.Uuid
+import se.scalablesolutions.akka.stm._
+import se.scalablesolutions.akka.persistence.common._
+import se.scalablesolutions.akka.util.UUID
 
 object MongoStorage extends Storage {
   type ElementType = AnyRef
 
-  def newMap: PersistentMap[ElementType, ElementType] = newMap(Uuid.newUuid.toString)
-  def newVector: PersistentVector[ElementType] = newVector(Uuid.newUuid.toString)
-  def newRef: PersistentRef[ElementType] = newRef(Uuid.newUuid.toString)
+  def newMap: PersistentMap[ElementType, ElementType] = newMap(UUID.newUuid.toString)
+  def newVector: PersistentVector[ElementType] = newVector(UUID.newUuid.toString)
+  def newRef: PersistentRef[ElementType] = newRef(UUID.newUuid.toString)
 
   def getMap(id: String): PersistentMap[ElementType, ElementType] = newMap(id)
   def getVector(id: String): PersistentVector[ElementType] = newVector(id)
diff --git a/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala b/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala
index 0641b676e5..7cf3de21a4 100644
--- a/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala
+++ b/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala
@@ -2,10 +2,12 @@
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
-package se.scalablesolutions.akka.state
+package se.scalablesolutions.akka.persistence.mongo
 
+import se.scalablesolutions.akka.stm._
+import se.scalablesolutions.akka.persistence.common._
 import se.scalablesolutions.akka.util.Logging
-import se.scalablesolutions.akka.Config.config
+import se.scalablesolutions.akka.config.Config.config
 
 import sjson.json.Serializer._
 
diff --git a/akka-persistence/akka-persistence-mongo/src/test/scala/MongoPersistentActorSpec.scala b/akka-persistence/akka-persistence-mongo/src/test/scala/MongoPersistentActorSpec.scala
index 8ad5d94355..93aa1862d1 100644
--- a/akka-persistence/akka-persistence-mongo/src/test/scala/MongoPersistentActorSpec.scala
+++ b/akka-persistence/akka-persistence-mongo/src/test/scala/MongoPersistentActorSpec.scala
@@ -1,4 +1,4 @@
-package se.scalablesolutions.akka.state
+package se.scalablesolutions.akka.persistence.mongo
 
 import junit.framework.TestCase
 
diff --git a/akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala b/akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala
index fae6d7f00d..bf13c62390 100644
--- a/akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala
+++ b/akka-persistence/akka-persistence-mongo/src/test/scala/MongoStorageSpec.scala
@@ -1,4 +1,4 @@
-package se.scalablesolutions.akka.state
+package se.scalablesolutions.akka.persistence.mongo
 
 import junit.framework.TestCase
 
diff --git a/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorage.scala b/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorage.scala
index fffa0011e5..1338a9f8d4 100644
--- a/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorage.scala
+++ b/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorage.scala
@@ -2,17 +2,19 @@
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
-package se.scalablesolutions.akka.state
+package se.scalablesolutions.akka.persistence.redis
 
-import org.codehaus.aspectwerkz.proxy.Uuid
+import se.scalablesolutions.akka.util.UUID
+import se.scalablesolutions.akka.stm._
+import se.scalablesolutions.akka.persistence.common._
 
 object RedisStorage extends Storage {
   type ElementType = Array[Byte]
 
-  def newMap: PersistentMap[ElementType, ElementType] = newMap(Uuid.newUuid.toString)
-  def newVector: PersistentVector[ElementType] = newVector(Uuid.newUuid.toString)
-  def newRef: PersistentRef[ElementType] = newRef(Uuid.newUuid.toString)
-  override def newQueue: PersistentQueue[ElementType] = newQueue(Uuid.newUuid.toString)
+  def newMap: PersistentMap[ElementType, ElementType] = newMap(UUID.newUuid.toString)
+  def newVector: PersistentVector[ElementType] = newVector(UUID.newUuid.toString)
+  def newRef: PersistentRef[ElementType] = newRef(UUID.newUuid.toString)
+  override def newQueue: PersistentQueue[ElementType] = newQueue(UUID.newUuid.toString)
 
   def getMap(id: String): PersistentMap[ElementType, ElementType] = newMap(id)
   def getVector(id: String): PersistentVector[ElementType] = newVector(id)
diff --git a/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala b/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala
index be214087f3..59a04135b4 100644
--- a/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala
+++ b/akka-persistence/akka-persistence-redis/src/main/scala/RedisStorageBackend.scala
@@ -2,10 +2,12 @@
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
-package se.scalablesolutions.akka.state
+package se.scalablesolutions.akka.persistence.redis
 
+import se.scalablesolutions.akka.stm._
+import se.scalablesolutions.akka.persistence.common._
 import se.scalablesolutions.akka.util.Logging
-import se.scalablesolutions.akka.Config.config
+import se.scalablesolutions.akka.config.Config.config
 
 import com.redis._
 
diff --git a/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentActorSpec.scala b/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentActorSpec.scala
index 8c91f0ff61..9405789bfd 100644
--- a/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentActorSpec.scala
+++ b/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentActorSpec.scala
@@ -1,4 +1,4 @@
-package se.scalablesolutions.akka.state
+package se.scalablesolutions.akka.persistence.redis
 
 import junit.framework.TestCase
 
diff --git a/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentQSpec.scala b/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentQSpec.scala
index ad67dbfdbe..10cbb9e5c7 100644
--- a/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentQSpec.scala
+++ b/akka-persistence/akka-persistence-redis/src/test/scala/RedisPersistentQSpec.scala
@@ -1,4 +1,4 @@
-package se.scalablesolutions.akka.state
+package se.scalablesolutions.akka.persistence.redis
 
 import junit.framework.TestCase
 
diff --git a/akka-rest/src/main/scala/ActorComponentProvider.scala b/akka-rest/src/main/scala/ActorComponentProvider.scala
index ed9fb225fb..5d9d49bef2 100644
--- a/akka-rest/src/main/scala/ActorComponentProvider.scala
+++ b/akka-rest/src/main/scala/ActorComponentProvider.scala
@@ -7,8 +7,8 @@ package se.scalablesolutions.akka.rest
 import com.sun.jersey.core.spi.component.ComponentScope
 import com.sun.jersey.core.spi.component.ioc.IoCFullyManagedComponentProvider
 
-import config.Configurator
-import util.Logging
+import se.scalablesolutions.akka.config.Configurator
+import se.scalablesolutions.akka.util.Logging
 
 class ActorComponentProvider(val clazz: Class[_], val configurators: List[Configurator])
     extends IoCFullyManagedComponentProvider with Logging {
diff --git a/akka-rest/src/main/scala/AkkaServlet.scala b/akka-rest/src/main/scala/AkkaServlet.scala
index 2aa2a6b2c5..fbf14cad31 100644
--- a/akka-rest/src/main/scala/AkkaServlet.scala
+++ b/akka-rest/src/main/scala/AkkaServlet.scala
@@ -5,6 +5,7 @@
 package se.scalablesolutions.akka.rest
 
 import se.scalablesolutions.akka.config.ConfiguratorRepository
+import se.scalablesolutions.akka.config.Config.config
 
 import com.sun.jersey.api.core.ResourceConfig
 import com.sun.jersey.spi.container.servlet.ServletContainer
@@ -20,14 +21,12 @@ class AkkaServlet extends ServletContainer {
   import org.scala_tools.javautils.Imports._
 
   override def initiate(resourceConfig: ResourceConfig, webApplication: WebApplication) = {
-    //Kernel.boot // will boot if not already booted by 'main'
-
     val configurators = ConfiguratorRepository.getConfigurators
 
     resourceConfig.getClasses.addAll(configurators.flatMap(_.getComponentInterfaces).asJava)
     resourceConfig.getProperties.put(
       "com.sun.jersey.spi.container.ResourceFilters",
-      Config.config.getList("akka.rest.filters").mkString(","))
+      config.getList("akka.rest.filters").mkString(","))
 
     webApplication.initiate(resourceConfig, new ActorComponentProviderFactory(configurators))
   }
diff --git a/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala b/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala
index d03c209706..981a4c3c05 100644
--- a/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala
+++ b/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala
@@ -6,12 +6,14 @@ package se.scalablesolutions.akka.sample.chat
 
 import se.scalablesolutions.akka.actor.{SupervisorFactory, Actor, RemoteActor}
 import se.scalablesolutions.akka.stm.Transaction._
+import se.scalablesolutions.akka.persistence.common.PersistentVector
+import se.scalablesolutions.akka.persistence.redis.RedisStorage
 import se.scalablesolutions.akka.remote.RemoteServer
 import se.scalablesolutions.akka.util.Logging
 import se.scalablesolutions.akka.config.ScalaConfig._
 import se.scalablesolutions.akka.config.OneForOneStrategy
+
 import scala.collection.mutable.HashMap
-import se.scalablesolutions.akka.state.{PersistentVector, RedisStorage}
 
 /******************************************************************************
   To run the sample: 
diff --git a/akka-samples/akka-sample-lift/src/main/scala/akka/SimpleService.scala b/akka-samples/akka-sample-lift/src/main/scala/akka/SimpleService.scala
index 3f18f7d357..35a4158642 100644
--- a/akka-samples/akka-sample-lift/src/main/scala/akka/SimpleService.scala
+++ b/akka-samples/akka-sample-lift/src/main/scala/akka/SimpleService.scala
@@ -2,7 +2,8 @@ package sample.lift
 
 import se.scalablesolutions.akka.actor.{Transactor, Actor}
 import se.scalablesolutions.akka.config.ScalaConfig._
-import se.scalablesolutions.akka.state.{CassandraStorage, TransactionalState}
+import se.scalablesolutions.akka.stm.TransactionalState
+import se.scalablesolutions.akka.persistence.cassandra.CassandraStorage
 
 import java.lang.Integer
 import javax.ws.rs.{GET, Path, Produces}
diff --git a/akka-samples/akka-sample-rest-java/src/main/java/sample/java/PersistentSimpleService.java b/akka-samples/akka-sample-rest-java/src/main/java/sample/java/PersistentSimpleService.java
index 9a0a38f619..2597e45d95 100644
--- a/akka-samples/akka-sample-rest-java/src/main/java/sample/java/PersistentSimpleService.java
+++ b/akka-samples/akka-sample-rest-java/src/main/java/sample/java/PersistentSimpleService.java
@@ -11,8 +11,8 @@ import javax.ws.rs.Produces;
 import se.scalablesolutions.akka.annotation.transactionrequired;
 import se.scalablesolutions.akka.annotation.prerestart;
 import se.scalablesolutions.akka.annotation.postrestart;
-import se.scalablesolutions.akka.state.PersistentMap;
-import se.scalablesolutions.akka.state.CassandraStorage;
+import se.scalablesolutions.akka.persistence.common.PersistentMap;
+import se.scalablesolutions.akka.persistence.cassandra.CassandraStorage;
 
 import java.nio.ByteBuffer;
 
diff --git a/akka-samples/akka-sample-rest-java/src/main/java/sample/java/SimpleService.java b/akka-samples/akka-sample-rest-java/src/main/java/sample/java/SimpleService.java
index 54468495bc..0d86b2d37b 100644
--- a/akka-samples/akka-sample-rest-java/src/main/java/sample/java/SimpleService.java
+++ b/akka-samples/akka-sample-rest-java/src/main/java/sample/java/SimpleService.java
@@ -11,8 +11,8 @@ import javax.ws.rs.Produces;
 import se.scalablesolutions.akka.annotation.transactionrequired;
 import se.scalablesolutions.akka.annotation.prerestart;
 import se.scalablesolutions.akka.annotation.postrestart;
-import se.scalablesolutions.akka.state.TransactionalState;
-import se.scalablesolutions.akka.state.TransactionalMap;
+import se.scalablesolutions.akka.stm.TransactionalState;
+import se.scalablesolutions.akka.stm.TransactionalMap;
 
 /**                                
  * Try service out by invoking (multiple times):
diff --git a/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala b/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala
index 39a6a2a0d2..04408fc0f4 100644
--- a/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala
+++ b/akka-samples/akka-sample-rest-scala/src/main/scala/SimpleService.scala
@@ -5,10 +5,11 @@
 package sample.scala
 
 import se.scalablesolutions.akka.actor.{Transactor, SupervisorFactory, Actor}
-import se.scalablesolutions.akka.state.{CassandraStorage, TransactionalState}
+import se.scalablesolutions.akka.stm.TransactionalState
+import se.scalablesolutions.akka.persistence.cassandra.CassandraStorage
 import se.scalablesolutions.akka.config.ScalaConfig._
 import se.scalablesolutions.akka.util.Logging
-import se.scalablesolutions.akka.comet.{AkkaClusterBroadcastFilter}
+import se.scalablesolutions.akka.comet.AkkaClusterBroadcastFilter
 
 import java.lang.Integer
 import java.nio.ByteBuffer
diff --git a/akka-samples/akka-sample-security/src/main/scala/SecuritySpec.scala b/akka-samples/akka-sample-security/src/main/scala/SecuritySpec.scala
new file mode 100644
index 0000000000..15e84381ea
--- /dev/null
+++ b/akka-samples/akka-sample-security/src/main/scala/SecuritySpec.scala
@@ -0,0 +1,74 @@
+/**
+ * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
+ */
+
+package se.scalablesolutions.akka.security
+
+import config.ScalaConfig._
+
+import org.scalatest.Suite
+import org.scalatest.junit.JUnitSuite
+import org.scalatest.matchers.MustMatchers
+import org.scalatest.mock.MockitoSugar
+import org.mockito.Mockito._
+import org.mockito.Matchers._
+import org.junit.{Before, After, Test}
+
+import _root_.javax.ws.rs.core.{SecurityContext, Context, Response}
+import _root_.com.sun.jersey.spi.container.{ResourceFilterFactory, ContainerRequest, ContainerRequestFilter, ContainerResponse, ContainerResponseFilter, ResourceFilter}
+import _root_.com.sun.jersey.core.util.Base64
+
+class BasicAuthenticatorSpec extends junit.framework.TestCase
+    with Suite with MockitoSugar with MustMatchers {
+  val authenticator = new BasicAuthenticator
+  authenticator.start
+
+  @Test def testChallenge = {
+    val req = mock[ContainerRequest]
+
+    val result: Response = (authenticator !! (Authenticate(req, List("foo")), 10000)).get
+
+    // the actor replies with a challenge for the browser
+    result.getStatus must equal(Response.Status.UNAUTHORIZED.getStatusCode)
+    result.getMetadata.get("WWW-Authenticate").get(0).toString must startWith("Basic")
+  }
+
+  @Test def testAuthenticationSuccess = {
+    val req = mock[ContainerRequest]
+    // fake a basic auth header -> this will authenticate the user
+    when(req.getHeaderValue("Authorization")).thenReturn("Basic " + new String(Base64.encode("foo:bar")))
+
+    // fake a request authorization -> this will authorize the user
+    when(req.isUserInRole("chef")).thenReturn(true)
+
+    val result: AnyRef = (authenticator !! (Authenticate(req, List("chef")), 10000)).get
+
+    result must be(OK)
+    // the authenticator must have set a security context 
+    verify(req).setSecurityContext(any[SecurityContext])
+  }
+
+  @Test def testUnauthorized = {
+    val req = mock[ContainerRequest]
+    
+    // fake a basic auth header -> this will authenticate the user
+    when(req.getHeaderValue("Authorization")).thenReturn("Basic " + new String(Base64.encode("foo:bar")))
+    when(req.isUserInRole("chef")).thenReturn(false) // this will deny access
+
+    val result: Response = (authenticator !! (Authenticate(req, List("chef")), 10000)).get
+
+    result.getStatus must equal(Response.Status.FORBIDDEN.getStatusCode)
+
+    // the authenticator must have set a security context
+    verify(req).setSecurityContext(any[SecurityContext])
+  }
+
+  class BasicAuthenticator extends BasicAuthenticationActor {
+    def verify(odc: Option[BasicCredentials]): Option[UserInfo] = odc match {
+      case Some(dc) => Some(UserInfo("foo", "bar", "ninja" :: "chef" :: Nil))
+      case _ => None
+    }
+    override def realm = "test"
+  }
+}
+
diff --git a/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala b/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala
index 59e3a5c85e..b6183cfda9 100644
--- a/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala
+++ b/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala
@@ -8,7 +8,7 @@ import se.scalablesolutions.akka.actor.{SupervisorFactory, Actor}
 import se.scalablesolutions.akka.config.ScalaConfig._
 import se.scalablesolutions.akka.util.Logging
 import se.scalablesolutions.akka.security.{DigestAuthenticationActor, UserInfo}
-import se.scalablesolutions.akka.state.TransactionalState
+import se.scalablesolutions.akka.stm.TransactionalState
 
 class Boot {
   val factory = SupervisorFactory(
diff --git a/akka-security/src/main/scala/Security.scala b/akka-security/src/main/scala/Security.scala
index f6f2b939a1..1f0d8a94aa 100644
--- a/akka-security/src/main/scala/Security.scala
+++ b/akka-security/src/main/scala/Security.scala
@@ -22,20 +22,21 @@
 
 package se.scalablesolutions.akka.security
 
-import _root_.se.scalablesolutions.akka.actor.{Scheduler, Actor, ActorRegistry}
-import _root_.se.scalablesolutions.akka.util.Logging
-import _root_.se.scalablesolutions.akka.Config
+import se.scalablesolutions.akka.actor.{Scheduler, Actor, ActorRegistry}
+import se.scalablesolutions.akka.util.Logging
+import se.scalablesolutions.akka.config.Config
 
-import _root_.com.sun.jersey.api.model.AbstractMethod
-import _root_.com.sun.jersey.spi.container.{ResourceFilterFactory, ContainerRequest, ContainerRequestFilter, ContainerResponse, ContainerResponseFilter, ResourceFilter}
-import _root_.com.sun.jersey.core.util.Base64
-import _root_.javax.ws.rs.core.{SecurityContext, Context, Response}
-import _root_.javax.ws.rs.WebApplicationException
-import _root_.javax.annotation.security.{DenyAll, PermitAll, RolesAllowed}
-import _root_.java.security.Principal
-import _root_.java.util.concurrent.TimeUnit
+import com.sun.jersey.api.model.AbstractMethod
+import com.sun.jersey.spi.container.{ResourceFilterFactory, ContainerRequest, ContainerRequestFilter, ContainerResponse, ContainerResponseFilter, ResourceFilter}
+import com.sun.jersey.core.util.Base64
 
-import _root_.net.liftweb.util.{SecurityHelpers, StringHelpers, IoHelpers}
+import javax.ws.rs.core.{SecurityContext, Context, Response}
+import javax.ws.rs.WebApplicationException
+import javax.annotation.security.{DenyAll, PermitAll, RolesAllowed}
+import java.security.Principal
+import java.util.concurrent.TimeUnit
+
+import net.liftweb.util.{SecurityHelpers, StringHelpers, IoHelpers}
 
 object Enc extends SecurityHelpers with StringHelpers with IoHelpers
 
@@ -329,19 +330,19 @@ trait DigestAuthenticationActor extends AuthenticationActor[DigestCredentials] {
   def noncePurgeInterval = 2 * 60 * 1000 //ms
 }
 
-import _root_.java.security.Principal
-import _root_.java.security.PrivilegedActionException
-import _root_.java.security.PrivilegedExceptionAction
+import java.security.Principal
+import java.security.PrivilegedActionException
+import java.security.PrivilegedExceptionAction
 
-import _root_.javax.security.auth.login.AppConfigurationEntry
-import _root_.javax.security.auth.login.Configuration
-import _root_.javax.security.auth.login.LoginContext
-import _root_.javax.security.auth.Subject
-import _root_.javax.security.auth.kerberos.KerberosPrincipal
+import javax.security.auth.login.AppConfigurationEntry
+import javax.security.auth.login.Configuration
+import javax.security.auth.login.LoginContext
+import javax.security.auth.Subject
+import javax.security.auth.kerberos.KerberosPrincipal
 
-import _root_.org.ietf.jgss.GSSContext
-import _root_.org.ietf.jgss.GSSCredential
-import _root_.org.ietf.jgss.GSSManager
+import org.ietf.jgss.GSSContext
+import org.ietf.jgss.GSSCredential
+import org.ietf.jgss.GSSManager
 
 trait SpnegoAuthenticationActor extends AuthenticationActor[SpnegoCredentials] {
   override def unauthorized =
@@ -349,7 +350,7 @@ trait SpnegoAuthenticationActor extends AuthenticationActor[SpnegoCredentials] {
 
   // for some reason the jersey Base64 class does not work with kerberos
   // but the commons Base64 does
-  import _root_.org.apache.commons.codec.binary.Base64
+  import org.apache.commons.codec.binary.Base64
   override def extractCredentials(r: Req): Option[SpnegoCredentials] = {
     val AuthHeader = """Negotiate\s(.*)""".r
 
diff --git a/akka-security/src/test/scala/SecuritySpec.scala b/akka-security/src/test/scala/SecuritySpec.scala
index 15e84381ea..e56148b5df 100644
--- a/akka-security/src/test/scala/SecuritySpec.scala
+++ b/akka-security/src/test/scala/SecuritySpec.scala
@@ -14,9 +14,9 @@ import org.mockito.Mockito._
 import org.mockito.Matchers._
 import org.junit.{Before, After, Test}
 
-import _root_.javax.ws.rs.core.{SecurityContext, Context, Response}
-import _root_.com.sun.jersey.spi.container.{ResourceFilterFactory, ContainerRequest, ContainerRequestFilter, ContainerResponse, ContainerResponseFilter, ResourceFilter}
-import _root_.com.sun.jersey.core.util.Base64
+import javax.ws.rs.core.{SecurityContext, Context, Response}
+import com.sun.jersey.spi.container.{ResourceFilterFactory, ContainerRequest, ContainerRequestFilter, ContainerResponse, ContainerResponseFilter, ResourceFilter}
+import com.sun.jersey.core.util.Base64
 
 class BasicAuthenticatorSpec extends junit.framework.TestCase
     with Suite with MockitoSugar with MustMatchers {
diff --git a/akka-util/src/main/scala/Bootable.scala b/akka-util/src/main/scala/Bootable.scala
index a46a131f00..172be3fd43 100644
--- a/akka-util/src/main/scala/Bootable.scala
+++ b/akka-util/src/main/scala/Bootable.scala
@@ -5,6 +5,6 @@
 package se.scalablesolutions.akka.util
 
 trait Bootable {
-  def onLoad : Unit = ()
-  def onUnload : Unit = ()
+  def onLoad {}
+  def onUnload {}
 }
\ No newline at end of file
diff --git a/akka-util/src/main/scala/Config.scala b/akka-util/src/main/scala/Config.scala
deleted file mode 100644
index f25b08ee46..0000000000
--- a/akka-util/src/main/scala/Config.scala
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
- */
-
-package se.scalablesolutions.akka
-
-import util.Logging
-
-import net.lag.configgy.{Configgy, ParseException}
-
-/**
- * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
- */
-object Config extends Logging {
-  val VERSION = "0.7-SNAPSHOT"
-
-  // Set Multiverse options for max speed
-  System.setProperty("org.multiverse.MuliverseConstants.sanityChecks", "false")
-  System.setProperty("org.multiverse.api.GlobalStmInstance.factorymethod", "org.multiverse.stms.alpha.AlphaStm.createFast")
-
-  val HOME = {
-    val systemHome = System.getenv("AKKA_HOME")
-    if (systemHome == null || systemHome.length == 0 || systemHome == ".") {
-      val optionHome = System.getProperty("akka.home", "")
-      if (optionHome.length != 0) Some(optionHome)
-      else None
-    } else Some(systemHome)
-  }
-
-  val config = {
-    if (HOME.isDefined) {
-      try {
-        val configFile = HOME.get + "/config/akka.conf"
-        Configgy.configure(configFile)
-        log.info("AKKA_HOME is defined to [%s], config loaded from [%s].", HOME.get, configFile)
-      } catch {
-        case e: ParseException => throw new IllegalStateException(
-          "'akka.conf' config file can not be found in [" + HOME + "/config/akka.conf] aborting." +
-          "\n\tEither add it in the 'config' directory or add it to the classpath.")
-      }
-    } else if (System.getProperty("akka.config", "") != "") {
-      val configFile = System.getProperty("akka.config", "")
-      try {
-        Configgy.configure(configFile)
-        log.info("Config loaded from -Dakka.config=%s", configFile)
-      } catch {
-        case e: ParseException => throw new IllegalStateException(
-          "Config could not be loaded from -Dakka.config=" + configFile)
-      }
-    } else {
-      try {
-        Configgy.configureFromResource("akka.conf", getClass.getClassLoader)
-        log.info("Config loaded from the application classpath.")
-      } catch {
-        case e: ParseException => throw new IllegalStateException(
-          "\nCan't find 'akka.conf' configuration file." + 
-          "\nOne of the three ways of locating the 'akka.conf' file needs to be defined:" +
-          "\n\t1. Define 'AKKA_HOME' environment variable to the root of the Akka distribution." +
-          "\n\t2. Define the '-Dakka.config=...' system property option." +
-          "\n\t3. Put the 'akka.conf' file on the classpath." +
-          "\nI have no way of finding the 'akka.conf' configuration file." +
-          "\nAborting.")
-      }
-    }
-    Configgy.config
-  }
-
-  val CONFIG_VERSION = config.getString("akka.version", "0")
-  if (VERSION != CONFIG_VERSION) throw new IllegalStateException(
-    "Akka JAR version [" + VERSION + "] is different than the provided config ('akka.conf') version [" + CONFIG_VERSION + "]")
-  val startTime = System.currentTimeMillis
-
-  def uptime = (System.currentTimeMillis - startTime) / 1000
-}
diff --git a/akka-util/src/main/scala/Helpers.scala b/akka-util/src/main/scala/Helpers.scala
index b7e5ff3b75..55abf6e7ac 100644
--- a/akka-util/src/main/scala/Helpers.scala
+++ b/akka-util/src/main/scala/Helpers.scala
@@ -40,7 +40,6 @@ object Helpers extends Logging {
   }
 
  // ================================================
-  @serializable
   class ReadWriteLock {
     private val rwl = new ReentrantReadWriteLock
     private val readLock = rwl.readLock
diff --git a/akka-util/src/main/scala/Logging.scala b/akka-util/src/main/scala/Logging.scala
index a6b89b86b2..b988c73f22 100644
--- a/akka-util/src/main/scala/Logging.scala
+++ b/akka-util/src/main/scala/Logging.scala
@@ -6,10 +6,10 @@ package se.scalablesolutions.akka.util
 
 import net.lag.logging.Logger
 
-import java.io.StringWriter;
-import java.io.PrintWriter;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
+import java.io.StringWriter
+import java.io.PrintWriter
+import java.net.InetAddress
+import java.net.UnknownHostException
 
 /**
  * Base trait for all classes that wants to be able use the logging infrastructure.
@@ -30,6 +30,7 @@ trait Logging {
  *
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
+ // FIXME make use of LoggableException
 class LoggableException extends Exception with Logging {
   private val uniqueId = getExceptionID
   private var originalException: Option[Exception] = None
diff --git a/config/akka-reference.conf b/config/akka-reference.conf
index 14933a3cac..dd3cfc01b2 100644
--- a/config/akka-reference.conf
+++ b/config/akka-reference.conf
@@ -51,7 +51,7 @@
     <cluster>
       service = on # FIXME add 'service = on' for <cluster>
       name = "default"                                                       # The name of the cluster
-      actor = "se.scalablesolutions.akka.remote.JGroupsClusterActor"         # FQN of an implementation of ClusterActor
+      actor = "se.scalablesolutions.akka.cluster.jgroups.JGroupsClusterActor"         # FQN of an implementation of ClusterActor
       serializer = "se.scalablesolutions.akka.serialization.Serializer$Java" # FQN of the serializer class
     </cluster>