diff --git a/akka-docs/general/code/akka/docs/config/ConfigDoc.java b/akka-docs/general/code/docs/config/ConfigDoc.java
similarity index 97%
rename from akka-docs/general/code/akka/docs/config/ConfigDoc.java
rename to akka-docs/general/code/docs/config/ConfigDoc.java
index 69d856947f..ee6393fb1a 100644
--- a/akka-docs/general/code/akka/docs/config/ConfigDoc.java
+++ b/akka-docs/general/code/docs/config/ConfigDoc.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.config;
+package docs.config;
 
 import akka.actor.ActorSystem;
 import com.typesafe.config.*;
diff --git a/akka-docs/general/code/akka/docs/config/ConfigDocSpec.scala b/akka-docs/general/code/docs/config/ConfigDocSpec.scala
similarity index 97%
rename from akka-docs/general/code/akka/docs/config/ConfigDocSpec.scala
rename to akka-docs/general/code/docs/config/ConfigDocSpec.scala
index 3b7cb10ed2..643116e14f 100644
--- a/akka-docs/general/code/akka/docs/config/ConfigDocSpec.scala
+++ b/akka-docs/general/code/docs/config/ConfigDocSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.config
+package docs.config
 
 import org.scalatest.WordSpec
 import org.scalatest.matchers.MustMatchers
diff --git a/akka-docs/java/code/akka/docs/actor/FSMDocTest.scala b/akka-docs/java/code/docs/actor/FSMDocTest.scala
similarity index 87%
rename from akka-docs/java/code/akka/docs/actor/FSMDocTest.scala
rename to akka-docs/java/code/docs/actor/FSMDocTest.scala
index 11bb542808..7077365d6d 100644
--- a/akka-docs/java/code/akka/docs/actor/FSMDocTest.scala
+++ b/akka-docs/java/code/docs/actor/FSMDocTest.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor
+package docs.actor
 
 import org.scalatest.junit.JUnitSuite
 
diff --git a/akka-docs/java/code/akka/docs/actor/FSMDocTestBase.java b/akka-docs/java/code/docs/actor/FSMDocTestBase.java
similarity index 99%
rename from akka-docs/java/code/akka/docs/actor/FSMDocTestBase.java
rename to akka-docs/java/code/docs/actor/FSMDocTestBase.java
index aeaca63f92..9064833cb0 100644
--- a/akka-docs/java/code/akka/docs/actor/FSMDocTestBase.java
+++ b/akka-docs/java/code/docs/actor/FSMDocTestBase.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor;
+package docs.actor;
 
 //#imports-data
 import java.util.ArrayList;
diff --git a/akka-docs/java/code/akka/docs/actor/FaultHandlingTest.scala b/akka-docs/java/code/docs/actor/FaultHandlingTest.scala
similarity index 88%
rename from akka-docs/java/code/akka/docs/actor/FaultHandlingTest.scala
rename to akka-docs/java/code/docs/actor/FaultHandlingTest.scala
index 03802d6968..9b6fad0609 100644
--- a/akka-docs/java/code/akka/docs/actor/FaultHandlingTest.scala
+++ b/akka-docs/java/code/docs/actor/FaultHandlingTest.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor
+package docs.actor
 import org.scalatest.junit.JUnitSuite
 
 class FaultHandlingTest extends FaultHandlingTestBase with JUnitSuite
diff --git a/akka-docs/java/code/akka/docs/actor/FaultHandlingTestBase.java b/akka-docs/java/code/docs/actor/FaultHandlingTestBase.java
similarity index 99%
rename from akka-docs/java/code/akka/docs/actor/FaultHandlingTestBase.java
rename to akka-docs/java/code/docs/actor/FaultHandlingTestBase.java
index dc2ce9bae7..bcc4705948 100644
--- a/akka-docs/java/code/akka/docs/actor/FaultHandlingTestBase.java
+++ b/akka-docs/java/code/docs/actor/FaultHandlingTestBase.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor;
+package docs.actor;
 
 //#testkit
 import akka.actor.ActorRef;
diff --git a/akka-docs/java/code/akka/docs/actor/FirstUntypedActor.java b/akka-docs/java/code/docs/actor/FirstUntypedActor.java
similarity index 95%
rename from akka-docs/java/code/akka/docs/actor/FirstUntypedActor.java
rename to akka-docs/java/code/docs/actor/FirstUntypedActor.java
index 6cfbe75b99..fa5d3d35a0 100644
--- a/akka-docs/java/code/akka/docs/actor/FirstUntypedActor.java
+++ b/akka-docs/java/code/docs/actor/FirstUntypedActor.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor;
+package docs.actor;
 
 import akka.actor.ActorRef;
 import akka.actor.Props;
diff --git a/akka-docs/java/code/akka/docs/actor/ImmutableMessage.java b/akka-docs/java/code/docs/actor/ImmutableMessage.java
similarity index 96%
rename from akka-docs/java/code/akka/docs/actor/ImmutableMessage.java
rename to akka-docs/java/code/docs/actor/ImmutableMessage.java
index 41bc4eb0e5..60e72ecfb5 100644
--- a/akka-docs/java/code/akka/docs/actor/ImmutableMessage.java
+++ b/akka-docs/java/code/docs/actor/ImmutableMessage.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor;
+package docs.actor;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/akka-docs/java/code/akka/docs/actor/MyReceivedTimeoutUntypedActor.java b/akka-docs/java/code/docs/actor/MyReceivedTimeoutUntypedActor.java
similarity index 96%
rename from akka-docs/java/code/akka/docs/actor/MyReceivedTimeoutUntypedActor.java
rename to akka-docs/java/code/docs/actor/MyReceivedTimeoutUntypedActor.java
index 97742d9bd1..025d634b09 100644
--- a/akka-docs/java/code/akka/docs/actor/MyReceivedTimeoutUntypedActor.java
+++ b/akka-docs/java/code/docs/actor/MyReceivedTimeoutUntypedActor.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor;
+package docs.actor;
 
 //#receive-timeout
 import akka.actor.ReceiveTimeout;
diff --git a/akka-docs/java/code/akka/docs/actor/MyUntypedActor.java b/akka-docs/java/code/docs/actor/MyUntypedActor.java
similarity index 95%
rename from akka-docs/java/code/akka/docs/actor/MyUntypedActor.java
rename to akka-docs/java/code/docs/actor/MyUntypedActor.java
index 93a817ef2c..f31fc402c7 100644
--- a/akka-docs/java/code/akka/docs/actor/MyUntypedActor.java
+++ b/akka-docs/java/code/docs/actor/MyUntypedActor.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor;
+package docs.actor;
 
 //#my-untyped-actor
 import akka.actor.UntypedActor;
diff --git a/akka-docs/java/code/akka/docs/actor/SchedulerDocTest.scala b/akka-docs/java/code/docs/actor/SchedulerDocTest.scala
similarity index 88%
rename from akka-docs/java/code/akka/docs/actor/SchedulerDocTest.scala
rename to akka-docs/java/code/docs/actor/SchedulerDocTest.scala
index ecad03213e..9e6b4c9613 100644
--- a/akka-docs/java/code/akka/docs/actor/SchedulerDocTest.scala
+++ b/akka-docs/java/code/docs/actor/SchedulerDocTest.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor
+package docs.actor
 
 import org.scalatest.junit.JUnitSuite
 
diff --git a/akka-docs/java/code/akka/docs/actor/SchedulerDocTestBase.java b/akka-docs/java/code/docs/actor/SchedulerDocTestBase.java
similarity index 98%
rename from akka-docs/java/code/akka/docs/actor/SchedulerDocTestBase.java
rename to akka-docs/java/code/docs/actor/SchedulerDocTestBase.java
index 7a58da0f5e..d7e8fa644f 100644
--- a/akka-docs/java/code/akka/docs/actor/SchedulerDocTestBase.java
+++ b/akka-docs/java/code/docs/actor/SchedulerDocTestBase.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor;
+package docs.actor;
 
 //#imports1
 import akka.actor.Props;
