diff --git a/akka-remote/src/main/scala/remote/RemoteClient.scala b/akka-remote/src/main/scala/remote/RemoteClient.scala
index 35578477ff..f61a5d63a1 100644
--- a/akka-remote/src/main/scala/remote/RemoteClient.scala
+++ b/akka-remote/src/main/scala/remote/RemoteClient.scala
@@ -4,14 +4,14 @@
 
 package se.scalablesolutions.akka.remote
 
-import se.scalablesolutions.akka.remote.protocol.RemoteProtocol._
-import se.scalablesolutions.akka.actor.{Exit, Actor, ActorRef, ActorType, RemoteActorRef, RemoteActorSerialization, IllegalActorStateException}
+import se.scalablesolutions.akka.remote.protocol.RemoteProtocol.{ActorType => ActorTypeProtocol, _}
+import se.scalablesolutions.akka.actor.{Exit, Actor, ActorRef, ActorType, RemoteActorRef, IllegalActorStateException}
 import se.scalablesolutions.akka.dispatch.{DefaultCompletableFuture, CompletableFuture}
 import se.scalablesolutions.akka.util.{ListenerManagement, UUID, Logging, Duration}
 import se.scalablesolutions.akka.config.Config._
+import se.scalablesolutions.akka.serialization.RemoteActorSerialization._
 import se.scalablesolutions.akka.AkkaException
 import Actor._
-import RemoteActorSerialization._
 
 import org.jboss.netty.channel._
 import group.DefaultChannelGroup
diff --git a/akka-remote/src/main/scala/remote/RemoteServer.scala b/akka-remote/src/main/scala/remote/RemoteServer.scala
index 2ce24b3fff..bae6b6c88c 100644
--- a/akka-remote/src/main/scala/remote/RemoteServer.scala
+++ b/akka-remote/src/main/scala/remote/RemoteServer.scala
@@ -9,12 +9,15 @@ import java.net.InetSocketAddress
 import java.util.concurrent.{ConcurrentHashMap, Executors}
 import java.util.{Map => JMap}
 
-import se.scalablesolutions.akka.actor._
+import se.scalablesolutions.akka.actor.{
+  Actor, TypedActor, ActorRef, LocalActorRef, RemoteActorRef, IllegalActorStateException, RemoteActorSystemMessage}
 import se.scalablesolutions.akka.actor.Actor._
 import se.scalablesolutions.akka.util._
 import se.scalablesolutions.akka.remote.protocol.RemoteProtocol._
 import se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorType._
 import se.scalablesolutions.akka.config.Config._
+import se.scalablesolutions.akka.serialization.RemoteActorSerialization
+import se.scalablesolutions.akka.serialization.RemoteActorSerialization._
 
 import org.jboss.netty.bootstrap.ServerBootstrap
 import org.jboss.netty.channel._
diff --git a/akka-remote/src/main/scala/serialization/SerializationProtocol.scala b/akka-remote/src/main/scala/serialization/SerializationProtocol.scala
index 3f54f8e921..7e812bbae8 100644
--- a/akka-remote/src/main/scala/serialization/SerializationProtocol.scala
+++ b/akka-remote/src/main/scala/serialization/SerializationProtocol.scala
@@ -2,17 +2,17 @@
  * Copyright (C) 2009-2010 Scalable Solutions AB <http://scalablesolutions.se>
  */
 
-package se.scalablesolutions.akka.actor
+package se.scalablesolutions.akka.serialization
 
-import se.scalablesolutions.akka.config.{AllForOneStrategy, OneForOneStrategy, FaultHandlingStrategy}
-import se.scalablesolutions.akka.config.ScalaConfig._
+import se.scalablesolutions.akka.actor.{Actor, ActorRef, LocalActorRef, RemoteActorRef, IllegalActorStateException, ActorType}
 import se.scalablesolutions.akka.stm.global._
 import se.scalablesolutions.akka.stm.TransactionManagement._
 import se.scalablesolutions.akka.stm.TransactionManagement
-import se.scalablesolutions.akka.remote.protocol.RemoteProtocol._
 import se.scalablesolutions.akka.remote.{RemoteServer, RemoteRequestProtocolIdFactory, MessageSerializer}
