diff --git a/akka-http-testkit/src/main/scala/akka/http/testkit/RouteTest.scala b/akka-http-testkit/src/main/scala/akka/http/testkit/RouteTest.scala
index 8c98675f42..2aae703489 100644
--- a/akka-http-testkit/src/main/scala/akka/http/testkit/RouteTest.scala
+++ b/akka-http-testkit/src/main/scala/akka/http/testkit/RouteTest.scala
@@ -13,7 +13,7 @@ import scala.reflect.ClassTag
 import org.scalatest.Suite
 import akka.actor.ActorSystem
 import akka.stream.FlowMaterializer
-import akka.http.routing._
+import akka.http.server._
 import akka.http.unmarshalling._
 import akka.http.model._
 import headers.Host
diff --git a/akka-http-testkit/src/main/scala/akka/http/testkit/RouteTestResultComponent.scala b/akka-http-testkit/src/main/scala/akka/http/testkit/RouteTestResultComponent.scala
index a0cfc657c8..214d8d1009 100644
--- a/akka-http-testkit/src/main/scala/akka/http/testkit/RouteTestResultComponent.scala
+++ b/akka-http-testkit/src/main/scala/akka/http/testkit/RouteTestResultComponent.scala
@@ -12,7 +12,7 @@ import scala.concurrent.{ Await, ExecutionContext }
 import akka.stream.FlowMaterializer
 import akka.stream.scaladsl.Flow
 import akka.http.model.HttpEntity.ChunkStreamPart