diff --git a/akka-docs/java/code/akka/docs/actor/TypedActorDocTest.scala b/akka-docs/java/code/docs/actor/TypedActorDocTest.scala
similarity index 88%
rename from akka-docs/java/code/akka/docs/actor/TypedActorDocTest.scala
rename to akka-docs/java/code/docs/actor/TypedActorDocTest.scala
index 476d570b4a..0d9796ca56 100644
--- a/akka-docs/java/code/akka/docs/actor/TypedActorDocTest.scala
+++ b/akka-docs/java/code/docs/actor/TypedActorDocTest.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor
+package docs.actor
 
 import org.scalatest.junit.JUnitSuite
 
diff --git a/akka-docs/java/code/akka/docs/actor/TypedActorDocTestBase.java b/akka-docs/java/code/docs/actor/TypedActorDocTestBase.java
similarity index 99%
rename from akka-docs/java/code/akka/docs/actor/TypedActorDocTestBase.java
rename to akka-docs/java/code/docs/actor/TypedActorDocTestBase.java
index 30db92ee0f..99dda513ab 100644
--- a/akka-docs/java/code/akka/docs/actor/TypedActorDocTestBase.java
+++ b/akka-docs/java/code/docs/actor/TypedActorDocTestBase.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor;
+package docs.actor;
 
 //#imports
 
diff --git a/akka-docs/java/code/akka/docs/actor/UntypedActorDocTest.scala b/akka-docs/java/code/docs/actor/UntypedActorDocTest.scala
similarity index 88%
rename from akka-docs/java/code/akka/docs/actor/UntypedActorDocTest.scala
rename to akka-docs/java/code/docs/actor/UntypedActorDocTest.scala
index e341914c8c..8047b94df9 100644
--- a/akka-docs/java/code/akka/docs/actor/UntypedActorDocTest.scala
+++ b/akka-docs/java/code/docs/actor/UntypedActorDocTest.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor
+package docs.actor
 
 import org.scalatest.junit.JUnitSuite
 
diff --git a/akka-docs/java/code/akka/docs/actor/UntypedActorDocTestBase.java b/akka-docs/java/code/docs/actor/UntypedActorDocTestBase.java
similarity index 99%
rename from akka-docs/java/code/akka/docs/actor/UntypedActorDocTestBase.java
rename to akka-docs/java/code/docs/actor/UntypedActorDocTestBase.java
index 146131f61e..c82ce30661 100644
--- a/akka-docs/java/code/akka/docs/actor/UntypedActorDocTestBase.java
+++ b/akka-docs/java/code/docs/actor/UntypedActorDocTestBase.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor;
+package docs.actor;
 
 //#imports
 import akka.actor.ActorRef;
diff --git a/akka-docs/java/code/akka/docs/actor/UntypedActorSwapper.java b/akka-docs/java/code/docs/actor/UntypedActorSwapper.java
similarity index 93%
rename from akka-docs/java/code/akka/docs/actor/UntypedActorSwapper.java
rename to akka-docs/java/code/docs/actor/UntypedActorSwapper.java
index b2fb98c305..985c75bfd7 100644
--- a/akka-docs/java/code/akka/docs/actor/UntypedActorSwapper.java
+++ b/akka-docs/java/code/docs/actor/UntypedActorSwapper.java
@@ -1,9 +1,9 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor;
+package docs.actor;
 
-import static akka.docs.actor.UntypedActorSwapper.Swap.SWAP;
+import static docs.actor.UntypedActorSwapper.Swap.SWAP;
 import akka.actor.ActorRef;
 import akka.actor.Props;
 import akka.actor.ActorSystem;
diff --git a/akka-docs/java/code/akka/docs/actor/japi/FaultHandlingDocSample.java b/akka-docs/java/code/docs/actor/japi/FaultHandlingDocSample.java
similarity index 97%
rename from akka-docs/java/code/akka/docs/actor/japi/FaultHandlingDocSample.java
rename to akka-docs/java/code/docs/actor/japi/FaultHandlingDocSample.java
index 4ba8358174..1213ab5949 100644
--- a/akka-docs/java/code/akka/docs/actor/japi/FaultHandlingDocSample.java
+++ b/akka-docs/java/code/docs/actor/japi/FaultHandlingDocSample.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor.japi;
+package docs.actor.japi;
 
 //#all
 //#imports
@@ -26,10 +26,10 @@ import static akka.actor.SupervisorStrategy.*;
 import static akka.pattern.Patterns.ask;
 import static akka.pattern.Patterns.pipe;
 
-import static akka.docs.actor.japi.FaultHandlingDocSample.WorkerApi.*;
-import static akka.docs.actor.japi.FaultHandlingDocSample.CounterServiceApi.*;
-import static akka.docs.actor.japi.FaultHandlingDocSample.CounterApi.*;
-import static akka.docs.actor.japi.FaultHandlingDocSample.StorageApi.*;
+import static docs.actor.japi.FaultHandlingDocSample.WorkerApi.*;
+import static docs.actor.japi.FaultHandlingDocSample.CounterServiceApi.*;
+import static docs.actor.japi.FaultHandlingDocSample.CounterApi.*;
+import static docs.actor.japi.FaultHandlingDocSample.StorageApi.*;
 
 //#imports
 
diff --git a/akka-docs/java/code/akka/docs/agent/AgentDocJavaSpec.scala b/akka-docs/java/code/docs/agent/AgentDocJavaSpec.scala
similarity index 78%
rename from akka-docs/java/code/akka/docs/agent/AgentDocJavaSpec.scala
rename to akka-docs/java/code/docs/agent/AgentDocJavaSpec.scala
index c3c0c296ed..566a439c62 100644
--- a/akka-docs/java/code/akka/docs/agent/AgentDocJavaSpec.scala
+++ b/akka-docs/java/code/docs/agent/AgentDocJavaSpec.scala
@@ -1,10 +1,10 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.agent
+package docs.agent
 
 import org.scalatest.junit.JUnitWrapperSuite
 
 class AgentDocJavaSpec extends JUnitWrapperSuite(
-  "akka.docs.agent.AgentDocTest",
+  "docs.agent.AgentDocTest",
   Thread.currentThread.getContextClassLoader)
\ No newline at end of file
diff --git a/akka-docs/java/code/akka/docs/agent/AgentDocTest.java b/akka-docs/java/code/docs/agent/AgentDocTest.java
similarity index 98%
rename from akka-docs/java/code/akka/docs/agent/AgentDocTest.java
rename to akka-docs/java/code/docs/agent/AgentDocTest.java
index 553d64eee5..0da96ebfc9 100644
--- a/akka-docs/java/code/akka/docs/agent/AgentDocTest.java
+++ b/akka-docs/java/code/docs/agent/AgentDocTest.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.agent;
+package docs.agent;
 
 import static org.junit.Assert.*;
 
diff --git a/akka-docs/java/code/akka/docs/dispatcher/DispatcherDocTest.scala b/akka-docs/java/code/docs/dispatcher/DispatcherDocTest.scala
similarity index 86%
rename from akka-docs/java/code/akka/docs/dispatcher/DispatcherDocTest.scala
rename to akka-docs/java/code/docs/dispatcher/DispatcherDocTest.scala
index 8216c36757..62c9e37051 100644
--- a/akka-docs/java/code/akka/docs/dispatcher/DispatcherDocTest.scala
+++ b/akka-docs/java/code/docs/dispatcher/DispatcherDocTest.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.dispatcher
+package docs.dispatcher
 
 import org.scalatest.junit.JUnitSuite
 