-import se.scalablesolutions.akka.remote.protocol.RemoteProtocol.ActorType._
-import se.scalablesolutions.akka.serialization.Serializer
+import se.scalablesolutions.akka.remote.protocol.RemoteProtocol.{ActorType => ActorTypeProtocol, _}
+import ActorTypeProtocol._
+import se.scalablesolutions.akka.config.{AllForOneStrategy, OneForOneStrategy, FaultHandlingStrategy}
+import se.scalablesolutions.akka.config.ScalaConfig._
 
 import com.google.protobuf.ByteString
 
diff --git a/akka-remote/src/test/scala/serialization/SerializableTypeClassActorSpec.scala b/akka-remote/src/test/scala/serialization/SerializableTypeClassActorSpec.scala
index a9bcc35790..7e8babe168 100644
--- a/akka-remote/src/test/scala/serialization/SerializableTypeClassActorSpec.scala
+++ b/akka-remote/src/test/scala/serialization/SerializableTypeClassActorSpec.scala
@@ -7,6 +7,7 @@ import org.scalatest.BeforeAndAfterAll
 import org.scalatest.junit.JUnitRunner
 import org.junit.runner.RunWith
 
+import se.scalablesolutions.akka.serialization._
 import se.scalablesolutions.akka.actor._
 import ActorSerialization._
 import Actor._
@@ -17,7 +18,6 @@ class SerializableTypeClassActorSpec extends
   ShouldMatchers with
   BeforeAndAfterAll {
 
-  import se.scalablesolutions.akka.serialization.Serializer
 
   object BinaryFormatMyActor {
     implicit object MyActorFormat extends Format[MyActor] {
diff --git a/akka-remote/src/test/scala/serialization/UntypedActorSerializationSpec.scala b/akka-remote/src/test/scala/serialization/UntypedActorSerializationSpec.scala
index 6588c7cdc4..d230bbaffe 100644
--- a/akka-remote/src/test/scala/serialization/UntypedActorSerializationSpec.scala
+++ b/akka-remote/src/test/scala/serialization/UntypedActorSerializationSpec.scala
@@ -7,6 +7,7 @@ import org.scalatest.BeforeAndAfterAll
 import org.scalatest.junit.JUnitRunner
 import org.junit.runner.RunWith
 
+import se.scalablesolutions.akka.serialization._
 import se.scalablesolutions.akka.actor._
 import ActorSerialization._
 import Actor._
@@ -17,8 +18,6 @@ class UntypedActorSerializationSpec extends
   ShouldMatchers with
   BeforeAndAfterAll {
 
-  import se.scalablesolutions.akka.serialization.Serializer
-
   class MyUntypedActorFormat extends Format[MyUntypedActor] {
     def fromBinary(bytes: Array[Byte], act: MyUntypedActor) = {
       val p = Serializer.Protobuf.fromBinary(bytes, Some(classOf[ProtobufProtocol.Counter])).asInstanceOf[ProtobufProtocol.Counter]
diff --git a/config/akka-reference.conf b/config/akka-reference.conf
index 394cb8490e..45a9864f5b 100644
--- a/config/akka-reference.conf
+++ b/config/akka-reference.conf
@@ -53,20 +53,20 @@ akka {
   }
 
   stm {
-    fair = on             # Should global transactions be fair or non-fair (non fair yield better performance)
-    max-retries = 1000
-    timeout = 5           # Default timeout for blocking transactions and transaction set (in unit defined by
-                          #     the time-unit property)
-    write-skew = true
+    fair             = on     # Should global transactions be fair or non-fair (non fair yield better performance)
+    max-retries      = 1000
+    timeout          = 5      # Default timeout for blocking transactions and transaction set (in unit defined by
+                              #     the time-unit property)
+    write-skew       = true
     blocking-allowed = false
-    interruptible = false
-    speculative = true
-    quick-release = true
-    propagation = requires
-    trace-level = none
-    hooks = true
-    jta-aware = off       # Option 'on' means that if there JTA Transaction Manager available then the STM will
-                          #     begin (or join), commit or rollback the JTA transaction. Default is 'off'.
+    interruptible    = false
+    speculative      = true
+    quick-release    = true
+    propagation      = "requires"
+    trace-level      = "none"
+    hooks            = true
+    jta-aware        = off    # Option 'on' means that if there JTA Transaction Manager available then the STM will
+                              #     begin (or join), commit or rollback the JTA transaction. Default is 'off'.
   }
 
   jta {