-import akka.http.routing._
+import akka.http.server._
 import akka.http.model._
 
 trait RouteTestResultComponent {
diff --git a/akka-http-testkit/src/test/scala/akka/http/testkit/ScalatestRouteTestSpec.scala b/akka-http-testkit/src/test/scala/akka/http/testkit/ScalatestRouteTestSpec.scala
index c2d45ae295..904f16110b 100644
--- a/akka-http-testkit/src/test/scala/akka/http/testkit/ScalatestRouteTestSpec.scala
+++ b/akka-http-testkit/src/test/scala/akka/http/testkit/ScalatestRouteTestSpec.scala
@@ -11,7 +11,7 @@ import akka.testkit.TestProbe
 import akka.util.Timeout
 import akka.pattern.ask
 import akka.http.model.headers.RawHeader
-import akka.http.routing._
+import akka.http.server._
 import akka.http.model._
 import StatusCodes._
 import HttpMethods._
diff --git a/akka-http-tests/src/test/scala/akka/http/routing/BasicRouteSpecs.scala b/akka-http-tests/src/test/scala/akka/http/server/BasicRouteSpecs.scala
similarity index 97%
rename from akka-http-tests/src/test/scala/akka/http/routing/BasicRouteSpecs.scala
rename to akka-http-tests/src/test/scala/akka/http/server/BasicRouteSpecs.scala
index 54dac0a245..c016941012 100644
--- a/akka-http-tests/src/test/scala/akka/http/routing/BasicRouteSpecs.scala
+++ b/akka-http-tests/src/test/scala/akka/http/server/BasicRouteSpecs.scala
@@ -2,10 +2,10 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import akka.http.model.HttpMethods._
-import akka.http.routing.PathMatchers.{ Segment, IntNumber }
+import akka.http.server.PathMatchers.{ Segment, IntNumber }
 
 class BasicRouteSpecs extends RoutingSpec {
 
diff --git a/akka-http-tests/src/test/scala/akka/http/routing/RoutingSpec.scala b/akka-http-tests/src/test/scala/akka/http/server/RoutingSpec.scala
similarity index 95%
rename from akka-http-tests/src/test/scala/akka/http/routing/RoutingSpec.scala
rename to akka-http-tests/src/test/scala/akka/http/server/RoutingSpec.scala
index 377e11e265..616b19366b 100644
--- a/akka-http-tests/src/test/scala/akka/http/routing/RoutingSpec.scala
+++ b/akka-http-tests/src/test/scala/akka/http/server/RoutingSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import org.scalatest.{ WordSpec, Suite, Matchers }
 import akka.http.model.HttpResponse
diff --git a/akka-http-tests/src/test/scala/akka/http/routing/TestServer.scala b/akka-http-tests/src/test/scala/akka/http/server/TestServer.scala
similarity index 98%
rename from akka-http-tests/src/test/scala/akka/http/routing/TestServer.scala
rename to akka-http-tests/src/test/scala/akka/http/server/TestServer.scala
index 60f7e2d339..3538dd3200 100644
--- a/akka-http-tests/src/test/scala/akka/http/routing/TestServer.scala
+++ b/akka-http-tests/src/test/scala/akka/http/server/TestServer.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import com.typesafe.config.{ ConfigFactory, Config }
 import scala.concurrent.duration._
diff --git a/akka-http-tests/src/test/scala/akka/http/routing/directives/BasicDirectivesSpec.scala b/akka-http-tests/src/test/scala/akka/http/server/directives/BasicDirectivesSpec.scala
similarity index 96%
rename from akka-http-tests/src/test/scala/akka/http/routing/directives/BasicDirectivesSpec.scala
rename to akka-http-tests/src/test/scala/akka/http/server/directives/BasicDirectivesSpec.scala
index 8392abf079..18a0fc37e5 100644
--- a/akka-http-tests/src/test/scala/akka/http/routing/directives/BasicDirectivesSpec.scala
+++ b/akka-http-tests/src/test/scala/akka/http/server/directives/BasicDirectivesSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 package directives
 
 class BasicDirectivesSpec extends RoutingSpec {
diff --git a/akka-http-tests/src/test/scala/akka/http/routing/directives/MethodDirectivesSpec.scala b/akka-http-tests/src/test/scala/akka/http/server/directives/MethodDirectivesSpec.scala
similarity index 97%
rename from akka-http-tests/src/test/scala/akka/http/routing/directives/MethodDirectivesSpec.scala
rename to akka-http-tests/src/test/scala/akka/http/server/directives/MethodDirectivesSpec.scala
index f0b70de0c7..0a391bf338 100644
--- a/akka-http-tests/src/test/scala/akka/http/routing/directives/MethodDirectivesSpec.scala
+++ b/akka-http-tests/src/test/scala/akka/http/server/directives/MethodDirectivesSpec.scala
@@ -2,10 +2,10 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.directives
+package akka.http.server.directives
 
 import akka.http.model.{ StatusCodes, HttpMethods }
-import akka.http.routing._
+import akka.http.server._
 
 class MethodDirectivesSpec extends RoutingSpec {
 
diff --git a/akka-http-tests/src/test/scala/akka/http/routing/directives/PathDirectivesSpec.scala b/akka-http-tests/src/test/scala/akka/http/server/directives/PathDirectivesSpec.scala
similarity index 99%
rename from akka-http-tests/src/test/scala/akka/http/routing/directives/PathDirectivesSpec.scala
rename to akka-http-tests/src/test/scala/akka/http/server/directives/PathDirectivesSpec.scala
index d0bccd2d8c..f472af4fd8 100644
--- a/akka-http-tests/src/test/scala/akka/http/routing/directives/PathDirectivesSpec.scala
+++ b/akka-http-tests/src/test/scala/akka/http/server/directives/PathDirectivesSpec.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.directives
+package akka.http.server.directives
 
-import akka.http.routing._
+import akka.http.server._
 
 class PathDirectivesSpec extends RoutingSpec {
   val echoUnmatchedPath = unmatchedPath { echoComplete }
diff --git a/akka-http-tests/src/test/scala/akka/http/routing/directives/RouteDirectivesSpec.scala b/akka-http-tests/src/test/scala/akka/http/server/directives/RouteDirectivesSpec.scala
similarity index 98%
rename from akka-http-tests/src/test/scala/akka/http/routing/directives/RouteDirectivesSpec.scala
rename to akka-http-tests/src/test/scala/akka/http/server/directives/RouteDirectivesSpec.scala
index 2b9e83bc44..ed754e197f 100644
--- a/akka-http-tests/src/test/scala/akka/http/routing/directives/RouteDirectivesSpec.scala
+++ b/akka-http-tests/src/test/scala/akka/http/server/directives/RouteDirectivesSpec.scala
@@ -2,13 +2,13 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.directives
+package akka.http.server.directives
 
 import org.scalatest.FreeSpec
 
 import scala.concurrent.Promise
 import akka.http.marshalling._
-import akka.http.routing._
+import akka.http.server._
 import akka.http.model._
 import akka.http.util._
 import headers._
diff --git a/akka-http/src/main/boilerplate/akka/http/routing/util/AppendOneInstances.scala.template b/akka-http/src/main/boilerplate/akka/http/server/util/AppendOneInstances.scala.template
similarity index 95%
rename from akka-http/src/main/boilerplate/akka/http/routing/util/AppendOneInstances.scala.template
rename to akka-http/src/main/boilerplate/akka/http/server/util/AppendOneInstances.scala.template
index c012ed0ec4..2a0bb36d92 100644
--- a/akka-http/src/main/boilerplate/akka/http/routing/util/AppendOneInstances.scala.template
+++ b/akka-http/src/main/boilerplate/akka/http/server/util/AppendOneInstances.scala.template
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.util
+package akka.http.server.util
 
 private[util] abstract class AppendOneInstances {
   type Aux[P, S, Out0] = AppendOne[P, S] { type Out = Out0 }
diff --git a/akka-http/src/main/boilerplate/akka/http/routing/util/ApplyConverterInstances.scala.template b/akka-http/src/main/boilerplate/akka/http/server/util/ApplyConverterInstances.scala.template
similarity index 84%
rename from akka-http/src/main/boilerplate/akka/http/routing/util/ApplyConverterInstances.scala.template
rename to akka-http/src/main/boilerplate/akka/http/server/util/ApplyConverterInstances.scala.template
index 8ce5614604..41ff22f33f 100644
--- a/akka-http/src/main/boilerplate/akka/http/routing/util/ApplyConverterInstances.scala.template
+++ b/akka-http/src/main/boilerplate/akka/http/server/util/ApplyConverterInstances.scala.template
@@ -2,9 +2,9 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.util
+package akka.http.server.util
 
-import akka.http.routing.Route
+import akka.http.server.Route
 
 private[util] abstract class ApplyConverterInstances {
   [#implicit def hac1[[#T1#]] = new ApplyConverter[Tuple1[[#T1#]]] {
diff --git a/akka-http/src/main/boilerplate/akka/http/routing/util/ConstructFromTupleInstances.scala.template b/akka-http/src/main/boilerplate/akka/http/server/util/ConstructFromTupleInstances.scala.template
similarity index 91%
rename from akka-http/src/main/boilerplate/akka/http/routing/util/ConstructFromTupleInstances.scala.template
rename to akka-http/src/main/boilerplate/akka/http/server/util/ConstructFromTupleInstances.scala.template
index b27af3c60f..5a1e9b4bf5 100644
--- a/akka-http/src/main/boilerplate/akka/http/routing/util/ConstructFromTupleInstances.scala.template
+++ b/akka-http/src/main/boilerplate/akka/http/server/util/ConstructFromTupleInstances.scala.template
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.util
+package akka.http.server.util
 
 trait ConstructFromTupleInstances {
   [#implicit def instance1[[#T1#], R](construct: ([#T1#]) => R): ConstructFromTuple[Tuple1[[#T1#]], R] =
diff --git a/akka-http/src/main/boilerplate/akka/http/routing/util/HeadTailInstances.scala.template b/akka-http/src/main/boilerplate/akka/http/server/util/HeadTailInstances.scala.template
similarity index 95%
rename from akka-http/src/main/boilerplate/akka/http/routing/util/HeadTailInstances.scala.template
rename to akka-http/src/main/boilerplate/akka/http/server/util/HeadTailInstances.scala.template
index f942c17dea..bf5e95def6 100644
--- a/akka-http/src/main/boilerplate/akka/http/routing/util/HeadTailInstances.scala.template
+++ b/akka-http/src/main/boilerplate/akka/http/server/util/HeadTailInstances.scala.template
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.util
+package akka.http.server.util
 
 private[util] abstract class HeadTailInstances {
   type Aux[L, H0, T0] = HeadTail[L] { type H = H0; type T = T0 }
diff --git a/akka-http/src/main/scala/akka/http/marshalling/MultipartMarshallers.scala b/akka-http/src/main/scala/akka/http/marshalling/MultipartMarshallers.scala
index 4c7caac565..9266f307ba 100644
--- a/akka-http/src/main/scala/akka/http/marshalling/MultipartMarshallers.scala
+++ b/akka-http/src/main/scala/akka/http/marshalling/MultipartMarshallers.scala
@@ -10,7 +10,7 @@ import akka.actor.ActorRefFactory
 import akka.parboiled2.util.Base64
 import akka.stream.{ FlattenStrategy, FlowMaterializer }
 import akka.stream.scaladsl.Flow
-import akka.http.rendering.BodyPartRenderer
+import akka.http.engine.rendering.BodyPartRenderer
 import akka.http.util.actorSystem
 import akka.http.model._
 import MediaTypes._
diff --git a/akka-http/src/main/scala/akka/http/routing/Directive.scala b/akka-http/src/main/scala/akka/http/server/Directive.scala
similarity index 97%
rename from akka-http/src/main/scala/akka/http/routing/Directive.scala
rename to akka-http/src/main/scala/akka/http/server/Directive.scala
index a334384ef9..869d6d375e 100644
--- a/akka-http/src/main/scala/akka/http/routing/Directive.scala
+++ b/akka-http/src/main/scala/akka/http/server/Directive.scala
@@ -2,10 +2,10 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
-import akka.http.routing.directives.RouteDirectives
-import akka.http.routing.util._
+import akka.http.server.directives.RouteDirectives
+import akka.http.server.util._
 
 trait ConjunctionMagnet[L] {
   type Out
diff --git a/akka-http/src/main/scala/akka/http/routing/Directives.scala b/akka-http/src/main/scala/akka/http/server/Directives.scala
similarity index 97%
rename from akka-http/src/main/scala/akka/http/routing/Directives.scala
rename to akka-http/src/main/scala/akka/http/server/Directives.scala
index 5cbee9e081..dbd4d0a3e2 100644
--- a/akka-http/src/main/scala/akka/http/routing/Directives.scala
+++ b/akka-http/src/main/scala/akka/http/server/Directives.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import directives._
 
diff --git a/akka-http/src/main/scala/akka/http/routing/ExceptionHandler.scala b/akka-http/src/main/scala/akka/http/server/ExceptionHandler.scala
similarity index 98%
rename from akka-http/src/main/scala/akka/http/routing/ExceptionHandler.scala
rename to akka-http/src/main/scala/akka/http/server/ExceptionHandler.scala
index bcfa562df0..6178848f60 100644
--- a/akka-http/src/main/scala/akka/http/routing/ExceptionHandler.scala
+++ b/akka-http/src/main/scala/akka/http/server/ExceptionHandler.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import scala.concurrent.ExecutionContext
 import scala.util.control.NonFatal
diff --git a/akka-http/src/main/scala/akka/http/routing/PathMatcher.scala b/akka-http/src/main/scala/akka/http/server/PathMatcher.scala
similarity index 99%
rename from akka-http/src/main/scala/akka/http/routing/PathMatcher.scala
rename to akka-http/src/main/scala/akka/http/server/PathMatcher.scala
index 1c94dbd1dc..fccdc1c54b 100644
--- a/akka-http/src/main/scala/akka/http/routing/PathMatcher.scala
+++ b/akka-http/src/main/scala/akka/http/server/PathMatcher.scala
@@ -2,12 +2,12 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import java.util.UUID
 import scala.util.matching.Regex
 import scala.annotation.tailrec
-import akka.http.routing.util.{ Tuple, Join }
+import akka.http.server.util.{ Tuple, Join }
 import akka.http.model.Uri.Path
 import akka.http.util._
 import directives.NameReceptacle
diff --git a/akka-http/src/main/scala/akka/http/routing/Rejection.scala b/akka-http/src/main/scala/akka/http/server/Rejection.scala
similarity index 98%
rename from akka-http/src/main/scala/akka/http/routing/Rejection.scala
rename to akka-http/src/main/scala/akka/http/server/Rejection.scala
index 39c17c699d..b989623b9e 100644
--- a/akka-http/src/main/scala/akka/http/routing/Rejection.scala
+++ b/akka-http/src/main/scala/akka/http/server/Rejection.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import akka.http.model._
 import akka.http.model.headers.{ ByteRange, HttpEncoding }
@@ -124,7 +124,7 @@ case class UnacceptedResponseContentTypeRejection(supported: Seq[ContentType]) e
 case class UnacceptedResponseEncodingRejection(supported: HttpEncoding) extends Rejection
 
 /**
- * Rejection created by an [[akka.http.routing.authentication.HttpAuthenticator]].
+ * Rejection created by an [[akka.http.server.authentication.HttpAuthenticator]].
  * Signals that the request was rejected because the user could not be authenticated. The reason for the rejection is
  * specified in the cause.
  */
diff --git a/akka-http/src/main/scala/akka/http/routing/RejectionHandler.scala b/akka-http/src/main/scala/akka/http/server/RejectionHandler.scala
similarity index 99%
rename from akka-http/src/main/scala/akka/http/routing/RejectionHandler.scala
rename to akka-http/src/main/scala/akka/http/server/RejectionHandler.scala
index c737dda941..752c3a87f1 100644
--- a/akka-http/src/main/scala/akka/http/routing/RejectionHandler.scala
+++ b/akka-http/src/main/scala/akka/http/server/RejectionHandler.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import scala.concurrent.ExecutionContext
 import akka.http.model._
diff --git a/akka-http/src/main/scala/akka/http/routing/RequestContext.scala b/akka-http/src/main/scala/akka/http/server/RequestContext.scala
similarity index 99%
rename from akka-http/src/main/scala/akka/http/routing/RequestContext.scala
rename to akka-http/src/main/scala/akka/http/server/RequestContext.scala
index 0d0bee12c0..2c480fb2bb 100644
--- a/akka-http/src/main/scala/akka/http/routing/RequestContext.scala
+++ b/akka-http/src/main/scala/akka/http/server/RequestContext.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import scala.collection.immutable
 import scala.concurrent.ExecutionContext
diff --git a/akka-http/src/main/scala/akka/http/routing/RequestContextImpl.scala b/akka-http/src/main/scala/akka/http/server/RequestContextImpl.scala
similarity index 99%
rename from akka-http/src/main/scala/akka/http/routing/RequestContextImpl.scala
rename to akka-http/src/main/scala/akka/http/server/RequestContextImpl.scala
index bf2a2cbc5e..284535e927 100644
--- a/akka-http/src/main/scala/akka/http/routing/RequestContextImpl.scala
+++ b/akka-http/src/main/scala/akka/http/server/RequestContextImpl.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import scala.collection.immutable
 import scala.concurrent.ExecutionContext
diff --git a/akka-http/src/main/scala/akka/http/routing/RouteConcatenation.scala b/akka-http/src/main/scala/akka/http/server/RouteConcatenation.scala
similarity index 96%
rename from akka-http/src/main/scala/akka/http/routing/RouteConcatenation.scala
rename to akka-http/src/main/scala/akka/http/server/RouteConcatenation.scala
index f8d8fb467a..9ed9305d2e 100644
--- a/akka-http/src/main/scala/akka/http/routing/RouteConcatenation.scala
+++ b/akka-http/src/main/scala/akka/http/server/RouteConcatenation.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 trait RouteConcatenation {
 
diff --git a/akka-http/src/main/scala/akka/http/routing/RouteResult.scala b/akka-http/src/main/scala/akka/http/server/RouteResult.scala
similarity index 97%
rename from akka-http/src/main/scala/akka/http/routing/RouteResult.scala
rename to akka-http/src/main/scala/akka/http/server/RouteResult.scala
index c22299e955..dc7507dbd3 100644
--- a/akka-http/src/main/scala/akka/http/routing/RouteResult.scala
+++ b/akka-http/src/main/scala/akka/http/server/RouteResult.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import akka.http.model.HttpResponse
 
diff --git a/akka-http/src/main/scala/akka/http/routing/RoutingSettings.scala b/akka-http/src/main/scala/akka/http/server/RoutingSettings.scala
similarity index 94%
rename from akka-http/src/main/scala/akka/http/routing/RoutingSettings.scala
rename to akka-http/src/main/scala/akka/http/server/RoutingSettings.scala
index 6217a26743..84cf40cfc8 100644
--- a/akka-http/src/main/scala/akka/http/routing/RoutingSettings.scala
+++ b/akka-http/src/main/scala/akka/http/server/RoutingSettings.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import com.typesafe.config.Config
 import akka.actor.ActorRefFactory
diff --git a/akka-http/src/main/scala/akka/http/routing/RoutingSetup.scala b/akka-http/src/main/scala/akka/http/server/RoutingSetup.scala
similarity index 98%
rename from akka-http/src/main/scala/akka/http/routing/RoutingSetup.scala
rename to akka-http/src/main/scala/akka/http/server/RoutingSetup.scala
index b0a7c30b68..7d4e170f75 100644
--- a/akka-http/src/main/scala/akka/http/routing/RoutingSetup.scala
+++ b/akka-http/src/main/scala/akka/http/server/RoutingSetup.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import scala.concurrent.ExecutionContext
 import akka.actor.{ ActorSystem, ActorContext }
diff --git a/akka-http/src/main/scala/akka/http/routing/ScalaRoutingDSL.scala b/akka-http/src/main/scala/akka/http/server/ScalaRoutingDSL.scala
similarity index 99%
rename from akka-http/src/main/scala/akka/http/routing/ScalaRoutingDSL.scala
rename to akka-http/src/main/scala/akka/http/server/ScalaRoutingDSL.scala
index 516404a230..9256f41657 100644
--- a/akka-http/src/main/scala/akka/http/routing/ScalaRoutingDSL.scala
+++ b/akka-http/src/main/scala/akka/http/server/ScalaRoutingDSL.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
 import akka.stream.FlowMaterializer
 
diff --git a/akka-http/src/main/scala/akka/http/routing/StandardRoute.scala b/akka-http/src/main/scala/akka/http/server/StandardRoute.scala
similarity index 92%
rename from akka-http/src/main/scala/akka/http/routing/StandardRoute.scala
rename to akka-http/src/main/scala/akka/http/server/StandardRoute.scala
index ca289a9a53..84adb40eb7 100644
--- a/akka-http/src/main/scala/akka/http/routing/StandardRoute.scala
+++ b/akka-http/src/main/scala/akka/http/server/StandardRoute.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 
-import akka.http.routing.util.Tuple
+import akka.http.server.util.Tuple
 
 /**
  * A Route that can be implicitly converted into a Directive (fitting any signature).
diff --git a/akka-http/src/main/scala/akka/http/routing/directives/BasicDirectives.scala b/akka-http/src/main/scala/akka/http/server/directives/BasicDirectives.scala
similarity index 98%
rename from akka-http/src/main/scala/akka/http/routing/directives/BasicDirectives.scala
rename to akka-http/src/main/scala/akka/http/server/directives/BasicDirectives.scala
index c490afcdc0..85eeb06560 100644
--- a/akka-http/src/main/scala/akka/http/routing/directives/BasicDirectives.scala
+++ b/akka-http/src/main/scala/akka/http/server/directives/BasicDirectives.scala
@@ -2,11 +2,11 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 package directives
 
 import scala.collection.immutable
-import akka.http.routing.util.Tuple
+import akka.http.server.util.Tuple
 import akka.http.model._
 
 trait BasicDirectives {
diff --git a/akka-http/src/main/scala/akka/http/routing/directives/ExecutionDirectives.scala b/akka-http/src/main/scala/akka/http/server/directives/ExecutionDirectives.scala
similarity index 92%
rename from akka-http/src/main/scala/akka/http/routing/directives/ExecutionDirectives.scala
rename to akka-http/src/main/scala/akka/http/server/directives/ExecutionDirectives.scala
index acfe403304..0bd9dc16c6 100644
--- a/akka-http/src/main/scala/akka/http/routing/directives/ExecutionDirectives.scala
+++ b/akka-http/src/main/scala/akka/http/server/directives/ExecutionDirectives.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 package directives
 
 trait ExecutionDirectives {
@@ -10,7 +10,7 @@ trait ExecutionDirectives {
 
   /**
    * Transforms exceptions thrown during evaluation of its inner route using the given
-   * [[akka.http.routing.ExceptionHandler]].
+   * [[akka.http.server.ExceptionHandler]].
    */
   def handleExceptions(handler: ExceptionHandler): Directive0 =
     mapInnerRoute { inner ⇒
@@ -26,7 +26,7 @@ trait ExecutionDirectives {
 
   /**
    * Transforms rejections produced by its inner route using the given
-   * [[akka.http.routing.RejectionHandler]].
+   * [[akka.http.server.RejectionHandler]].
    */
   def handleRejections(handler: RejectionHandler): Directive0 =
     mapRequestContext { ctx ⇒
diff --git a/akka-http/src/main/scala/akka/http/routing/directives/MethodDirectives.scala b/akka-http/src/main/scala/akka/http/server/directives/MethodDirectives.scala
similarity index 99%
rename from akka-http/src/main/scala/akka/http/routing/directives/MethodDirectives.scala
rename to akka-http/src/main/scala/akka/http/server/directives/MethodDirectives.scala
index 04469f5b34..c32034d1d3 100644
--- a/akka-http/src/main/scala/akka/http/routing/directives/MethodDirectives.scala
+++ b/akka-http/src/main/scala/akka/http/server/directives/MethodDirectives.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 package directives
 
 import akka.http.model.HttpMethod
diff --git a/akka-http/src/main/scala/akka/http/routing/directives/NameReceptacle.scala b/akka-http/src/main/scala/akka/http/server/directives/NameReceptacle.scala
similarity index 98%
rename from akka-http/src/main/scala/akka/http/routing/directives/NameReceptacle.scala
rename to akka-http/src/main/scala/akka/http/server/directives/NameReceptacle.scala
index f33d6e0f5f..ade7936792 100644
--- a/akka-http/src/main/scala/akka/http/routing/directives/NameReceptacle.scala
+++ b/akka-http/src/main/scala/akka/http/server/directives/NameReceptacle.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 package directives
 
 import akka.http.unmarshalling.{ FromStringOptionDeserializer ⇒ FSOD, Deserializer }
diff --git a/akka-http/src/main/scala/akka/http/routing/directives/PathDirectives.scala b/akka-http/src/main/scala/akka/http/server/directives/PathDirectives.scala
similarity index 88%
rename from akka-http/src/main/scala/akka/http/routing/directives/PathDirectives.scala
rename to akka-http/src/main/scala/akka/http/server/directives/PathDirectives.scala
index c12f3aaf57..d60b8cff71 100644
--- a/akka-http/src/main/scala/akka/http/routing/directives/PathDirectives.scala
+++ b/akka-http/src/main/scala/akka/http/server/directives/PathDirectives.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 package directives
 
 trait PathDirectives extends PathMatchers with ImplicitPathMatcherConstruction with ToNameReceptacleEnhancements {
@@ -11,7 +11,7 @@ trait PathDirectives extends PathMatchers with ImplicitPathMatcherConstruction w
   import PathMatcher._
 
   /**
-   * Consumes a leading slash from the unmatched path of the [[akka.http.routing.RequestContext]]
+   * Consumes a leading slash from the unmatched path of the [[akka.http.server.RequestContext]]
    * before applying the given matcher. The matcher has to match the remaining path completely
    * or leave only a single trailing slash.
    * If matched the value extracted by the PathMatcher is extracted on the directive level.
@@ -19,14 +19,14 @@ trait PathDirectives extends PathMatchers with ImplicitPathMatcherConstruction w
   def path[L](pm: PathMatcher[L]): Directive[L] = pathPrefix(pm ~ PathEnd)
 
   /**
-   * Consumes a leading slash from the unmatched path of the [[akka.http.routing.RequestContext]]
+   * Consumes a leading slash from the unmatched path of the [[akka.http.server.RequestContext]]
    * before applying the given matcher. The matcher has to match a prefix of the remaining path.
    * If matched the value extracted by the PathMatcher is extracted on the directive level.
    */
   def pathPrefix[L](pm: PathMatcher[L]): Directive[L] = rawPathPrefix(Slash ~ pm)
 
   /**
-   * Applies the given matcher directly to the unmatched path of the [[akka.http.routing.RequestContext]]
+   * Applies the given matcher directly to the unmatched path of the [[akka.http.server.RequestContext]]
    * (i.e. without implicitly consuming a leading slash).
    * The matcher has to match a prefix of the remaining path.
    * If matched the value extracted by the PathMatcher is extracted on the directive level.
@@ -40,13 +40,13 @@ trait PathDirectives extends PathMatchers with ImplicitPathMatcherConstruction w
   }
 
   /**
-   * Checks whether the unmatchedPath of the [[akka.http.routing.RequestContext]] has a prefix matched by the
+   * Checks whether the unmatchedPath of the [[akka.http.server.RequestContext]] has a prefix matched by the
    * given PathMatcher. In analogy to the `pathPrefix` directive a leading slash is implied.
    */
   def pathPrefixTest[L](pm: PathMatcher[L]): Directive[L] = rawPathPrefixTest(Slash ~ pm)
 
   /**
-   * Checks whether the unmatchedPath of the [[akka.http.routing.RequestContext]] has a prefix matched by the
+   * Checks whether the unmatchedPath of the [[akka.http.server.RequestContext]] has a prefix matched by the
    * given PathMatcher. However, as opposed to the `pathPrefix` directive the matched path is not
    * actually "consumed".
    */
@@ -59,7 +59,7 @@ trait PathDirectives extends PathMatchers with ImplicitPathMatcherConstruction w
   }
 
   /**
-   * Rejects the request if the unmatchedPath of the [[akka.http.routing.RequestContext]] does not have a suffix
+   * Rejects the request if the unmatchedPath of the [[akka.http.server.RequestContext]] does not have a suffix
    * matched the given PathMatcher. If matched the value extracted by the PathMatcher is extracted
    * and the matched parts of the path are consumed.
    * Note that, for efficiency reasons, the given PathMatcher must match the desired suffix in reversed-segment
@@ -74,7 +74,7 @@ trait PathDirectives extends PathMatchers with ImplicitPathMatcherConstruction w
   }
 
   /**
-   * Checks whether the unmatchedPath of the [[akka.http.routing.RequestContext]] has a suffix matched by the
+   * Checks whether the unmatchedPath of the [[akka.http.server.RequestContext]] has a suffix matched by the
    * given PathMatcher. However, as opposed to the pathSuffix directive the matched path is not
    * actually "consumed".
    * Note that, for efficiency reasons, the given PathMatcher must match the desired suffix in reversed-segment
@@ -89,7 +89,7 @@ trait PathDirectives extends PathMatchers with ImplicitPathMatcherConstruction w
   }
 
   /**
-   * Rejects the request if the unmatchedPath of the [[akka.http.routing.RequestContext]] is non-empty,
+   * Rejects the request if the unmatchedPath of the [[akka.http.server.RequestContext]] is non-empty,
    * or said differently: only passes on the request to its inner route if the request path
    * has been matched completely.
    */
diff --git a/akka-http/src/main/scala/akka/http/routing/directives/RouteDirectives.scala b/akka-http/src/main/scala/akka/http/server/directives/RouteDirectives.scala
similarity index 98%
rename from akka-http/src/main/scala/akka/http/routing/directives/RouteDirectives.scala
rename to akka-http/src/main/scala/akka/http/server/directives/RouteDirectives.scala
index dad8f7b7da..6f6585a41e 100644
--- a/akka-http/src/main/scala/akka/http/routing/directives/RouteDirectives.scala
+++ b/akka-http/src/main/scala/akka/http/server/directives/RouteDirectives.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing
+package akka.http.server
 package directives
 
 import akka.http.marshalling.ToResponseMarshallable
diff --git a/akka-http/src/main/scala/akka/http/routing/package.scala b/akka-http/src/main/scala/akka/http/server/package.scala
similarity index 95%
rename from akka-http/src/main/scala/akka/http/routing/package.scala
rename to akka-http/src/main/scala/akka/http/server/package.scala
index f60e1d247a..7282692dd3 100644
--- a/akka-http/src/main/scala/akka/http/routing/package.scala
+++ b/akka-http/src/main/scala/akka/http/server/package.scala
@@ -6,7 +6,7 @@ package akka.http
 
 import akka.http.util.Deferrable
 
-package object routing {
+package object server {
 
   type Route = RequestContext ⇒ Deferrable[RouteResult]
   type RouteGenerator[T] = T ⇒ Route
diff --git a/akka-http/src/main/scala/akka/http/routing/util/ApplyConverter.scala b/akka-http/src/main/scala/akka/http/server/util/ApplyConverter.scala
similarity index 85%
rename from akka-http/src/main/scala/akka/http/routing/util/ApplyConverter.scala
rename to akka-http/src/main/scala/akka/http/server/util/ApplyConverter.scala
index ed019926e2..b9ddbcbc00 100644
--- a/akka-http/src/main/scala/akka/http/routing/util/ApplyConverter.scala
+++ b/akka-http/src/main/scala/akka/http/server/util/ApplyConverter.scala
@@ -2,9 +2,9 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.util
+package akka.http.server.util
 
-import akka.http.routing._
+import akka.http.server._
 
 /**
  * ApplyConverter allows generic conversion of functions of type `(T1, T2, ...) => Route` to
diff --git a/akka-http/src/main/scala/akka/http/routing/util/ConstructFromTuple.scala b/akka-http/src/main/scala/akka/http/server/util/ConstructFromTuple.scala
similarity index 86%
rename from akka-http/src/main/scala/akka/http/routing/util/ConstructFromTuple.scala
rename to akka-http/src/main/scala/akka/http/server/util/ConstructFromTuple.scala
index 9bbf27c976..9b8f3bc2c7 100644
--- a/akka-http/src/main/scala/akka/http/routing/util/ConstructFromTuple.scala
+++ b/akka-http/src/main/scala/akka/http/server/util/ConstructFromTuple.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.util
+package akka.http.server.util
 
 trait ConstructFromTuple[T, R] {
   def apply(t: T): R
diff --git a/akka-http/src/main/scala/akka/http/routing/util/Join.scala b/akka-http/src/main/scala/akka/http/server/util/Join.scala
similarity index 98%
rename from akka-http/src/main/scala/akka/http/routing/util/Join.scala
rename to akka-http/src/main/scala/akka/http/server/util/Join.scala
index 00152dcece..6548f153bd 100644
--- a/akka-http/src/main/scala/akka/http/routing/util/Join.scala
+++ b/akka-http/src/main/scala/akka/http/server/util/Join.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.util
+package akka.http.server.util
 
 /**
  * `Join` is implicit evidence that tuples `P` and `S` can be joined into tuple `Out`
diff --git a/akka-http/src/main/scala/akka/http/routing/util/Tuple.scala b/akka-http/src/main/scala/akka/http/server/util/Tuple.scala
similarity index 98%
rename from akka-http/src/main/scala/akka/http/routing/util/Tuple.scala
rename to akka-http/src/main/scala/akka/http/server/util/Tuple.scala
index 65d97ad722..25777b0185 100644
--- a/akka-http/src/main/scala/akka/http/routing/util/Tuple.scala
+++ b/akka-http/src/main/scala/akka/http/server/util/Tuple.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.util
+package akka.http.server.util
 
 /**
  * Phantom type providing implicit evidence that a given type is a Tuple or Unit.
diff --git a/akka-http/src/main/scala/akka/http/routing/util/Tupler.scala b/akka-http/src/main/scala/akka/http/server/util/Tupler.scala
similarity index 89%
rename from akka-http/src/main/scala/akka/http/routing/util/Tupler.scala
rename to akka-http/src/main/scala/akka/http/server/util/Tupler.scala
index 175676a98f..a915bc23d9 100644
--- a/akka-http/src/main/scala/akka/http/routing/util/Tupler.scala
+++ b/akka-http/src/main/scala/akka/http/server/util/Tupler.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.routing.util
+package akka.http.server.util
 
 /**
  * Provides a way to convert a value into an Tuple.
@@ -23,7 +23,7 @@ object Tupler extends LowerPriorityTupler {
     }
 }
 
-private[routing] abstract class LowerPriorityTupler {
+private[server] abstract class LowerPriorityTupler {
   implicit def forAnyRef[T] =
     new Tupler[T] {
       type Out = Tuple1[T]
diff --git a/akka-http/src/main/scala/akka/http/unmarshalling/Deserializer.scala b/akka-http/src/main/scala/akka/http/unmarshalling/Deserializer.scala
index 5b74cd1fb4..1fe5f6b2b6 100644
--- a/akka-http/src/main/scala/akka/http/unmarshalling/Deserializer.scala
+++ b/akka-http/src/main/scala/akka/http/unmarshalling/Deserializer.scala
@@ -4,7 +4,7 @@
 
 package akka.http.unmarshalling
 
-import akka.http.routing
+import akka.http.server
 
 import scala.concurrent.{ ExecutionContext, Future }
 
@@ -27,8 +27,8 @@ object Deserializer extends FromStringDeserializers {
       }
     }
 
-  implicit def liftFromStringDeserializer[T: FromStringDeserializer]: FromStringOptionDeserializer[T] = routing.FIXME
-  implicit def liftFromStringDeserializerConversion[T](f: FromStringDeserializer[T]): FromStringOptionDeserializer[T] = routing.FIXME
+  implicit def liftFromStringDeserializer[T: FromStringDeserializer]: FromStringOptionDeserializer[T] = server.FIXME
+  implicit def liftFromStringDeserializerConversion[T](f: FromStringDeserializer[T]): FromStringOptionDeserializer[T] = server.FIXME
 }
 
 trait DeserializationError extends RuntimeException
@@ -39,7 +39,7 @@ case class UnsupportedContentType(errorMessage: String) extends DeserializationE
 case class MalformedContent(errorMessage: String, cause: Option[Throwable] = None) extends DeserializationError
 
 trait FromStringDeserializers {
-  implicit def String2IntConverter: FromStringDeserializer[Int] = routing.FIXME
-  def HexInt: FromStringDeserializer[Int] = routing.FIXME
+  implicit def String2IntConverter: FromStringDeserializer[Int] = server.FIXME
+  def HexInt: FromStringDeserializer[Int] = server.FIXME
 }
 object FromStringDeserializers extends FromStringDeserializers
\ No newline at end of file
diff --git a/akka-http/src/main/scala/akka/http/unmarshalling/MultipartUnmarshallers.scala b/akka-http/src/main/scala/akka/http/unmarshalling/MultipartUnmarshallers.scala
index 94b52e81a0..55e1b39178 100644
--- a/akka-http/src/main/scala/akka/http/unmarshalling/MultipartUnmarshallers.scala
+++ b/akka-http/src/main/scala/akka/http/unmarshalling/MultipartUnmarshallers.scala
@@ -8,7 +8,7 @@ import org.reactivestreams.Publisher
 import akka.actor.ActorRefFactory
 import akka.stream.FlowMaterializer
 import akka.stream.scaladsl.Flow
-import akka.http.parsing.BodyPartParser
+import akka.http.engine.parsing.BodyPartParser
 import akka.http.model._
 import akka.http.util._
 import MediaRanges._