diff --git a/akka-actor/src/main/scala/actor/ActorRef.scala b/akka-actor/src/main/scala/actor/ActorRef.scala
index 1127da8a2e..e4c8d58cc1 100644
--- a/akka-actor/src/main/scala/actor/ActorRef.scala
+++ b/akka-actor/src/main/scala/actor/ActorRef.scala
@@ -6,8 +6,7 @@ package se.scalablesolutions.akka.actor
 
 import se.scalablesolutions.akka.dispatch._
 import se.scalablesolutions.akka.config.Config._
-import se.scalablesolutions.akka.config.{NoFaultHandlingStrategy, AllForOneStrategy, OneForOneStrategy, FaultHandlingStrategy,
-                                         LifeCycle, Temporary, Permanent, UndefinedLifeCycle}
+import se.scalablesolutions.akka.config.Supervision._
 import se.scalablesolutions.akka.stm.global._
 import se.scalablesolutions.akka.stm.TransactionManagement._
 import se.scalablesolutions.akka.stm.{ TransactionManagement, TransactionSetAbortedException }
diff --git a/akka-actor/src/main/scala/actor/Supervisor.scala b/akka-actor/src/main/scala/actor/Supervisor.scala
index bed8848b21..8655c9de14 100644
--- a/akka-actor/src/main/scala/actor/Supervisor.scala
+++ b/akka-actor/src/main/scala/actor/Supervisor.scala
@@ -12,7 +12,7 @@ import Actor._
 
 import java.util.concurrent.{CopyOnWriteArrayList, ConcurrentHashMap}
 import java.net.InetSocketAddress
-import se.scalablesolutions.akka.config. {Supervision, AllForOneStrategy, OneForOneStrategy, FaultHandlingStrategy}
+import se.scalablesolutions.akka.config.Supervision._
 
 class SupervisorException private[akka](message: String) extends AkkaException(message)
 
diff --git a/akka-actor/src/main/scala/actor/UntypedActor.scala b/akka-actor/src/main/scala/actor/UntypedActor.scala
index fa53344c5f..a1d724a566 100644
--- a/akka-actor/src/main/scala/actor/UntypedActor.scala
+++ b/akka-actor/src/main/scala/actor/UntypedActor.scala
@@ -6,7 +6,6 @@ package se.scalablesolutions.akka.actor
 
 import se.scalablesolutions.akka.dispatch._
 import se.scalablesolutions.akka.stm.global._
-import se.scalablesolutions.akka.config.{AllForOneStrategy, OneForOneStrategy, FaultHandlingStrategy}
 import se.scalablesolutions.akka.config.Supervision._
 
 import java.net.InetSocketAddress
diff --git a/akka-actor/src/main/scala/config/SupervisionConfig.scala b/akka-actor/src/main/scala/config/SupervisionConfig.scala
index 1f30472b05..6585e1b921 100644
--- a/akka-actor/src/main/scala/config/SupervisionConfig.scala
+++ b/akka-actor/src/main/scala/config/SupervisionConfig.scala
@@ -7,52 +7,6 @@ package se.scalablesolutions.akka.config
 import se.scalablesolutions.akka.actor.{ActorRef}
 import se.scalablesolutions.akka.dispatch.MessageDispatcher
 