diff --git a/akka-docs/java/code/akka/docs/dispatcher/DispatcherDocTestBase.java b/akka-docs/java/code/docs/dispatcher/DispatcherDocTestBase.java
similarity index 96%
rename from akka-docs/java/code/akka/docs/dispatcher/DispatcherDocTestBase.java
rename to akka-docs/java/code/docs/dispatcher/DispatcherDocTestBase.java
index f080dd52b9..94e4b38121 100644
--- a/akka-docs/java/code/akka/docs/dispatcher/DispatcherDocTestBase.java
+++ b/akka-docs/java/code/docs/dispatcher/DispatcherDocTestBase.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.dispatcher;
+package docs.dispatcher;
 
 //#imports
 import akka.actor.*;
@@ -32,8 +32,8 @@ import static org.junit.Assert.*;
 
 import com.typesafe.config.ConfigFactory;
 
-import akka.docs.actor.MyUntypedActor;
-import akka.docs.actor.UntypedActorDocTestBase.MyActor;
+import docs.actor.MyUntypedActor;
+import docs.actor.UntypedActorDocTestBase.MyActor;
 import akka.testkit.AkkaSpec;
 
 public class DispatcherDocTestBase {
diff --git a/akka-docs/java/code/akka/docs/event/LoggingDocTest.scala b/akka-docs/java/code/docs/event/LoggingDocTest.scala
similarity index 88%
rename from akka-docs/java/code/akka/docs/event/LoggingDocTest.scala
rename to akka-docs/java/code/docs/event/LoggingDocTest.scala
index ee44f502a4..1d7f34827f 100644
--- a/akka-docs/java/code/akka/docs/event/LoggingDocTest.scala
+++ b/akka-docs/java/code/docs/event/LoggingDocTest.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.event
+package docs.event
 
 import org.scalatest.junit.JUnitSuite
 
diff --git a/akka-docs/java/code/akka/docs/event/LoggingDocTestBase.java b/akka-docs/java/code/docs/event/LoggingDocTestBase.java
similarity index 99%
rename from akka-docs/java/code/akka/docs/event/LoggingDocTestBase.java
rename to akka-docs/java/code/docs/event/LoggingDocTestBase.java
index 8f7b63d8a8..77e46b3f92 100644
--- a/akka-docs/java/code/akka/docs/event/LoggingDocTestBase.java
+++ b/akka-docs/java/code/docs/event/LoggingDocTestBase.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.event;
+package docs.event;
 
 //#imports
 import akka.event.Logging;
diff --git a/akka-docs/java/code/akka/docs/extension/ExtensionDocTest.scala b/akka-docs/java/code/docs/extension/ExtensionDocTest.scala
similarity index 86%
rename from akka-docs/java/code/akka/docs/extension/ExtensionDocTest.scala
rename to akka-docs/java/code/docs/extension/ExtensionDocTest.scala
index 7b1b43b6ca..f22e300cfc 100644
--- a/akka-docs/java/code/akka/docs/extension/ExtensionDocTest.scala
+++ b/akka-docs/java/code/docs/extension/ExtensionDocTest.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.extension
+package docs.extension
 
 import org.scalatest.junit.JUnitSuite
 
diff --git a/akka-docs/java/code/akka/docs/extension/ExtensionDocTestBase.java b/akka-docs/java/code/docs/extension/ExtensionDocTestBase.java
similarity index 98%
rename from akka-docs/java/code/akka/docs/extension/ExtensionDocTestBase.java
rename to akka-docs/java/code/docs/extension/ExtensionDocTestBase.java
index 11dfe4c198..7623d1cc0a 100644
--- a/akka-docs/java/code/akka/docs/extension/ExtensionDocTestBase.java
+++ b/akka-docs/java/code/docs/extension/ExtensionDocTestBase.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.extension;
+package docs.extension;
 
 //#imports
 import akka.actor.*;
diff --git a/akka-docs/java/code/akka/docs/extension/SettingsExtensionDocTest.scala b/akka-docs/java/code/docs/extension/SettingsExtensionDocTest.scala
similarity index 87%
rename from akka-docs/java/code/akka/docs/extension/SettingsExtensionDocTest.scala
rename to akka-docs/java/code/docs/extension/SettingsExtensionDocTest.scala
index 0979c00d4f..60289bfdca 100644
--- a/akka-docs/java/code/akka/docs/extension/SettingsExtensionDocTest.scala
+++ b/akka-docs/java/code/docs/extension/SettingsExtensionDocTest.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.extension
+package docs.extension
 
 import org.scalatest.junit.JUnitSuite
 
diff --git a/akka-docs/java/code/akka/docs/extension/SettingsExtensionDocTestBase.java b/akka-docs/java/code/docs/extension/SettingsExtensionDocTestBase.java
similarity index 98%
rename from akka-docs/java/code/akka/docs/extension/SettingsExtensionDocTestBase.java
rename to akka-docs/java/code/docs/extension/SettingsExtensionDocTestBase.java
index 9aef290ecb..265c91b206 100644
--- a/akka-docs/java/code/akka/docs/extension/SettingsExtensionDocTestBase.java
+++ b/akka-docs/java/code/docs/extension/SettingsExtensionDocTestBase.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.extension;
+package docs.extension;
 
 //#imports
 import akka.actor.Extension;
diff --git a/akka-docs/java/code/akka/docs/future/FutureDocTest.scala b/akka-docs/java/code/docs/future/FutureDocTest.scala
similarity index 87%
rename from akka-docs/java/code/akka/docs/future/FutureDocTest.scala
rename to akka-docs/java/code/docs/future/FutureDocTest.scala
index 8716beeced..fef5f3d967 100644
--- a/akka-docs/java/code/akka/docs/future/FutureDocTest.scala
+++ b/akka-docs/java/code/docs/future/FutureDocTest.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.future
+package docs.future
 
 import org.scalatest.junit.JUnitSuite
 
diff --git a/akka-docs/java/code/akka/docs/future/FutureDocTestBase.java b/akka-docs/java/code/docs/future/FutureDocTestBase.java
similarity index 99%
rename from akka-docs/java/code/akka/docs/future/FutureDocTestBase.java
rename to akka-docs/java/code/docs/future/FutureDocTestBase.java
index d8e59f5d30..2fe2220223 100644
--- a/akka-docs/java/code/akka/docs/future/FutureDocTestBase.java
+++ b/akka-docs/java/code/docs/future/FutureDocTestBase.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.future;
+package docs.future;
 
 //#imports1
 import akka.dispatch.*;
diff --git a/akka-docs/java/code/akka/docs/jrouting/CustomRouterDocTest.scala b/akka-docs/java/code/docs/jrouting/CustomRouterDocTest.scala
similarity index 80%
rename from akka-docs/java/code/akka/docs/jrouting/CustomRouterDocTest.scala
rename to akka-docs/java/code/docs/jrouting/CustomRouterDocTest.scala
index 48e323c634..d11b07f22a 100644
--- a/akka-docs/java/code/akka/docs/jrouting/CustomRouterDocTest.scala
+++ b/akka-docs/java/code/docs/jrouting/CustomRouterDocTest.scala
@@ -1,4 +1,4 @@
-package akka.docs.jrouting;
+package docs.jrouting;
 
 import org.scalatest.junit.JUnitSuite
 
diff --git a/akka-docs/java/code/akka/docs/jrouting/CustomRouterDocTestBase.java b/akka-docs/java/code/docs/jrouting/CustomRouterDocTestBase.java
similarity index 95%
rename from akka-docs/java/code/akka/docs/jrouting/CustomRouterDocTestBase.java
rename to akka-docs/java/code/docs/jrouting/CustomRouterDocTestBase.java
index dc4d140ec3..74e7759b62 100644
--- a/akka-docs/java/code/akka/docs/jrouting/CustomRouterDocTestBase.java
+++ b/akka-docs/java/code/docs/jrouting/CustomRouterDocTestBase.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.jrouting;
+package docs.jrouting;
 
 import java.util.List;
 import java.util.Arrays;
@@ -22,9 +22,9 @@ import akka.testkit.AkkaSpec;
 import com.typesafe.config.ConfigFactory;
 import static akka.pattern.Patterns.ask;
 
-import static akka.docs.jrouting.CustomRouterDocTestBase.DemocratActor;
-import static akka.docs.jrouting.CustomRouterDocTestBase.RepublicanActor;
-import static akka.docs.jrouting.CustomRouterDocTestBase.Message.*;
+import static docs.jrouting.CustomRouterDocTestBase.DemocratActor;
+import static docs.jrouting.CustomRouterDocTestBase.RepublicanActor;
+import static docs.jrouting.CustomRouterDocTestBase.Message.*;
 
 public class CustomRouterDocTestBase {
 
diff --git a/akka-docs/java/code/akka/docs/jrouting/FibonacciActor.java b/akka-docs/java/code/docs/jrouting/FibonacciActor.java
similarity index 97%
rename from akka-docs/java/code/akka/docs/jrouting/FibonacciActor.java
rename to akka-docs/java/code/docs/jrouting/FibonacciActor.java
index 8e426cf8fe..e316f27bce 100644
--- a/akka-docs/java/code/akka/docs/jrouting/FibonacciActor.java
+++ b/akka-docs/java/code/docs/jrouting/FibonacciActor.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.jrouting;
+package docs.jrouting;
 
 import java.io.Serializable;
 
diff --git a/akka-docs/java/code/akka/docs/jrouting/ParentActor.java b/akka-docs/java/code/docs/jrouting/ParentActor.java
similarity index 98%
rename from akka-docs/java/code/akka/docs/jrouting/ParentActor.java
rename to akka-docs/java/code/docs/jrouting/ParentActor.java
index 32a33b3a1b..ada9e92138 100644
--- a/akka-docs/java/code/akka/docs/jrouting/ParentActor.java
+++ b/akka-docs/java/code/docs/jrouting/ParentActor.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.jrouting;
+package docs.jrouting;
 
 import akka.routing.ScatterGatherFirstCompletedRouter;
 import akka.routing.BroadcastRouter;
diff --git a/akka-docs/java/code/akka/docs/jrouting/PrintlnActor.java b/akka-docs/java/code/docs/jrouting/PrintlnActor.java
similarity index 92%
rename from akka-docs/java/code/akka/docs/jrouting/PrintlnActor.java
rename to akka-docs/java/code/docs/jrouting/PrintlnActor.java
index d6ad652ebe..adf56fe863 100644
--- a/akka-docs/java/code/akka/docs/jrouting/PrintlnActor.java
+++ b/akka-docs/java/code/docs/jrouting/PrintlnActor.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.jrouting;
+package docs.jrouting;
 
 import akka.actor.UntypedActor;
 
diff --git a/akka-docs/java/code/akka/docs/jrouting/RouterViaConfigExample.java b/akka-docs/java/code/docs/jrouting/RouterViaConfigExample.java
similarity index 98%
rename from akka-docs/java/code/akka/docs/jrouting/RouterViaConfigExample.java
rename to akka-docs/java/code/docs/jrouting/RouterViaConfigExample.java
index 61b9a573d7..1505766196 100644
--- a/akka-docs/java/code/akka/docs/jrouting/RouterViaConfigExample.java
+++ b/akka-docs/java/code/docs/jrouting/RouterViaConfigExample.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.jrouting;
+package docs.jrouting;
 
 import akka.routing.FromConfig;
 import akka.actor.ActorRef;
diff --git a/akka-docs/java/code/akka/docs/jrouting/RouterViaProgramExample.java b/akka-docs/java/code/docs/jrouting/RouterViaProgramExample.java
similarity index 99%
rename from akka-docs/java/code/akka/docs/jrouting/RouterViaProgramExample.java
rename to akka-docs/java/code/docs/jrouting/RouterViaProgramExample.java
index 44984c3ec7..ce46307eb7 100644
--- a/akka-docs/java/code/akka/docs/jrouting/RouterViaProgramExample.java
+++ b/akka-docs/java/code/docs/jrouting/RouterViaProgramExample.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.jrouting;
+package docs.jrouting;
 
 import akka.routing.RoundRobinRouter;
 import akka.routing.DefaultResizer;
diff --git a/akka-docs/java/code/akka/docs/remoting/RemoteActorExample.java b/akka-docs/java/code/docs/remoting/RemoteActorExample.java
similarity index 95%
rename from akka-docs/java/code/akka/docs/remoting/RemoteActorExample.java
rename to akka-docs/java/code/docs/remoting/RemoteActorExample.java
index f7686e744a..3ca25bd153 100644
--- a/akka-docs/java/code/akka/docs/remoting/RemoteActorExample.java
+++ b/akka-docs/java/code/docs/remoting/RemoteActorExample.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.remoting;
+package docs.remoting;
 
 import akka.actor.ActorRef;
 import akka.actor.UntypedActor;
diff --git a/akka-docs/java/code/akka/docs/remoting/RemoteDeploymentDocTest.scala b/akka-docs/java/code/docs/remoting/RemoteDeploymentDocTest.scala
similarity index 87%
rename from akka-docs/java/code/akka/docs/remoting/RemoteDeploymentDocTest.scala
rename to akka-docs/java/code/docs/remoting/RemoteDeploymentDocTest.scala
index 9290b7c897..4ac46c4504 100644
--- a/akka-docs/java/code/akka/docs/remoting/RemoteDeploymentDocTest.scala
+++ b/akka-docs/java/code/docs/remoting/RemoteDeploymentDocTest.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.remoting
+package docs.remoting
 
 import org.scalatest.junit.JUnitSuite
 
diff --git a/akka-docs/java/code/akka/docs/remoting/RemoteDeploymentDocTestBase.java b/akka-docs/java/code/docs/remoting/RemoteDeploymentDocTestBase.java
similarity index 97%
rename from akka-docs/java/code/akka/docs/remoting/RemoteDeploymentDocTestBase.java
rename to akka-docs/java/code/docs/remoting/RemoteDeploymentDocTestBase.java
index b105e2b42a..cfb12ac7c4 100644
--- a/akka-docs/java/code/akka/docs/remoting/RemoteDeploymentDocTestBase.java
+++ b/akka-docs/java/code/docs/remoting/RemoteDeploymentDocTestBase.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.remoting;
+package docs.remoting;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
diff --git a/akka-docs/java/code/akka/docs/serialization/SerializationDocTest.scala b/akka-docs/java/code/docs/serialization/SerializationDocTest.scala
similarity index 85%
rename from akka-docs/java/code/akka/docs/serialization/SerializationDocTest.scala
rename to akka-docs/java/code/docs/serialization/SerializationDocTest.scala
index 26685dea80..ffac606928 100644
--- a/akka-docs/java/code/akka/docs/serialization/SerializationDocTest.scala
+++ b/akka-docs/java/code/docs/serialization/SerializationDocTest.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.serialization
+package docs.serialization
 
 import org.scalatest.junit.JUnitSuite
 
diff --git a/akka-docs/java/code/akka/docs/serialization/SerializationDocTestBase.java b/akka-docs/java/code/docs/serialization/SerializationDocTestBase.java
similarity index 99%
rename from akka-docs/java/code/akka/docs/serialization/SerializationDocTestBase.java
rename to akka-docs/java/code/docs/serialization/SerializationDocTestBase.java
index aa24c92249..a62827fc98 100644
--- a/akka-docs/java/code/akka/docs/serialization/SerializationDocTestBase.java
+++ b/akka-docs/java/code/docs/serialization/SerializationDocTestBase.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.serialization;
+package docs.serialization;
 
 import org.junit.Test;
 import static org.junit.Assert.*;
diff --git a/akka-docs/java/code/akka/docs/transactor/CoordinatedCounter.java b/akka-docs/java/code/docs/transactor/CoordinatedCounter.java
similarity index 97%
rename from akka-docs/java/code/akka/docs/transactor/CoordinatedCounter.java
rename to akka-docs/java/code/docs/transactor/CoordinatedCounter.java
index dd7f119005..4bd679f1eb 100644
--- a/akka-docs/java/code/akka/docs/transactor/CoordinatedCounter.java
+++ b/akka-docs/java/code/docs/transactor/CoordinatedCounter.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.docs.transactor;
+package docs.transactor;
 
 //#class
 import akka.actor.*;
diff --git a/akka-docs/java/code/akka/docs/transactor/Coordinator.java b/akka-docs/java/code/docs/transactor/Coordinator.java
similarity index 96%
rename from akka-docs/java/code/akka/docs/transactor/Coordinator.java
rename to akka-docs/java/code/docs/transactor/Coordinator.java
index f1f04761cd..644eb4312e 100644
--- a/akka-docs/java/code/akka/docs/transactor/Coordinator.java
+++ b/akka-docs/java/code/docs/transactor/Coordinator.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.docs.transactor;
+package docs.transactor;
 
 import akka.actor.*;
 import akka.transactor.*;
diff --git a/akka-docs/java/code/akka/docs/transactor/Counter.java b/akka-docs/java/code/docs/transactor/Counter.java
similarity index 95%
rename from akka-docs/java/code/akka/docs/transactor/Counter.java
rename to akka-docs/java/code/docs/transactor/Counter.java
index ea2291afeb..06092c5db0 100644
--- a/akka-docs/java/code/akka/docs/transactor/Counter.java
+++ b/akka-docs/java/code/docs/transactor/Counter.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.docs.transactor;
+package docs.transactor;
 
 //#class
 import akka.transactor.*;
diff --git a/akka-docs/java/code/akka/docs/transactor/FriendlyCounter.java b/akka-docs/java/code/docs/transactor/FriendlyCounter.java
similarity index 97%
rename from akka-docs/java/code/akka/docs/transactor/FriendlyCounter.java
rename to akka-docs/java/code/docs/transactor/FriendlyCounter.java
index 18f2137ea4..f24c044750 100644
--- a/akka-docs/java/code/akka/docs/transactor/FriendlyCounter.java
+++ b/akka-docs/java/code/docs/transactor/FriendlyCounter.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.docs.transactor;
+package docs.transactor;
 
 //#class
 import akka.actor.*;
diff --git a/akka-docs/java/code/akka/docs/transactor/Increment.java b/akka-docs/java/code/docs/transactor/Increment.java
similarity index 93%
rename from akka-docs/java/code/akka/docs/transactor/Increment.java
rename to akka-docs/java/code/docs/transactor/Increment.java
index 1d789c99e2..3794ce631d 100644
--- a/akka-docs/java/code/akka/docs/transactor/Increment.java
+++ b/akka-docs/java/code/docs/transactor/Increment.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.docs.transactor;
+package docs.transactor;
 
 //#class
 import akka.actor.ActorRef;
diff --git a/akka-docs/java/code/akka/docs/transactor/Message.java b/akka-docs/java/code/docs/transactor/Message.java
similarity index 77%
rename from akka-docs/java/code/akka/docs/transactor/Message.java
rename to akka-docs/java/code/docs/transactor/Message.java
index 6a8da72070..0f1edfc51f 100644
--- a/akka-docs/java/code/akka/docs/transactor/Message.java
+++ b/akka-docs/java/code/docs/transactor/Message.java
@@ -2,6 +2,6 @@
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.docs.transactor;
+package docs.transactor;
 
 public class Message {}
diff --git a/akka-docs/java/code/akka/docs/transactor/TransactorDocJavaSpec.scala b/akka-docs/java/code/docs/transactor/TransactorDocJavaSpec.scala
similarity index 75%
rename from akka-docs/java/code/akka/docs/transactor/TransactorDocJavaSpec.scala
rename to akka-docs/java/code/docs/transactor/TransactorDocJavaSpec.scala
index 4c61a156e8..6293b2effa 100644
--- a/akka-docs/java/code/akka/docs/transactor/TransactorDocJavaSpec.scala
+++ b/akka-docs/java/code/docs/transactor/TransactorDocJavaSpec.scala
@@ -2,10 +2,10 @@
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.docs.transactor
+package docs.transactor
 
 import org.scalatest.junit.JUnitWrapperSuite
 
 class TransactorDocJavaSpec extends JUnitWrapperSuite(
-  "akka.docs.transactor.TransactorDocTest",
+  "docs.transactor.TransactorDocTest",
   Thread.currentThread.getContextClassLoader)
\ No newline at end of file
diff --git a/akka-docs/java/code/akka/docs/transactor/TransactorDocTest.java b/akka-docs/java/code/docs/transactor/TransactorDocTest.java
similarity index 99%
rename from akka-docs/java/code/akka/docs/transactor/TransactorDocTest.java
rename to akka-docs/java/code/docs/transactor/TransactorDocTest.java
index bb1d38651b..4eaaa0bb31 100644
--- a/akka-docs/java/code/akka/docs/transactor/TransactorDocTest.java
+++ b/akka-docs/java/code/docs/transactor/TransactorDocTest.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.docs.transactor;
+package docs.transactor;
 
 import static org.junit.Assert.*;
 import org.junit.Test;
diff --git a/akka-docs/java/code/akka/docs/zeromq/ZeromqDocTest.scala b/akka-docs/java/code/docs/zeromq/ZeromqDocTest.scala
similarity index 87%
rename from akka-docs/java/code/akka/docs/zeromq/ZeromqDocTest.scala
rename to akka-docs/java/code/docs/zeromq/ZeromqDocTest.scala
index a9747959e3..c5e6f224da 100644
--- a/akka-docs/java/code/akka/docs/zeromq/ZeromqDocTest.scala
+++ b/akka-docs/java/code/docs/zeromq/ZeromqDocTest.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.zeromq
+package docs.zeromq
 
 import org.scalatest.junit.JUnitSuite
 
diff --git a/akka-docs/java/code/akka/docs/zeromq/ZeromqDocTestBase.java b/akka-docs/java/code/docs/zeromq/ZeromqDocTestBase.java
similarity index 99%
rename from akka-docs/java/code/akka/docs/zeromq/ZeromqDocTestBase.java
rename to akka-docs/java/code/docs/zeromq/ZeromqDocTestBase.java
index ee8252a6ad..1a311c9529 100644
--- a/akka-docs/java/code/akka/docs/zeromq/ZeromqDocTestBase.java
+++ b/akka-docs/java/code/docs/zeromq/ZeromqDocTestBase.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.zeromq;
+package docs.zeromq;
 
 //#pub-socket
 import akka.zeromq.Bind;
diff --git a/akka-docs/java/extending-akka.rst b/akka-docs/java/extending-akka.rst
index 6e8bfca4cb..38fedf575a 100644
--- a/akka-docs/java/extending-akka.rst
+++ b/akka-docs/java/extending-akka.rst
@@ -54,7 +54,7 @@ in the "akka.extensions" section of the config you provide to your ``ActorSystem
 ::
 
     akka {
-      extensions = ["akka.docs.extension.ExtensionDocTestBase.CountExtension"]
+      extensions = ["docs.extension.ExtensionDocTestBase.CountExtension"]
     }
 
 Applicability
diff --git a/akka-docs/java/serialization.rst b/akka-docs/java/serialization.rst
index 4c7b023959..b57a6494e5 100644
--- a/akka-docs/java/serialization.rst
+++ b/akka-docs/java/serialization.rst
@@ -85,7 +85,7 @@ Customization
 =============
 
 So, lets say that you want to create your own ``Serializer``,
-you saw the ``akka.docs.serialization.MyOwnSerializer`` in the config example above?
+you saw the ``docs.serialization.MyOwnSerializer`` in the config example above?
 
 Creating new Serializers
 ------------------------
diff --git a/akka-docs/modules/code/akka/docs/actor/mailbox/DurableMailboxDocSpec.scala b/akka-docs/modules/code/docs/actor/mailbox/DurableMailboxDocSpec.scala
similarity index 97%
rename from akka-docs/modules/code/akka/docs/actor/mailbox/DurableMailboxDocSpec.scala
rename to akka-docs/modules/code/docs/actor/mailbox/DurableMailboxDocSpec.scala
index c81f16e896..ac6c58ad08 100644
--- a/akka-docs/modules/code/akka/docs/actor/mailbox/DurableMailboxDocSpec.scala
+++ b/akka-docs/modules/code/docs/actor/mailbox/DurableMailboxDocSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor.mailbox
+package docs.actor.mailbox
 
 //#imports
 import akka.actor.Props
@@ -107,7 +107,7 @@ import akka.actor.mailbox.DurableMailboxSpec
 object MyMailboxSpec {
   val config = """
     MyStorage-dispatcher {
-      mailbox-type = akka.docs.actor.mailbox.MyMailboxType
+      mailbox-type = docs.actor.mailbox.MyMailboxType
     }
     """
 }
diff --git a/akka-docs/modules/code/akka/docs/actor/mailbox/DurableMailboxDocTest.scala b/akka-docs/modules/code/docs/actor/mailbox/DurableMailboxDocTest.scala
similarity index 85%
rename from akka-docs/modules/code/akka/docs/actor/mailbox/DurableMailboxDocTest.scala
rename to akka-docs/modules/code/docs/actor/mailbox/DurableMailboxDocTest.scala
index eba732e6a7..6b156ef791 100644
--- a/akka-docs/modules/code/akka/docs/actor/mailbox/DurableMailboxDocTest.scala
+++ b/akka-docs/modules/code/docs/actor/mailbox/DurableMailboxDocTest.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor.mailbox
+package docs.actor.mailbox
 
 import org.scalatest.junit.JUnitSuite
 
diff --git a/akka-docs/modules/code/akka/docs/actor/mailbox/DurableMailboxDocTestBase.java b/akka-docs/modules/code/docs/actor/mailbox/DurableMailboxDocTestBase.java
similarity index 97%
rename from akka-docs/modules/code/akka/docs/actor/mailbox/DurableMailboxDocTestBase.java
rename to akka-docs/modules/code/docs/actor/mailbox/DurableMailboxDocTestBase.java
index 25158446b6..06e867c786 100644
--- a/akka-docs/modules/code/akka/docs/actor/mailbox/DurableMailboxDocTestBase.java
+++ b/akka-docs/modules/code/docs/actor/mailbox/DurableMailboxDocTestBase.java
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor.mailbox;
+package docs.actor.mailbox;
 
 //#imports
 import akka.actor.Props;
diff --git a/akka-docs/scala/code/akka/docs/actor/ActorDocSpec.scala b/akka-docs/scala/code/docs/actor/ActorDocSpec.scala
similarity index 99%
rename from akka-docs/scala/code/akka/docs/actor/ActorDocSpec.scala
rename to akka-docs/scala/code/docs/actor/ActorDocSpec.scala
index 8aed17605c..ee05e95d42 100644
--- a/akka-docs/scala/code/akka/docs/actor/ActorDocSpec.scala
+++ b/akka-docs/scala/code/docs/actor/ActorDocSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor
+package docs.actor
 
 //#imports1
 import akka.actor.Actor
diff --git a/akka-docs/scala/code/akka/docs/actor/FSMDocSpec.scala b/akka-docs/scala/code/docs/actor/FSMDocSpec.scala
similarity index 99%
rename from akka-docs/scala/code/akka/docs/actor/FSMDocSpec.scala
rename to akka-docs/scala/code/docs/actor/FSMDocSpec.scala
index 158f8979a0..75b0309a42 100644
--- a/akka-docs/scala/code/akka/docs/actor/FSMDocSpec.scala
+++ b/akka-docs/scala/code/docs/actor/FSMDocSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor
+package docs.actor
 
 //#test-code
 import akka.testkit.AkkaSpec
diff --git a/akka-docs/scala/code/akka/docs/actor/FaultHandlingDocSample.scala b/akka-docs/scala/code/docs/actor/FaultHandlingDocSample.scala
similarity index 99%
rename from akka-docs/scala/code/akka/docs/actor/FaultHandlingDocSample.scala
rename to akka-docs/scala/code/docs/actor/FaultHandlingDocSample.scala
index d08bcb53b2..79f5a5d084 100644
--- a/akka-docs/scala/code/akka/docs/actor/FaultHandlingDocSample.scala
+++ b/akka-docs/scala/code/docs/actor/FaultHandlingDocSample.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor
+package docs.actor
 
 //#all
 //#imports
diff --git a/akka-docs/scala/code/akka/docs/actor/FaultHandlingDocSpec.scala b/akka-docs/scala/code/docs/actor/FaultHandlingDocSpec.scala
similarity index 99%
rename from akka-docs/scala/code/akka/docs/actor/FaultHandlingDocSpec.scala
rename to akka-docs/scala/code/docs/actor/FaultHandlingDocSpec.scala
index ca1eccb73a..8ce16f1021 100644
--- a/akka-docs/scala/code/akka/docs/actor/FaultHandlingDocSpec.scala
+++ b/akka-docs/scala/code/docs/actor/FaultHandlingDocSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor
+package docs.actor
 
 //#testkit
 import akka.testkit.{ AkkaSpec, ImplicitSender, EventFilter }
diff --git a/akka-docs/scala/code/akka/docs/actor/SchedulerDocSpec.scala b/akka-docs/scala/code/docs/actor/SchedulerDocSpec.scala
similarity index 98%
rename from akka-docs/scala/code/akka/docs/actor/SchedulerDocSpec.scala
rename to akka-docs/scala/code/docs/actor/SchedulerDocSpec.scala
index b6bffecb46..f711d85129 100644
--- a/akka-docs/scala/code/akka/docs/actor/SchedulerDocSpec.scala
+++ b/akka-docs/scala/code/docs/actor/SchedulerDocSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor
+package docs.actor
 
 //#imports1
 import akka.actor.Actor
diff --git a/akka-docs/scala/code/akka/docs/actor/TypedActorDocSpec.scala b/akka-docs/scala/code/docs/actor/TypedActorDocSpec.scala
similarity index 99%
rename from akka-docs/scala/code/akka/docs/actor/TypedActorDocSpec.scala
rename to akka-docs/scala/code/docs/actor/TypedActorDocSpec.scala
index f7c5fa9bf7..e2c8db16a4 100644
--- a/akka-docs/scala/code/akka/docs/actor/TypedActorDocSpec.scala
+++ b/akka-docs/scala/code/docs/actor/TypedActorDocSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor
+package docs.actor
 
 //#imports
 import akka.dispatch.{ Promise, Future, Await }
diff --git a/akka-docs/scala/code/akka/docs/actor/UnnestedReceives.scala b/akka-docs/scala/code/docs/actor/UnnestedReceives.scala
similarity index 98%
rename from akka-docs/scala/code/akka/docs/actor/UnnestedReceives.scala
rename to akka-docs/scala/code/docs/actor/UnnestedReceives.scala
index 194a958cce..bb77fe4d1d 100644
--- a/akka-docs/scala/code/akka/docs/actor/UnnestedReceives.scala
+++ b/akka-docs/scala/code/docs/actor/UnnestedReceives.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.actor
+package docs.actor
 
 import akka.actor._
 import scala.collection.mutable.ListBuffer
diff --git a/akka-docs/scala/code/akka/docs/agent/AgentDocSpec.scala b/akka-docs/scala/code/docs/agent/AgentDocSpec.scala
similarity index 99%
rename from akka-docs/scala/code/akka/docs/agent/AgentDocSpec.scala
rename to akka-docs/scala/code/docs/agent/AgentDocSpec.scala
index 1e9ec1fd69..418159f638 100644
--- a/akka-docs/scala/code/akka/docs/agent/AgentDocSpec.scala
+++ b/akka-docs/scala/code/docs/agent/AgentDocSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.agent
+package docs.agent
 
 import akka.agent.Agent
 import akka.util.duration._
diff --git a/akka-docs/scala/code/akka/docs/camel/Consumers.scala b/akka-docs/scala/code/docs/camel/Consumers.scala
similarity index 96%
rename from akka-docs/scala/code/akka/docs/camel/Consumers.scala
rename to akka-docs/scala/code/docs/camel/Consumers.scala
index 90f181df3f..df7161b9e6 100644
--- a/akka-docs/scala/code/akka/docs/camel/Consumers.scala
+++ b/akka-docs/scala/code/docs/camel/Consumers.scala
@@ -1,4 +1,4 @@
-package akka.docs.camel
+package docs.camel
 
 object Consumers {
   {
diff --git a/akka-docs/scala/code/akka/docs/camel/Introduction.scala b/akka-docs/scala/code/docs/camel/Introduction.scala
similarity index 98%
rename from akka-docs/scala/code/akka/docs/camel/Introduction.scala
rename to akka-docs/scala/code/docs/camel/Introduction.scala
index 4899843a27..eaf4c400f6 100644
--- a/akka-docs/scala/code/akka/docs/camel/Introduction.scala
+++ b/akka-docs/scala/code/docs/camel/Introduction.scala
@@ -1,4 +1,4 @@
-package akka.docs.camel
+package docs.camel
 
 object Introduction {
   {
diff --git a/akka-docs/scala/code/akka/docs/dispatcher/DispatcherDocSpec.scala b/akka-docs/scala/code/docs/dispatcher/DispatcherDocSpec.scala
similarity index 97%
rename from akka-docs/scala/code/akka/docs/dispatcher/DispatcherDocSpec.scala
rename to akka-docs/scala/code/docs/dispatcher/DispatcherDocSpec.scala
index 1452d72088..3ff8d9c1ea 100644
--- a/akka-docs/scala/code/akka/docs/dispatcher/DispatcherDocSpec.scala
+++ b/akka-docs/scala/code/docs/dispatcher/DispatcherDocSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.dispatcher
+package docs.dispatcher
 
 import org.scalatest.{ BeforeAndAfterAll, WordSpec }
 import org.scalatest.matchers.MustMatchers
@@ -91,13 +91,13 @@ object DispatcherDocSpec {
 
     //#prio-dispatcher-config
     prio-dispatcher {
-      mailbox-type = "akka.docs.dispatcher.DispatcherDocSpec$MyPrioMailbox"
+      mailbox-type = "docs.dispatcher.DispatcherDocSpec$MyPrioMailbox"
     }
     //#prio-dispatcher-config
 
     //#prio-dispatcher-config-java
     prio-dispatcher-java {
-      mailbox-type = "akka.docs.dispatcher.DispatcherDocTestBase$MyPrioMailbox"
+      mailbox-type = "docs.dispatcher.DispatcherDocTestBase$MyPrioMailbox"
       //Other dispatcher configuration goes here
     }
     //#prio-dispatcher-config-java
diff --git a/akka-docs/scala/code/akka/docs/event/LoggingDocSpec.scala b/akka-docs/scala/code/docs/event/LoggingDocSpec.scala
similarity index 99%
rename from akka-docs/scala/code/akka/docs/event/LoggingDocSpec.scala
rename to akka-docs/scala/code/docs/event/LoggingDocSpec.scala
index 0aa29549c9..7e2fccb876 100644
--- a/akka-docs/scala/code/akka/docs/event/LoggingDocSpec.scala
+++ b/akka-docs/scala/code/docs/event/LoggingDocSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.event
+package docs.event
 
 import akka.testkit.AkkaSpec
 import akka.actor.Actor
diff --git a/akka-docs/scala/code/akka/docs/extension/ExtensionDocSpec.scala b/akka-docs/scala/code/docs/extension/ExtensionDocSpec.scala
similarity index 96%
rename from akka-docs/scala/code/akka/docs/extension/ExtensionDocSpec.scala
rename to akka-docs/scala/code/docs/extension/ExtensionDocSpec.scala
index 05baa28ecb..c2558fb4f1 100644
--- a/akka-docs/scala/code/akka/docs/extension/ExtensionDocSpec.scala
+++ b/akka-docs/scala/code/docs/extension/ExtensionDocSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.extension
+package docs.extension
 
 import java.util.concurrent.atomic.AtomicLong
 import akka.actor.Actor
@@ -45,7 +45,7 @@ object ExtensionDocSpec {
   val config = """
     //#config
     akka {
-      extensions = ["akka.docs.extension.CountExtension$"]
+      extensions = ["docs.extension.CountExtension$"]
     }
     //#config
     """
diff --git a/akka-docs/scala/code/akka/docs/extension/SettingsExtensionDocSpec.scala b/akka-docs/scala/code/docs/extension/SettingsExtensionDocSpec.scala
similarity index 98%
rename from akka-docs/scala/code/akka/docs/extension/SettingsExtensionDocSpec.scala
rename to akka-docs/scala/code/docs/extension/SettingsExtensionDocSpec.scala
index 05765d27a5..a1e033e386 100644
--- a/akka-docs/scala/code/akka/docs/extension/SettingsExtensionDocSpec.scala
+++ b/akka-docs/scala/code/docs/extension/SettingsExtensionDocSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.extension
+package docs.extension
 
 //#imports
 import akka.actor.Extension
diff --git a/akka-docs/scala/code/akka/docs/future/FutureDocSpec.scala b/akka-docs/scala/code/docs/future/FutureDocSpec.scala
similarity index 99%
rename from akka-docs/scala/code/akka/docs/future/FutureDocSpec.scala
rename to akka-docs/scala/code/docs/future/FutureDocSpec.scala
index cee2eaeef8..66e80578fd 100644
--- a/akka-docs/scala/code/akka/docs/future/FutureDocSpec.scala
+++ b/akka-docs/scala/code/docs/future/FutureDocSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.future
+package docs.future
 
 import org.scalatest.{ BeforeAndAfterAll, WordSpec }
 import org.scalatest.matchers.MustMatchers
diff --git a/akka-docs/scala/code/akka/docs/io/HTTPServer.scala b/akka-docs/scala/code/docs/io/HTTPServer.scala
similarity index 99%
rename from akka-docs/scala/code/akka/docs/io/HTTPServer.scala
rename to akka-docs/scala/code/docs/io/HTTPServer.scala
index 01bb53023b..b6b80aa27f 100644
--- a/akka-docs/scala/code/akka/docs/io/HTTPServer.scala
+++ b/akka-docs/scala/code/docs/io/HTTPServer.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.io
+package docs.io
 
 //#imports
 import akka.actor._
diff --git a/akka-docs/scala/code/akka/docs/remoting/RemoteDeploymentDocSpec.scala b/akka-docs/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
similarity index 98%
rename from akka-docs/scala/code/akka/docs/remoting/RemoteDeploymentDocSpec.scala
rename to akka-docs/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
index 0c65b3dc76..b391494a3b 100644
--- a/akka-docs/scala/code/akka/docs/remoting/RemoteDeploymentDocSpec.scala
+++ b/akka-docs/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.remoting
+package docs.remoting
 
 import akka.actor.{ ExtendedActorSystem, ActorSystem, Actor, ActorRef }
 import akka.testkit.{ AkkaSpec, ImplicitSender }
diff --git a/akka-docs/scala/code/akka/docs/routing/RouterDocSpec.scala b/akka-docs/scala/code/docs/routing/RouterDocSpec.scala
similarity index 96%
rename from akka-docs/scala/code/akka/docs/routing/RouterDocSpec.scala
rename to akka-docs/scala/code/docs/routing/RouterDocSpec.scala
index 229c66f13e..c71228d06c 100644
--- a/akka-docs/scala/code/akka/docs/routing/RouterDocSpec.scala
+++ b/akka-docs/scala/code/docs/routing/RouterDocSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.routing
+package docs.routing
 
 import RouterDocSpec.MyActor
 import akka.actor.{ Props, Actor }
diff --git a/akka-docs/scala/code/akka/docs/routing/RouterTypeExample.scala b/akka-docs/scala/code/docs/routing/RouterTypeExample.scala
similarity index 99%
rename from akka-docs/scala/code/akka/docs/routing/RouterTypeExample.scala
rename to akka-docs/scala/code/docs/routing/RouterTypeExample.scala
index 6ec475a874..421c7af3bb 100644
--- a/akka-docs/scala/code/akka/docs/routing/RouterTypeExample.scala
+++ b/akka-docs/scala/code/docs/routing/RouterTypeExample.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.routing
+package docs.routing
 
 import akka.routing.{ ScatterGatherFirstCompletedRouter, BroadcastRouter, RandomRouter, RoundRobinRouter }
 import annotation.tailrec
diff --git a/akka-docs/scala/code/akka/docs/routing/RouterViaConfigExample.scala b/akka-docs/scala/code/docs/routing/RouterViaConfigExample.scala
similarity index 98%
rename from akka-docs/scala/code/akka/docs/routing/RouterViaConfigExample.scala
rename to akka-docs/scala/code/docs/routing/RouterViaConfigExample.scala
index cc840eedc5..5d34e429bb 100644
--- a/akka-docs/scala/code/akka/docs/routing/RouterViaConfigExample.scala
+++ b/akka-docs/scala/code/docs/routing/RouterViaConfigExample.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.routing
+package docs.routing
 
 import akka.actor.{ Actor, Props, ActorSystem }
 import com.typesafe.config.ConfigFactory
diff --git a/akka-docs/scala/code/akka/docs/routing/RouterViaProgramExample.scala b/akka-docs/scala/code/docs/routing/RouterViaProgramExample.scala
similarity index 98%
rename from akka-docs/scala/code/akka/docs/routing/RouterViaProgramExample.scala
rename to akka-docs/scala/code/docs/routing/RouterViaProgramExample.scala
index 50b141e7b7..195fc20445 100644
--- a/akka-docs/scala/code/akka/docs/routing/RouterViaProgramExample.scala
+++ b/akka-docs/scala/code/docs/routing/RouterViaProgramExample.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.routing
+package docs.routing
 
 import akka.routing.RoundRobinRouter
 import akka.actor.{ ActorRef, Props, Actor, ActorSystem }
diff --git a/akka-docs/scala/code/akka/docs/serialization/SerializationDocSpec.scala b/akka-docs/scala/code/docs/serialization/SerializationDocSpec.scala
similarity index 94%
rename from akka-docs/scala/code/akka/docs/serialization/SerializationDocSpec.scala
rename to akka-docs/scala/code/docs/serialization/SerializationDocSpec.scala
index e614cc9903..61086b78a6 100644
--- a/akka-docs/scala/code/akka/docs/serialization/SerializationDocSpec.scala
+++ b/akka-docs/scala/code/docs/serialization/SerializationDocSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.serialization
+package docs.serialization
 
 import org.scalatest.matchers.MustMatchers
 import akka.testkit._
@@ -87,7 +87,7 @@ class SerializationDocSpec extends AkkaSpec {
           serializers {
             java = "akka.serialization.JavaSerializer"
             proto = "akka.serialization.ProtobufSerializer"
-            myown = "akka.docs.serialization.MyOwnSerializer"
+            myown = "docs.serialization.MyOwnSerializer"
           }
         }
       }
@@ -105,14 +105,14 @@ class SerializationDocSpec extends AkkaSpec {
           serializers {
             java = "akka.serialization.JavaSerializer"
             proto = "akka.serialization.ProtobufSerializer"
-            myown = "akka.docs.serialization.MyOwnSerializer"
+            myown = "docs.serialization.MyOwnSerializer"
           }
 
           serialization-bindings {
             "java.lang.String" = java
-            "akka.docs.serialization.Customer" = java
+            "docs.serialization.Customer" = java
             "com.google.protobuf.Message" = proto
-            "akka.docs.serialization.MyOwnSerializable" = myown
+            "docs.serialization.MyOwnSerializable" = myown
             "java.lang.Boolean" = myown
           }
         }
diff --git a/akka-docs/scala/code/akka/docs/testkit/PlainWordSpec.scala b/akka-docs/scala/code/docs/testkit/PlainWordSpec.scala
similarity index 97%
rename from akka-docs/scala/code/akka/docs/testkit/PlainWordSpec.scala
rename to akka-docs/scala/code/docs/testkit/PlainWordSpec.scala
index 8df13da2ca..2da67c9156 100644
--- a/akka-docs/scala/code/akka/docs/testkit/PlainWordSpec.scala
+++ b/akka-docs/scala/code/docs/testkit/PlainWordSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.testkit
+package docs.testkit
 
 //#plain-spec
 import akka.actor.ActorSystem
diff --git a/akka-docs/scala/code/akka/docs/testkit/TestKitUsageSpec.scala b/akka-docs/scala/code/docs/testkit/TestKitUsageSpec.scala
similarity index 99%
rename from akka-docs/scala/code/akka/docs/testkit/TestKitUsageSpec.scala
rename to akka-docs/scala/code/docs/testkit/TestKitUsageSpec.scala
index d2b2f9367d..2ca1dbcef8 100644
--- a/akka-docs/scala/code/akka/docs/testkit/TestKitUsageSpec.scala
+++ b/akka-docs/scala/code/docs/testkit/TestKitUsageSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.testkit
+package docs.testkit
 
 //#testkit-usage
 import scala.util.Random
diff --git a/akka-docs/scala/code/akka/docs/testkit/TestkitDocSpec.scala b/akka-docs/scala/code/docs/testkit/TestkitDocSpec.scala
similarity index 99%
rename from akka-docs/scala/code/akka/docs/testkit/TestkitDocSpec.scala
rename to akka-docs/scala/code/docs/testkit/TestkitDocSpec.scala
index 2b2cb003a9..ddb3eeaf1d 100644
--- a/akka-docs/scala/code/akka/docs/testkit/TestkitDocSpec.scala
+++ b/akka-docs/scala/code/docs/testkit/TestkitDocSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.testkit
+package docs.testkit
 
 //#imports-test-probe
 import akka.testkit.TestProbe
diff --git a/akka-docs/scala/code/akka/docs/transactor/TransactorDocSpec.scala b/akka-docs/scala/code/docs/transactor/TransactorDocSpec.scala
similarity index 99%
rename from akka-docs/scala/code/akka/docs/transactor/TransactorDocSpec.scala
rename to akka-docs/scala/code/docs/transactor/TransactorDocSpec.scala
index fa76f54744..c1556b837d 100644
--- a/akka-docs/scala/code/akka/docs/transactor/TransactorDocSpec.scala
+++ b/akka-docs/scala/code/docs/transactor/TransactorDocSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.docs.transactor
+package docs.transactor
 
 import akka.actor._
 import akka.transactor._
diff --git a/akka-docs/scala/code/akka/docs/zeromq/ZeromqDocSpec.scala b/akka-docs/scala/code/docs/zeromq/ZeromqDocSpec.scala
similarity index 99%
rename from akka-docs/scala/code/akka/docs/zeromq/ZeromqDocSpec.scala
rename to akka-docs/scala/code/docs/zeromq/ZeromqDocSpec.scala
index dba4989d87..812e0edaaa 100644
--- a/akka-docs/scala/code/akka/docs/zeromq/ZeromqDocSpec.scala
+++ b/akka-docs/scala/code/docs/zeromq/ZeromqDocSpec.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.docs.zeromq
+package docs.zeromq
 
 import akka.actor.Actor
 import akka.actor.Props
diff --git a/akka-docs/scala/serialization.rst b/akka-docs/scala/serialization.rst
index 2ab0a7b633..15525a29f2 100644
--- a/akka-docs/scala/serialization.rst
+++ b/akka-docs/scala/serialization.rst
@@ -84,7 +84,7 @@ Customization
 =============
 
 So, lets say that you want to create your own ``Serializer``,
-you saw the ``akka.docs.serialization.MyOwnSerializer`` in the config example above?
+you saw the ``docs.serialization.MyOwnSerializer`` in the config example above?
 
 Creating new Serializers
 ------------------------