diff --git a/akka-docs-dev/rst/scala/code/docs/http/HttpServerExampleSpec.scala b/akka-docs-dev/rst/scala/code/docs/http/HttpServerExampleSpec.scala
index 50b9d93e85..fe4550a6ec 100644
--- a/akka-docs-dev/rst/scala/code/docs/http/HttpServerExampleSpec.scala
+++ b/akka-docs-dev/rst/scala/code/docs/http/HttpServerExampleSpec.scala
@@ -5,11 +5,10 @@
 package docs.http
 
 import akka.actor.ActorSystem
-import akka.http.model._
+import akka.http.scaladsl.model._
 import akka.stream.scaladsl._
 import akka.stream.testkit.AkkaSpec
 import scala.concurrent.Future
-import akka.http.Http
 
 class HttpServerExampleSpec
   extends AkkaSpec("akka.actor.default-mailbox.mailbox-type = akka.dispatch.UnboundedMailbox") {
@@ -17,7 +16,7 @@ class HttpServerExampleSpec
 
   "binding example" in {
     //#bind-example
-    import akka.http.Http
+    import akka.http.scaladsl.Http
     import akka.stream.ActorFlowMaterializer
 
     implicit val system = ActorSystem()
@@ -34,7 +33,7 @@ class HttpServerExampleSpec
   }
 
   "full-server-example" in {
-    import akka.http.Http
+    import akka.http.scaladsl.Http
     import akka.stream.ActorFlowMaterializer
 
     implicit val system = ActorSystem()
@@ -43,7 +42,7 @@ class HttpServerExampleSpec
     val serverSource = Http(system).bind(interface = "localhost", port = 8080)
 
     //#full-server-example
-    import akka.http.model.HttpMethods._
+    import akka.http.scaladsl.model.HttpMethods._
     import akka.stream.scaladsl.{ Flow, Sink }
 
     val requestHandler: HttpRequest => HttpResponse = {
diff --git a/akka-docs-dev/rst/scala/code/docs/http/ModelSpec.scala b/akka-docs-dev/rst/scala/code/docs/http/ModelSpec.scala
index 9ff297119a..a3c2fc92f1 100644
--- a/akka-docs-dev/rst/scala/code/docs/http/ModelSpec.scala
+++ b/akka-docs-dev/rst/scala/code/docs/http/ModelSpec.scala
@@ -1,13 +1,13 @@
 package docs.http
 
 //#import-model
-import akka.http.model._
+import akka.http.scaladsl.model._
 
 //#import-model
 
 import akka.stream.testkit.AkkaSpec
 import akka.util.ByteString
-import akka.http.model.headers.{ GenericHttpCredentials, BasicHttpCredentials }
+import akka.http.scaladsl.model.headers.{ GenericHttpCredentials, BasicHttpCredentials }
 import org.scalatest.MustMatchers
 
 class ModelSpec extends AkkaSpec {
@@ -62,7 +62,7 @@ class ModelSpec extends AkkaSpec {
 
   "deal with headers" in {
     //#headers
-    import akka.http.model.headers._
+    import akka.http.scaladsl.model.headers._
 
     // create a ``Location`` header
     val loc = Location("http://example.com/other")
diff --git a/akka-docs-dev/rst/scala/code/docs/http/server/DirectiveExamplesSpec.scala b/akka-docs-dev/rst/scala/code/docs/http/server/DirectiveExamplesSpec.scala
index 13e0cfc2db..f0f49f7848 100644
--- a/akka-docs-dev/rst/scala/code/docs/http/server/DirectiveExamplesSpec.scala
+++ b/akka-docs-dev/rst/scala/code/docs/http/server/DirectiveExamplesSpec.scala
@@ -4,9 +4,9 @@
 
 package docs.http.server
 
-import akka.http.server._
+import akka.http.scaladsl.server._
 import Directives._
-import akka.http.testkit.ScalatestRouteTest
+import akka.http.scaladsl.testkit.ScalatestRouteTest
 import org.scalatest._
 
 class DirectiveExamplesSpec extends RoutingSpec {
diff --git a/akka-docs-dev/rst/scala/code/docs/http/server/ExceptionHandlerExamplesSpec.scala b/akka-docs-dev/rst/scala/code/docs/http/server/ExceptionHandlerExamplesSpec.scala
index c5735933a5..6294aa685b 100644
--- a/akka-docs-dev/rst/scala/code/docs/http/server/ExceptionHandlerExamplesSpec.scala
+++ b/akka-docs-dev/rst/scala/code/docs/http/server/ExceptionHandlerExamplesSpec.scala
@@ -5,14 +5,14 @@
 package docs.http.server
 
 import akka.actor.ActorSystem
-import akka.http.server.Route
+import akka.http.scaladsl.server.Route
 import akka.stream.ActorFlowMaterializer
 
 object MyHandler {
   //# example-1
-  import akka.http.model.HttpResponse
-  import akka.http.model.StatusCodes._
-  import akka.http.server._
+  import akka.http.scaladsl.model.HttpResponse
+  import akka.http.scaladsl.model.StatusCodes._
+  import akka.http.scaladsl.server._
   import Directives._
 
   implicit def myExceptionHandler =
diff --git a/akka-docs-dev/rst/scala/code/docs/http/server/RejectionHandlerExamplesSpec.scala b/akka-docs-dev/rst/scala/code/docs/http/server/RejectionHandlerExamplesSpec.scala
index 43c0b2c2b1..878ac7219e 100644
--- a/akka-docs-dev/rst/scala/code/docs/http/server/RejectionHandlerExamplesSpec.scala
+++ b/akka-docs-dev/rst/scala/code/docs/http/server/RejectionHandlerExamplesSpec.scala
@@ -7,14 +7,14 @@ package docs.http.server
 import akka.actor.ActorSystem
 import akka.stream.ActorFlowMaterializer
 
-import akka.http.server.{ Route, MissingCookieRejection }
+import akka.http.scaladsl.server.{ Route, MissingCookieRejection }
 
 import scala.concurrent.ExecutionContext
 
 object MyRejectionHandler {
   //# example-1
-  import akka.http.model._
-  import akka.http.server._
+  import akka.http.scaladsl.model._
+  import akka.http.scaladsl.server._
   import StatusCodes._
   import Directives._
 
@@ -47,7 +47,7 @@ class RejectionHandlerExamplesSpec extends RoutingSpec {
   }
 
   "example-2" in {
-    import akka.http.coding.Gzip
+    import akka.http.scaladsl.coding.Gzip
 
     val route =
       path("order") {
diff --git a/akka-docs-dev/rst/scala/code/docs/http/server/RoutingSpec.scala b/akka-docs-dev/rst/scala/code/docs/http/server/RoutingSpec.scala
index 2aad96e0d0..8aec6b4891 100644
--- a/akka-docs-dev/rst/scala/code/docs/http/server/RoutingSpec.scala
+++ b/akka-docs-dev/rst/scala/code/docs/http/server/RoutingSpec.scala
@@ -4,8 +4,8 @@
 
 package docs.http.server
 
-import akka.http.server.Directives
-import akka.http.testkit.ScalatestRouteTest
+import akka.http.scaladsl.server.Directives
+import akka.http.scaladsl.testkit.ScalatestRouteTest
 import org.scalatest.{ Matchers, WordSpec }
 
 abstract class RoutingSpec extends WordSpec with Matchers with Directives with ScalatestRouteTest
diff --git a/akka-docs-dev/rst/scala/code/docs/http/server/directives/BasicDirectivesExamplesSpec.scala b/akka-docs-dev/rst/scala/code/docs/http/server/directives/BasicDirectivesExamplesSpec.scala
index 50b4575b7b..1b714618f2 100644
--- a/akka-docs-dev/rst/scala/code/docs/http/server/directives/BasicDirectivesExamplesSpec.scala
+++ b/akka-docs-dev/rst/scala/code/docs/http/server/directives/BasicDirectivesExamplesSpec.scala
@@ -5,14 +5,14 @@
 package docs.http.server
 package directives
 
-import akka.http.model.headers.RawHeader
-import akka.http.server.RouteResult.Rejected
-import akka.http.server._
+import akka.http.scaladsl.model.headers.RawHeader
+import akka.http.scaladsl.server.RouteResult.Rejected
+import akka.http.scaladsl.server._
 import akka.util.ByteString
 
 import scala.util.control.NonFatal
 
-import akka.http.model._
+import akka.http.scaladsl.model._
 
 class BasicDirectivesExamplesSpec extends RoutingSpec {
   "0extract" in {
diff --git a/akka-docs-dev/rst/scala/code/docs/http/server/directives/CodingDirectivesExamplesSpec.scala b/akka-docs-dev/rst/scala/code/docs/http/server/directives/CodingDirectivesExamplesSpec.scala
index 9483ec2464..977b8e7a61 100644
--- a/akka-docs-dev/rst/scala/code/docs/http/server/directives/CodingDirectivesExamplesSpec.scala
+++ b/akka-docs-dev/rst/scala/code/docs/http/server/directives/CodingDirectivesExamplesSpec.scala
@@ -5,11 +5,11 @@
 package docs.http.server
 package directives
 
-import akka.http.coding._
-import akka.http.model.{ HttpResponse, StatusCodes }
-import akka.http.model.headers.{ HttpEncodings, HttpEncoding, `Accept-Encoding`, `Content-Encoding` }
-import akka.http.model.headers.HttpEncodings._
-import akka.http.server._
+import akka.http.scaladsl.coding._
+import akka.http.scaladsl.model.{ HttpResponse, StatusCodes }
+import akka.http.scaladsl.model.headers.{ HttpEncodings, HttpEncoding, `Accept-Encoding`, `Content-Encoding` }
+import akka.http.scaladsl.model.headers.HttpEncodings._
+import akka.http.scaladsl.server._
 import akka.util.ByteString
 import org.scalatest.matchers.Matcher
 
diff --git a/akka-docs-dev/rst/scala/code/docs/http/server/directives/CookieDirectivesExamplesSpec.scala b/akka-docs-dev/rst/scala/code/docs/http/server/directives/CookieDirectivesExamplesSpec.scala
index 57535ec4ec..5004c84bf0 100644
--- a/akka-docs-dev/rst/scala/code/docs/http/server/directives/CookieDirectivesExamplesSpec.scala
+++ b/akka-docs-dev/rst/scala/code/docs/http/server/directives/CookieDirectivesExamplesSpec.scala
@@ -5,9 +5,9 @@
 package docs.http.server
 package directives
 
-import akka.http.server._
-import akka.http.model.headers.{ HttpCookie, Cookie, `Set-Cookie` }
-import akka.http.util.DateTime
+import akka.http.scaladsl.server._
+import akka.http.scaladsl.model.headers.{ HttpCookie, Cookie, `Set-Cookie` }
+import akka.http.scaladsl.model.DateTime
 
 class CookieDirectivesExamplesSpec extends RoutingSpec {
   "cookie" in {
diff --git a/akka-docs-dev/rst/scala/code/docs/http/server/directives/DebuggingDirectivesExamplesSpec.scala b/akka-docs-dev/rst/scala/code/docs/http/server/directives/DebuggingDirectivesExamplesSpec.scala
index 593efeb35f..fe50aadfad 100644
--- a/akka-docs-dev/rst/scala/code/docs/http/server/directives/DebuggingDirectivesExamplesSpec.scala
+++ b/akka-docs-dev/rst/scala/code/docs/http/server/directives/DebuggingDirectivesExamplesSpec.scala
@@ -5,11 +5,11 @@
 package docs.http.server
 package directives
 
-import akka.http.model.{ HttpResponse, HttpRequest }
-import akka.http.server._
+import akka.http.scaladsl.model.{ HttpResponse, HttpRequest }
+import akka.http.scaladsl.server._
 
 import akka.event.Logging
-import akka.http.server.directives.{ LoggingMagnet, LogEntry, DebuggingDirectives }
+import akka.http.scaladsl.server.directives.{ LoggingMagnet, LogEntry, DebuggingDirectives }
 
 class DebuggingDirectivesExamplesSpec extends RoutingSpec {
   "logRequest-0" in {
diff --git a/akka-docs-dev/rst/scala/code/docs/http/server/directives/ExecutionDirectivesExamplesSpec.scala b/akka-docs-dev/rst/scala/code/docs/http/server/directives/ExecutionDirectivesExamplesSpec.scala
index 3d72a37f1b..881abe89fd 100644
--- a/akka-docs-dev/rst/scala/code/docs/http/server/directives/ExecutionDirectivesExamplesSpec.scala
+++ b/akka-docs-dev/rst/scala/code/docs/http/server/directives/ExecutionDirectivesExamplesSpec.scala
@@ -5,8 +5,8 @@
 package docs.http.server
 package directives
 
-import akka.http.model.StatusCodes
-import akka.http.server._
+import akka.http.scaladsl.model.StatusCodes
+import akka.http.scaladsl.server._
 
 class ExecutionDirectivesExamplesSpec extends RoutingSpec {
   "handleExceptions" in {
diff --git a/akka-docs-dev/rst/scala/code/docs/http/server/directives/PathDirectivesExamplesSpec.scala b/akka-docs-dev/rst/scala/code/docs/http/server/directives/PathDirectivesExamplesSpec.scala
index b8c3c770a8..3f5c713431 100644
--- a/akka-docs-dev/rst/scala/code/docs/http/server/directives/PathDirectivesExamplesSpec.scala
+++ b/akka-docs-dev/rst/scala/code/docs/http/server/directives/PathDirectivesExamplesSpec.scala
@@ -5,7 +5,7 @@
 package docs.http.server
 package directives
 
-import akka.http.server._
+import akka.http.scaladsl.server._
 
 class PathDirectivesExamplesSpec extends RoutingSpec {