-sealed abstract class FaultHandlingStrategy {
-  def trapExit: List[Class[_ <: Throwable]]
-}
-
-object AllForOneStrategy {
-  def apply(trapExit: List[Class[_ <: Throwable]], maxNrOfRetries: Int, withinTimeRange: Int) =
-    new AllForOneStrategy(trapExit, if (maxNrOfRetries < 0) None else Some(maxNrOfRetries), if (withinTimeRange < 0) None else Some(withinTimeRange))
-  def apply(trapExit: Array[Class[Throwable]], maxNrOfRetries: Int, withinTimeRange: Int) =
-    new AllForOneStrategy(trapExit.toList,maxNrOfRetries,withinTimeRange)
-}
-
-case class AllForOneStrategy(trapExit: List[Class[_ <: Throwable]],
-                             maxNrOfRetries: Option[Int] = None,
-                             withinTimeRange: Option[Int] = None) extends FaultHandlingStrategy {
-  def this(trapExit: List[Class[_ <: Throwable]],maxNrOfRetries: Int, withinTimeRange: Int) =
-    this(trapExit, if (maxNrOfRetries < 0) None else Some(maxNrOfRetries), if (withinTimeRange < 0) None else Some(withinTimeRange))
-  def this(trapExit: Array[Class[Throwable]],maxNrOfRetries: Int, withinTimeRange: Int) =
-    this(trapExit.toList,maxNrOfRetries,withinTimeRange)
-}
-
-object OneForOneStrategy {
-  def apply(trapExit: List[Class[_ <: Throwable]], maxNrOfRetries: Int, withinTimeRange: Int) =
-    new OneForOneStrategy(trapExit, if (maxNrOfRetries < 0) None else Some(maxNrOfRetries), if (withinTimeRange < 0) None else Some(withinTimeRange))
-  def apply(trapExit: Array[Class[Throwable]], maxNrOfRetries: Int, withinTimeRange: Int) =
-    new OneForOneStrategy(trapExit.toList,maxNrOfRetries,withinTimeRange)
-}
-
-case class OneForOneStrategy(trapExit: List[Class[_ <: Throwable]],
-                             maxNrOfRetries: Option[Int] = None,
-                             withinTimeRange: Option[Int] = None) extends FaultHandlingStrategy {
-  def this(trapExit: List[Class[_ <: Throwable]],maxNrOfRetries: Int, withinTimeRange: Int) =
-    this(trapExit, if (maxNrOfRetries < 0) None else Some(maxNrOfRetries), if (withinTimeRange < 0) None else Some(withinTimeRange))
-  def this(trapExit: Array[Class[Throwable]],maxNrOfRetries: Int, withinTimeRange: Int) =
-    this(trapExit.toList,maxNrOfRetries,withinTimeRange)
-}
-
-case object NoFaultHandlingStrategy extends FaultHandlingStrategy {
-  def trapExit: List[Class[_ <: Throwable]] = Nil
-}
-
-sealed abstract class LifeCycle
-
-case object Permanent extends LifeCycle
-case object Temporary extends LifeCycle
-case object UndefinedLifeCycle extends LifeCycle
-
 case class RemoteAddress(val hostname: String, val port: Int)
 
 /**
@@ -65,6 +19,7 @@ object Supervision {
 
   abstract class Server extends ConfigElement
   abstract class FailOverScheme extends ConfigElement
+  sealed abstract class LifeCycle extends ConfigElement
 
   case class SupervisorConfig(restartStrategy: RestartStrategy, worker: List[Server]) extends Server {
   //Java API
@@ -92,10 +47,15 @@ object Supervision {
   class AllForOne extends FailOverScheme
   class OneForOne extends FailOverScheme
 
+  //Scala API
+  case object Permanent extends LifeCycle
+  case object Temporary extends LifeCycle
+  case object UndefinedLifeCycle extends LifeCycle
+
   //Java API (& Scala if you fancy)
-  def permanent() = se.scalablesolutions.akka.config.Permanent
-  def temporary() = se.scalablesolutions.akka.config.Temporary
-  def undefinedLifeCycle = se.scalablesolutions.akka.config.UndefinedLifeCycle
+  def permanent() = Permanent
+  def temporary() = Temporary
+  def undefinedLifeCycle = UndefinedLifeCycle
 
   //Scala API
   object AllForOne extends AllForOne { def apply() = this }
@@ -158,4 +118,44 @@ object Supervision {
     def this(target: Class[_], lifeCycle: LifeCycle, timeout: Long, transactionRequired: Boolean, dispatcher: MessageDispatcher, remoteAddress: RemoteAddress) =
       this(null: Class[_], target, lifeCycle, timeout, transactionRequired, dispatcher, remoteAddress)
   }
+
+  sealed abstract class FaultHandlingStrategy {
+    def trapExit: List[Class[_ <: Throwable]]
+  }
+
+  object AllForOneStrategy {
+    def apply(trapExit: List[Class[_ <: Throwable]], maxNrOfRetries: Int, withinTimeRange: Int) =
+      new AllForOneStrategy(trapExit, if (maxNrOfRetries < 0) None else Some(maxNrOfRetries), if (withinTimeRange < 0) None else Some(withinTimeRange))
+    def apply(trapExit: Array[Class[Throwable]], maxNrOfRetries: Int, withinTimeRange: Int) =
+      new AllForOneStrategy(trapExit.toList,maxNrOfRetries,withinTimeRange)
+  }
+
+  case class AllForOneStrategy(trapExit: List[Class[_ <: Throwable]],
+                               maxNrOfRetries: Option[Int] = None,
+                               withinTimeRange: Option[Int] = None) extends FaultHandlingStrategy {
+    def this(trapExit: List[Class[_ <: Throwable]],maxNrOfRetries: Int, withinTimeRange: Int) =
+      this(trapExit, if (maxNrOfRetries < 0) None else Some(maxNrOfRetries), if (withinTimeRange < 0) None else Some(withinTimeRange))
+    def this(trapExit: Array[Class[Throwable]],maxNrOfRetries: Int, withinTimeRange: Int) =
+      this(trapExit.toList,maxNrOfRetries,withinTimeRange)
+  }
+
+  object OneForOneStrategy {
+    def apply(trapExit: List[Class[_ <: Throwable]], maxNrOfRetries: Int, withinTimeRange: Int) =
+      new OneForOneStrategy(trapExit, if (maxNrOfRetries < 0) None else Some(maxNrOfRetries), if (withinTimeRange < 0) None else Some(withinTimeRange))
+    def apply(trapExit: Array[Class[Throwable]], maxNrOfRetries: Int, withinTimeRange: Int) =
+      new OneForOneStrategy(trapExit.toList,maxNrOfRetries,withinTimeRange)
+  }
+
+  case class OneForOneStrategy(trapExit: List[Class[_ <: Throwable]],
+                               maxNrOfRetries: Option[Int] = None,
+                               withinTimeRange: Option[Int] = None) extends FaultHandlingStrategy {
+    def this(trapExit: List[Class[_ <: Throwable]],maxNrOfRetries: Int, withinTimeRange: Int) =
+      this(trapExit, if (maxNrOfRetries < 0) None else Some(maxNrOfRetries), if (withinTimeRange < 0) None else Some(withinTimeRange))
+    def this(trapExit: Array[Class[Throwable]],maxNrOfRetries: Int, withinTimeRange: Int) =
+      this(trapExit.toList,maxNrOfRetries,withinTimeRange)
+  }
+
+  case object NoFaultHandlingStrategy extends FaultHandlingStrategy {
+    def trapExit: List[Class[_ <: Throwable]] = Nil
+  }
 }
\ No newline at end of file
diff --git a/akka-actor/src/test/scala/actor/actor/ActorFireForgetRequestReplySpec.scala b/akka-actor/src/test/scala/actor/actor/ActorFireForgetRequestReplySpec.scala
index f04d8016d2..0bff02a1a9 100644
--- a/akka-actor/src/test/scala/actor/actor/ActorFireForgetRequestReplySpec.scala
+++ b/akka-actor/src/test/scala/actor/actor/ActorFireForgetRequestReplySpec.scala
@@ -1,7 +1,7 @@
 package se.scalablesolutions.akka.actor
 
 import java.util.concurrent.{TimeUnit, CyclicBarrier, TimeoutException}
-import se.scalablesolutions.akka.config._
+import se.scalablesolutions.akka.config.Supervision._
 import org.scalatest.junit.JUnitSuite
 import org.junit.Test
 
diff --git a/akka-actor/src/test/scala/actor/supervisor/RestartStrategySpec.scala b/akka-actor/src/test/scala/actor/supervisor/RestartStrategySpec.scala
index 6b105061a7..ba88ccd842 100644
--- a/akka-actor/src/test/scala/actor/supervisor/RestartStrategySpec.scala
+++ b/akka-actor/src/test/scala/actor/supervisor/RestartStrategySpec.scala
@@ -10,9 +10,8 @@ import org.scalatest.junit.JUnitSuite
 import org.junit.Test
 
 import Actor._
-import se.scalablesolutions.akka.config.OneForOneStrategy
 import java.util.concurrent.{TimeUnit, CountDownLatch}
-import se.scalablesolutions.akka.config.{Permanent, LifeCycle}
+import se.scalablesolutions.akka.config.Supervision.{Permanent, LifeCycle, OneForOneStrategy}
 import org.multiverse.api.latches.StandardLatch
 
 class RestartStrategySpec extends JUnitSuite {
diff --git a/akka-actor/src/test/scala/actor/supervisor/SupervisorHierarchySpec.scala b/akka-actor/src/test/scala/actor/supervisor/SupervisorHierarchySpec.scala
index b1f8af27c0..4091215571 100644
--- a/akka-actor/src/test/scala/actor/supervisor/SupervisorHierarchySpec.scala
+++ b/akka-actor/src/test/scala/actor/supervisor/SupervisorHierarchySpec.scala
@@ -8,7 +8,7 @@ import org.scalatest.junit.JUnitSuite
 import org.junit.Test
 
 import Actor._
-import se.scalablesolutions.akka.config.OneForOneStrategy
+import se.scalablesolutions.akka.config.Supervision.OneForOneStrategy
 
 import java.util.concurrent.{TimeUnit, CountDownLatch}
 
diff --git a/akka-actor/src/test/scala/actor/supervisor/SupervisorMiscSpec.scala b/akka-actor/src/test/scala/actor/supervisor/SupervisorMiscSpec.scala
index 933d9643f7..261df68eab 100644
--- a/akka-actor/src/test/scala/actor/supervisor/SupervisorMiscSpec.scala
+++ b/akka-actor/src/test/scala/actor/supervisor/SupervisorMiscSpec.scala
@@ -6,9 +6,8 @@ package se.scalablesolutions.akka.actor
 import org.scalatest.WordSpec
 import org.scalatest.matchers.MustMatchers
 import se.scalablesolutions.akka.dispatch.Dispatchers
-import se.scalablesolutions.akka.config.Supervision.{RestartStrategy, SupervisorConfig, OneForOne, Supervise}
+import se.scalablesolutions.akka.config.Supervision.{RestartStrategy, SupervisorConfig, OneForOne, Supervise, Permanent}
 import java.util.concurrent.CountDownLatch
-import se.scalablesolutions.akka.config.Permanent
 
 class SupervisorMiscSpec extends WordSpec with MustMatchers {
   "A Supervisor" should {
diff --git a/akka-actor/src/test/scala/actor/supervisor/SupervisorSpec.scala b/akka-actor/src/test/scala/actor/supervisor/SupervisorSpec.scala
index ee32ca7f3a..3a1758d7c6 100644
--- a/akka-actor/src/test/scala/actor/supervisor/SupervisorSpec.scala
+++ b/akka-actor/src/test/scala/actor/supervisor/SupervisorSpec.scala
@@ -11,7 +11,6 @@ import Actor._
 import org.scalatest.junit.JUnitSuite
 import org.junit.Test
 import java.util.concurrent.{TimeUnit, LinkedBlockingQueue}
-import se.scalablesolutions.akka.config.{Temporary, Permanent, OneForOneStrategy}
 
 object SupervisorSpec {
   var messageLog = new LinkedBlockingQueue[String]
@@ -78,7 +77,7 @@ object SupervisorSpec {
 
   class TemporaryActor extends Actor {
     import self._
-    lifeCycle = se.scalablesolutions.akka.config.Temporary
+    lifeCycle = Temporary
     def receive = {
       case Ping =>
         messageLog.put("ping")
diff --git a/akka-actor/src/test/scala/misc/SchedulerSpec.scala b/akka-actor/src/test/scala/misc/SchedulerSpec.scala
index 9f0e127e56..c1f1071161 100644
--- a/akka-actor/src/test/scala/misc/SchedulerSpec.scala
+++ b/akka-actor/src/test/scala/misc/SchedulerSpec.scala
@@ -6,7 +6,6 @@ import java.util.concurrent.{CountDownLatch, TimeUnit}
 import se.scalablesolutions.akka.config.Supervision._
 import org.multiverse.api.latches.StandardLatch
 import org.junit.Test
-import se.scalablesolutions.akka.config.Permanent
 
 class SchedulerSpec extends JUnitSuite {
 
@@ -99,7 +98,7 @@ class SchedulerSpec extends JUnitSuite {
     val pingLatch = new CountDownLatch(6)
 
     val actor = actorOf(new Actor {
-      self.lifeCycle = se.scalablesolutions.akka.config.Permanent
+      self.lifeCycle = Permanent
 
       def receive = {
         case Ping => pingLatch.countDown
diff --git a/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/AMQP.scala b/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/AMQP.scala
index 9553aebf20..662f2b6a24 100644
--- a/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/AMQP.scala
+++ b/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/AMQP.scala
@@ -6,7 +6,7 @@ package se.scalablesolutions.akka.amqp
 
 import se.scalablesolutions.akka.actor.{Actor, ActorRef}
 import se.scalablesolutions.akka.actor.Actor._
-import se.scalablesolutions.akka.config.OneForOneStrategy
+import se.scalablesolutions.akka.config.Supervision.OneForOneStrategy
 import com.rabbitmq.client.{ReturnListener, ShutdownListener, ConnectionFactory}
 import ConnectionFactory._
 import com.rabbitmq.client.AMQP.BasicProperties
diff --git a/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/FaultTolerantConnectionActor.scala b/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/FaultTolerantConnectionActor.scala
index acb61f02e3..066075f26c 100644
--- a/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/FaultTolerantConnectionActor.scala
+++ b/akka-amqp/src/main/scala/se/scalablesolutions/akka/amqp/FaultTolerantConnectionActor.scala
@@ -8,7 +8,7 @@ import java.util.{TimerTask, Timer}
 import java.io.IOException
 import com.rabbitmq.client._
 import se.scalablesolutions.akka.amqp.AMQP.ConnectionParameters
-import se.scalablesolutions.akka.config.{ Permanent, OneForOneStrategy }
+import se.scalablesolutions.akka.config.Supervision.{ Permanent, OneForOneStrategy }
 import se.scalablesolutions.akka.actor.{Exit, Actor}
 
 private[amqp] class FaultTolerantConnectionActor(connectionParameters: ConnectionParameters) extends Actor {
diff --git a/akka-persistence/akka-persistence-common/src/test/scala/Ticket343Test.scala b/akka-persistence/akka-persistence-common/src/test/scala/Ticket343Test.scala
index db7d96876a..1884621aaa 100644
--- a/akka-persistence/akka-persistence-common/src/test/scala/Ticket343Test.scala
+++ b/akka-persistence/akka-persistence-common/src/test/scala/Ticket343Test.scala
@@ -11,7 +11,7 @@ import org.scalatest.junit.JUnitRunner
 import org.junit.runner.RunWith
 
 import se.scalablesolutions.akka.actor.{Actor, ActorRef}
-import se.scalablesolutions.akka.config.{OneForOneStrategy, Permanent}
+import se.scalablesolutions.akka.config.Supervision.{OneForOneStrategy, Permanent}
 import Actor._
 import se.scalablesolutions.akka.stm.global._
 import se.scalablesolutions.akka.util.Logging
diff --git a/akka-persistence/akka-persistence-hbase/src/test/scala/HbaseTicket343SpecTestIntegration.scala b/akka-persistence/akka-persistence-hbase/src/test/scala/HbaseTicket343SpecTestIntegration.scala
index 9c1c91d01e..be5429e134 100644
--- a/akka-persistence/akka-persistence-hbase/src/test/scala/HbaseTicket343SpecTestIntegration.scala
+++ b/akka-persistence/akka-persistence-hbase/src/test/scala/HbaseTicket343SpecTestIntegration.scala
@@ -7,7 +7,7 @@ import org.scalatest.junit.JUnitRunner
 import org.junit.runner.RunWith
 
 import se.scalablesolutions.akka.actor.{Actor, ActorRef}
-import se.scalablesolutions.akka.config.{OneForOneStrategy,Permanent}
+import se.scalablesolutions.akka.config.Supervision.{OneForOneStrategy,Permanent}
 import Actor._
 import se.scalablesolutions.akka.stm.global._
 import se.scalablesolutions.akka.util.Logging
diff --git a/akka-persistence/akka-persistence-mongo/src/test/scala/MongoTicket343Spec.scala b/akka-persistence/akka-persistence-mongo/src/test/scala/MongoTicket343Spec.scala
index c34f237566..cd90620cef 100644
--- a/akka-persistence/akka-persistence-mongo/src/test/scala/MongoTicket343Spec.scala
+++ b/akka-persistence/akka-persistence-mongo/src/test/scala/MongoTicket343Spec.scala
@@ -7,7 +7,7 @@ import org.scalatest.junit.JUnitRunner
 import org.junit.runner.RunWith
 
 import se.scalablesolutions.akka.actor.{Actor, ActorRef}
-import se.scalablesolutions.akka.config.{OneForOneStrategy,Permanent}
+import se.scalablesolutions.akka.config.Supervision.{OneForOneStrategy,Permanent}
 import Actor._
 import se.scalablesolutions.akka.stm.global._
 import se.scalablesolutions.akka.util.Logging
diff --git a/akka-persistence/akka-persistence-redis/src/test/scala/RedisInconsistentSizeBugTest.scala b/akka-persistence/akka-persistence-redis/src/test/scala/RedisInconsistentSizeBugTest.scala
index a51d4150b1..78c21f2082 100644
--- a/akka-persistence/akka-persistence-redis/src/test/scala/RedisInconsistentSizeBugTest.scala
+++ b/akka-persistence/akka-persistence-redis/src/test/scala/RedisInconsistentSizeBugTest.scala
@@ -5,7 +5,7 @@ import sbinary.Operations._
 import sbinary.DefaultProtocol._
 
 import se.scalablesolutions.akka.actor.{Actor, ActorRef}
-import se.scalablesolutions.akka.config.{OneForOneStrategy, Permanent}
+import se.scalablesolutions.akka.config.Supervision.{OneForOneStrategy, Permanent}
 import Actor._
 import se.scalablesolutions.akka.persistence.common.PersistentVector
 import se.scalablesolutions.akka.stm.global._
diff --git a/akka-persistence/akka-persistence-redis/src/test/scala/RedisTicket343Spec.scala b/akka-persistence/akka-persistence-redis/src/test/scala/RedisTicket343Spec.scala
index 46f233ecf9..f1167ef84d 100644
--- a/akka-persistence/akka-persistence-redis/src/test/scala/RedisTicket343Spec.scala
+++ b/akka-persistence/akka-persistence-redis/src/test/scala/RedisTicket343Spec.scala
@@ -7,7 +7,7 @@ import org.scalatest.junit.JUnitRunner
 import org.junit.runner.RunWith
 
 import se.scalablesolutions.akka.actor.{Actor}
-import se.scalablesolutions.akka.config.{OneForOneStrategy,Permanent}
+import se.scalablesolutions.akka.config.Supervision.{OneForOneStrategy,Permanent}
 import Actor._
 import se.scalablesolutions.akka.persistence.common.PersistentVector
 import se.scalablesolutions.akka.stm.global._
diff --git a/akka-remote/src/main/scala/remote/Cluster.scala b/akka-remote/src/main/scala/remote/Cluster.scala
index 71354e8e77..df1a79009e 100644
--- a/akka-remote/src/main/scala/remote/Cluster.scala
+++ b/akka-remote/src/main/scala/remote/Cluster.scala
@@ -10,7 +10,8 @@ import se.scalablesolutions.akka.serialization.Serializer
 import se.scalablesolutions.akka.actor.{Supervisor, SupervisorFactory, Actor, ActorRef, ActorRegistry}
 import se.scalablesolutions.akka.util.Logging
 import scala.collection.immutable.{Map, HashMap}
-import se.scalablesolutions.akka.config. {Permanent, RemoteAddress}
+import se.scalablesolutions.akka.config.Supervision.{Permanent}
+import se.scalablesolutions.akka.config.{RemoteAddress}
 
 /**
  * Interface for interacting with the Cluster Membership API.
diff --git a/akka-remote/src/main/scala/serialization/SerializationProtocol.scala b/akka-remote/src/main/scala/serialization/SerializationProtocol.scala
index 2343608607..8c2c7f6d61 100644
--- a/akka-remote/src/main/scala/serialization/SerializationProtocol.scala
+++ b/akka-remote/src/main/scala/serialization/SerializationProtocol.scala
@@ -11,7 +11,7 @@ import se.scalablesolutions.akka.dispatch.MessageInvocation
 import se.scalablesolutions.akka.remote.{RemoteServer, MessageSerializer}
 import se.scalablesolutions.akka.remote.protocol.RemoteProtocol.{ActorType => ActorTypeProtocol, _}
 import ActorTypeProtocol._
-import se.scalablesolutions.akka.config.{AllForOneStrategy, OneForOneStrategy, FaultHandlingStrategy, Permanent, Temporary, UndefinedLifeCycle}
+import se.scalablesolutions.akka.config.Supervision._
 import se.scalablesolutions.akka.actor.{uuidFrom,newUuid}
 import se.scalablesolutions.akka.actor._
 
diff --git a/akka-remote/src/test/scala/remote/RemoteSupervisorSpec.scala b/akka-remote/src/test/scala/remote/RemoteSupervisorSpec.scala
index e815231509..735aba23cb 100644
--- a/akka-remote/src/test/scala/remote/RemoteSupervisorSpec.scala
+++ b/akka-remote/src/test/scala/remote/RemoteSupervisorSpec.scala
@@ -13,7 +13,6 @@ import org.scalatest.junit.JUnitSuite
 import org.junit.{Test, Before, After}
 import se.scalablesolutions.akka.actor.{SupervisorFactory, Supervisor, ActorRef, Actor}
 import Actor._
-import se.scalablesolutions.akka.config.Permanent
 
 object Log {
   val messageLog: BlockingQueue[String] = new LinkedBlockingQueue[String]
diff --git a/akka-remote/src/test/scala/remote/RemoteTypedActorSpec.scala b/akka-remote/src/test/scala/remote/RemoteTypedActorSpec.scala
index 9b5f407a27..58c977654d 100644
--- a/akka-remote/src/test/scala/remote/RemoteTypedActorSpec.scala
+++ b/akka-remote/src/test/scala/remote/RemoteTypedActorSpec.scala
@@ -14,7 +14,7 @@ import se.scalablesolutions.akka.remote.{RemoteServer, RemoteClient}
 
 import java.util.concurrent.{LinkedBlockingQueue, TimeUnit, BlockingQueue}
 import org.scalatest.{BeforeAndAfterEach, Spec, Assertions, BeforeAndAfterAll}
-import se.scalablesolutions.akka.config. {Permanent, Config, TypedActorConfigurator, RemoteAddress}
+import se.scalablesolutions.akka.config.{Config, TypedActorConfigurator, RemoteAddress}
 
 object RemoteTypedActorSpec {
   val HOSTNAME = "localhost"
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 d2d09fc22e..aa70cabeb9 100644
--- a/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala
+++ b/akka-samples/akka-sample-chat/src/main/scala/ChatServer.scala
@@ -11,7 +11,7 @@ import se.scalablesolutions.akka.remote.{RemoteNode, RemoteClient}
 import se.scalablesolutions.akka.persistence.common.PersistentVector
 import se.scalablesolutions.akka.persistence.redis.RedisStorage
 import se.scalablesolutions.akka.stm.global._
-import se.scalablesolutions.akka.config.{OneForOneStrategy,Permanent}
+import se.scalablesolutions.akka.config.Supervision.{OneForOneStrategy,Permanent}
 import se.scalablesolutions.akka.util.Logging
 import Actor._
 
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 31547e85a7..56f977ab89 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
@@ -21,7 +21,6 @@ import org.atmosphere.annotation.{Broadcast, Suspend,Cluster}
 import org.atmosphere.util.XSSHtmlFilter
 import org.atmosphere.cpr.{Broadcaster, BroadcastFilter}
 import org.atmosphere.jersey.Broadcastable
-import se.scalablesolutions.akka.config.Permanent
 
 class Boot {
   val factory = SupervisorFactory(
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 5af3a7ff69..a382b0a40e 100644
--- a/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala
+++ b/akka-samples/akka-sample-security/src/main/scala/SimpleService.scala
@@ -11,7 +11,6 @@ import se.scalablesolutions.akka.util.Logging
 import se.scalablesolutions.akka.security.{BasicAuthenticationActor,BasicCredentials,SpnegoAuthenticationActor,DigestAuthenticationActor, UserInfo}
 import se.scalablesolutions.akka.stm.TransactionalMap
 import se.scalablesolutions.akka.actor.ActorRegistry.actorFor
-import se.scalablesolutions.akka.config.Permanent
 
 class Boot {
   val factory = SupervisorFactory(
diff --git a/akka-spring/src/main/scala/SupervisionFactoryBean.scala b/akka-spring/src/main/scala/SupervisionFactoryBean.scala
index b11117ee35..86709f06f0 100644
--- a/akka-spring/src/main/scala/SupervisionFactoryBean.scala
+++ b/akka-spring/src/main/scala/SupervisionFactoryBean.scala
@@ -8,7 +8,7 @@ import se.scalablesolutions.akka.config.Supervision._
 import se.scalablesolutions.akka.actor.{Supervisor, SupervisorFactory, Actor}
 import AkkaSpringConfigurationTags._
 import reflect.BeanProperty
-import se.scalablesolutions.akka.config.{Temporary, Permanent, TypedActorConfigurator, RemoteAddress}
+import se.scalablesolutions.akka.config.{TypedActorConfigurator, RemoteAddress}
 
 /**
  * Factory bean for supervisor configuration.
diff --git a/akka-typed-actor/src/main/scala/actor/TypedActor.scala b/akka-typed-actor/src/main/scala/actor/TypedActor.scala
index 12c3c4d9de..a092f34070 100644
--- a/akka-typed-actor/src/main/scala/actor/TypedActor.scala
+++ b/akka-typed-actor/src/main/scala/actor/TypedActor.scala
@@ -5,7 +5,6 @@
 package se.scalablesolutions.akka.actor
 
 import Actor._
-import se.scalablesolutions.akka.config.FaultHandlingStrategy
 import se.scalablesolutions.akka.dispatch.{MessageDispatcher, Future, CompletableFuture, Dispatchers}
 import se.scalablesolutions.akka.config.Supervision._
 import se.scalablesolutions.akka.util._
diff --git a/akka-typed-actor/src/test/scala/actor/typed-actor/RestartTransactionalTypedActorSpec.scala b/akka-typed-actor/src/test/scala/actor/typed-actor/RestartTransactionalTypedActorSpec.scala
index 87dd31fe0f..3dc1702593 100644
--- a/akka-typed-actor/src/test/scala/actor/typed-actor/RestartTransactionalTypedActorSpec.scala
+++ b/akka-typed-actor/src/test/scala/actor/typed-actor/RestartTransactionalTypedActorSpec.scala
@@ -13,7 +13,7 @@ import org.junit.runner.RunWith
 
 import se.scalablesolutions.akka.config.Supervision._
 import se.scalablesolutions.akka.actor._
-import se.scalablesolutions.akka.config. {Temporary, Config, TypedActorConfigurator}
+import se.scalablesolutions.akka.config.{Config, TypedActorConfigurator}
 
 @RunWith(classOf[JUnitRunner])
 class RestartTransactionalTypedActorSpec extends
diff --git a/akka-typed-actor/src/test/scala/actor/typed-actor/TypedActorGuiceConfiguratorSpec.scala b/akka-typed-actor/src/test/scala/actor/typed-actor/TypedActorGuiceConfiguratorSpec.scala
index 88eb5f28ef..f524f96777 100644
--- a/akka-typed-actor/src/test/scala/actor/typed-actor/TypedActorGuiceConfiguratorSpec.scala
+++ b/akka-typed-actor/src/test/scala/actor/typed-actor/TypedActorGuiceConfiguratorSpec.scala
@@ -17,7 +17,7 @@ import org.junit.runner.RunWith
 import se.scalablesolutions.akka.config.Supervision._
 import se.scalablesolutions.akka.dispatch._
 import se.scalablesolutions.akka.dispatch.FutureTimeoutException
-import se.scalablesolutions.akka.config. {Permanent, Config, TypedActorConfigurator}
+import se.scalablesolutions.akka.config.{Config, TypedActorConfigurator}
 
 @RunWith(classOf[JUnitRunner])
 class TypedActorGuiceConfiguratorSpec extends
diff --git a/akka-typed-actor/src/test/scala/actor/typed-actor/TypedActorLifecycleSpec.scala b/akka-typed-actor/src/test/scala/actor/typed-actor/TypedActorLifecycleSpec.scala
index f737fb25eb..715ddb8ef8 100644
--- a/akka-typed-actor/src/test/scala/actor/typed-actor/TypedActorLifecycleSpec.scala
+++ b/akka-typed-actor/src/test/scala/actor/typed-actor/TypedActorLifecycleSpec.scala
@@ -10,7 +10,7 @@ import se.scalablesolutions.akka.actor.TypedActor._
 import se.scalablesolutions.akka.config.Supervision._
 
 import java.util.concurrent.CountDownLatch
-import se.scalablesolutions.akka.config. {OneForOneStrategy, TypedActorConfigurator}
+import se.scalablesolutions.akka.config.TypedActorConfigurator
 
 /**
  * @author Martin Krasser