diff --git a/akka-http-core/src/main/scala/akka/http/Http.scala b/akka-http-core/src/main/scala/akka/http/Http.scala
index 4d38289902..c1101e33a4 100644
--- a/akka-http-core/src/main/scala/akka/http/Http.scala
+++ b/akka-http-core/src/main/scala/akka/http/Http.scala
@@ -10,8 +10,8 @@ import org.reactivestreams.{ Publisher, Subscriber }
 import scala.collection.immutable
 import akka.io.Inet
 import akka.stream.MaterializerSettings
-import akka.http.client.{ HttpClientProcessor, ClientConnectionSettings }
-import akka.http.server.ServerSettings
+import akka.http.engine.client.{ HttpClientProcessor, ClientConnectionSettings }
+import akka.http.engine.server.ServerSettings
 import akka.http.model.{ HttpResponse, HttpRequest, japi }
 import akka.http.util._
 import akka.actor._
diff --git a/akka-http-core/src/main/scala/akka/http/HttpManager.scala b/akka-http-core/src/main/scala/akka/http/HttpManager.scala
index 9cff4c28ff..e0404b7082 100644
--- a/akka-http-core/src/main/scala/akka/http/HttpManager.scala
+++ b/akka-http-core/src/main/scala/akka/http/HttpManager.scala
@@ -7,8 +7,8 @@ package akka.http
 import scala.util.{ Failure, Success }
 import scala.concurrent.duration._
 import akka.actor._
-import akka.http.client._
-import akka.http.server.{ HttpServerPipeline, ServerSettings }
+import akka.http.engine.client._
+import akka.http.engine.server.{ HttpServerPipeline, ServerSettings }
 import akka.io.IO
 import akka.pattern.ask
 import akka.stream.FlowMaterializer
diff --git a/akka-http-core/src/main/scala/akka/http/engine/client/ClientConnectionSettings.scala b/akka-http-core/src/main/scala/akka/http/engine/client/ClientConnectionSettings.scala
index f413e3c14c..a2b97716da 100644
--- a/akka-http-core/src/main/scala/akka/http/engine/client/ClientConnectionSettings.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/client/ClientConnectionSettings.scala
@@ -2,13 +2,13 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.client
+package akka.http.engine.client
 
 import com.typesafe.config.Config
 import scala.concurrent.duration.{ FiniteDuration, Duration }
 import akka.actor.ActorRefFactory
 import akka.http.model.headers.`User-Agent`
-import akka.http.parsing.ParserSettings
+import akka.http.engine.parsing.ParserSettings
 import akka.http.util._
 
 final case class ClientConnectionSettings(
diff --git a/akka-http-core/src/main/scala/akka/http/engine/client/HttpClientPipeline.scala b/akka-http-core/src/main/scala/akka/http/engine/client/HttpClientPipeline.scala
index e0fca9a9d5..200f809368 100644
--- a/akka-http-core/src/main/scala/akka/http/engine/client/HttpClientPipeline.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/client/HttpClientPipeline.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.client
+package akka.http.engine.client
 
 import java.net.InetSocketAddress
 import scala.collection.immutable.Queue
@@ -12,9 +12,9 @@ import akka.stream.io.StreamTcp
 import akka.stream.scaladsl.{ Flow, Duct }
 import akka.http.Http
 import akka.http.model.{ HttpMethod, HttpRequest, ErrorInfo, HttpResponse }
-import akka.http.rendering.{ RequestRenderingContext, HttpRequestRendererFactory }
-import akka.http.parsing.HttpResponseParser
-import akka.http.parsing.ParserOutput._
+import akka.http.engine.rendering.{ RequestRenderingContext, HttpRequestRendererFactory }
+import akka.http.engine.parsing.HttpResponseParser
+import akka.http.engine.parsing.ParserOutput._
 import akka.http.util._
 
 /**
diff --git a/akka-http-core/src/main/scala/akka/http/engine/client/HttpClientProcessor.scala b/akka-http-core/src/main/scala/akka/http/engine/client/HttpClientProcessor.scala
index 057c452078..ac0cddd68f 100644
--- a/akka-http-core/src/main/scala/akka/http/engine/client/HttpClientProcessor.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/client/HttpClientProcessor.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.client
+package akka.http.engine.client
 
 import akka.http.model.{ HttpResponse, HttpRequest }
 import org.reactivestreams.{ Subscription, Publisher, Subscriber, Processor }
diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/BodyPartParser.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/BodyPartParser.scala
index 570d171b3b..198693026d 100644
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/BodyPartParser.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/BodyPartParser.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.parsing
+package akka.http.engine.parsing
 
 import org.reactivestreams.Publisher
 import scala.annotation.tailrec
diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/BoyerMoore.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/BoyerMoore.scala
index ced45eac29..9360ce1001 100644
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/BoyerMoore.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/BoyerMoore.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.parsing
+package akka.http.engine.parsing
 
 import scala.annotation.tailrec
 import akka.util.ByteString
diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpHeaderParser.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpHeaderParser.scala
index d5618732e3..5ab431b75b 100644
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpHeaderParser.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpHeaderParser.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.parsing
+package akka.http.engine.parsing
 
 import java.util.Arrays.copyOf
 import java.lang.{ StringBuilder ⇒ JStringBuilder }
diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpMessageParser.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpMessageParser.scala
index 1d43ca24ad..58d17b03e5 100644
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpMessageParser.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpMessageParser.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.parsing
+package akka.http.engine.parsing
 
 import org.reactivestreams.Publisher
 import scala.annotation.tailrec
diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpRequestParser.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpRequestParser.scala
index ed9cd1822c..8d754f601b 100644
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpRequestParser.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpRequestParser.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.parsing
+package akka.http.engine.parsing
 
 import java.lang.{ StringBuilder ⇒ JStringBuilder }
 import org.reactivestreams.Publisher
diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpResponseParser.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpResponseParser.scala
index bae647f0f6..95b5e1073c 100644
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpResponseParser.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpResponseParser.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.parsing
+package akka.http.engine.parsing
 
 import org.reactivestreams.Publisher
 import scala.annotation.tailrec
diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/ParserOutput.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/ParserOutput.scala
index c6921fc745..5c956ae81c 100644
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/ParserOutput.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/ParserOutput.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.parsing
+package akka.http.engine.parsing
 
 import org.reactivestreams.Publisher
 import akka.http.model._
diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/ParserSettings.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/ParserSettings.scala
index 0b417cf969..43f8f20d8e 100644
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/ParserSettings.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/ParserSettings.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.parsing
+package akka.http.engine.parsing
 
 import com.typesafe.config.Config
 import scala.collection.JavaConverters._
diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/SpecializedHeaderValueParsers.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/SpecializedHeaderValueParsers.scala
index 6349478935..35f90d6228 100644
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/SpecializedHeaderValueParsers.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/SpecializedHeaderValueParsers.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.parsing
+package akka.http.engine.parsing
 
 import scala.annotation.tailrec
 import akka.util.ByteString
diff --git a/akka-http-core/src/main/scala/akka/http/engine/parsing/package.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/package.scala
index 5e82234018..f65b10107f 100644
--- a/akka-http-core/src/main/scala/akka/http/engine/parsing/package.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/parsing/package.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http
+package akka.http.engine
 
 import java.lang.{ StringBuilder ⇒ JStringBuilder }
 import scala.annotation.tailrec
diff --git a/akka-http-core/src/main/scala/akka/http/engine/rendering/BodyPartRenderer.scala b/akka-http-core/src/main/scala/akka/http/engine/rendering/BodyPartRenderer.scala
index a10106b3bb..164414c3b1 100644
--- a/akka-http-core/src/main/scala/akka/http/engine/rendering/BodyPartRenderer.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/rendering/BodyPartRenderer.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.rendering
+package akka.http.engine.rendering
 
 import java.nio.charset.Charset
 import org.reactivestreams.Publisher
@@ -10,7 +10,7 @@ import scala.annotation.tailrec
 import akka.event.LoggingAdapter
 import akka.http.model._
 import akka.http.model.headers._
-import akka.http.rendering.RenderSupport._
+import akka.http.engine.rendering.RenderSupport._
 import akka.http.util._
 import akka.stream.impl.SynchronousPublisherFromIterable
 import akka.stream.scaladsl.Flow
diff --git a/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpRequestRendererFactory.scala b/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpRequestRendererFactory.scala
index 411d32eb96..e2e5869783 100644
--- a/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpRequestRendererFactory.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpRequestRendererFactory.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.rendering
+package akka.http.engine.rendering
 
 import java.net.InetSocketAddress
 import org.reactivestreams.Publisher
diff --git a/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpResponseRendererFactory.scala b/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpResponseRendererFactory.scala
index 743a244c61..311cc1c614 100644
--- a/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpResponseRendererFactory.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpResponseRendererFactory.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.rendering
+package akka.http.engine.rendering
 
 import org.reactivestreams.Publisher
 import scala.annotation.tailrec
diff --git a/akka-http-core/src/main/scala/akka/http/engine/rendering/RenderSupport.scala b/akka-http-core/src/main/scala/akka/http/engine/rendering/RenderSupport.scala
index 61dab1a727..af670d28a4 100644
--- a/akka-http-core/src/main/scala/akka/http/engine/rendering/RenderSupport.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/rendering/RenderSupport.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.rendering
+package akka.http.engine.rendering
 
 import org.reactivestreams.Publisher
 import akka.parboiled2.CharUtils
diff --git a/akka-http-core/src/main/scala/akka/http/engine/server/HttpServerPipeline.scala b/akka-http-core/src/main/scala/akka/http/engine/server/HttpServerPipeline.scala
index 5ad6d8876f..b4fd781f31 100644
--- a/akka-http-core/src/main/scala/akka/http/engine/server/HttpServerPipeline.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/server/HttpServerPipeline.scala
@@ -2,17 +2,17 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.server
+package akka.http.engine.server
 
 import org.reactivestreams.Publisher
 import akka.event.LoggingAdapter
 import akka.stream.io.StreamTcp
 import akka.stream.{ FlattenStrategy, Transformer, FlowMaterializer }
 import akka.stream.scaladsl.{ Flow, Duct }
-import akka.http.parsing.HttpRequestParser
-import akka.http.rendering.{ ResponseRenderingContext, HttpResponseRendererFactory }
+import akka.http.engine.parsing.HttpRequestParser
+import akka.http.engine.rendering.{ ResponseRenderingContext, HttpResponseRendererFactory }
 import akka.http.model.{ StatusCode, ErrorInfo, HttpRequest, HttpResponse }
-import akka.http.parsing.ParserOutput._
+import akka.http.engine.parsing.ParserOutput._
 import akka.http.Http
 import akka.http.util._
 
diff --git a/akka-http-core/src/main/scala/akka/http/engine/server/ServerSettings.scala b/akka-http-core/src/main/scala/akka/http/engine/server/ServerSettings.scala
index b14db09deb..98db65dfb6 100644
--- a/akka-http-core/src/main/scala/akka/http/engine/server/ServerSettings.scala
+++ b/akka-http-core/src/main/scala/akka/http/engine/server/ServerSettings.scala
@@ -2,13 +2,13 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.server
+package akka.http.engine.server
 
 import language.implicitConversions
 import com.typesafe.config.Config
 import scala.concurrent.duration._
 import akka.actor.ActorRefFactory
-import akka.http.parsing.ParserSettings
+import akka.http.engine.parsing.ParserSettings
 import akka.http.model.parser.HeaderParser
 import akka.http.model.headers.{ Server, Host, RawHeader }
 import akka.http.util._
diff --git a/akka-http-core/src/test/scala/akka/http/ClientServerSpec.scala b/akka-http-core/src/test/scala/akka/http/ClientServerSpec.scala
index 91c5fb847a..11d2d98a74 100644
--- a/akka-http-core/src/test/scala/akka/http/ClientServerSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/ClientServerSpec.scala
@@ -19,8 +19,8 @@ import akka.stream.impl.SynchronousPublisherFromIterable
 import akka.stream.scaladsl.Flow
 import akka.stream.testkit.StreamTestKit
 import akka.stream.testkit.StreamTestKit.{ PublisherProbe, SubscriberProbe }
-import akka.http.client.ClientConnectionSettings
-import akka.http.server.ServerSettings
+import akka.http.engine.client.ClientConnectionSettings
+import akka.http.engine.server.ServerSettings
 import akka.http.model._
 import akka.http.util._
 import headers._
diff --git a/akka-http-core/src/test/scala/akka/http/TestClient.scala b/akka-http-core/src/test/scala/akka/http/TestClient.scala
index dee95473f2..615bba8da2 100644
--- a/akka-http-core/src/test/scala/akka/http/TestClient.scala
+++ b/akka-http-core/src/test/scala/akka/http/TestClient.scala
@@ -4,19 +4,18 @@
 
 package akka.http
 
-import akka.actor.ActorSystem
-import akka.http.model.HttpMethods._
-import akka.http.model._
-import akka.io.IO
-import akka.pattern.ask
-import akka.stream.FlowMaterializer
-import akka.stream.scaladsl.Flow
-import akka.util.Timeout
 import com.typesafe.config.{ Config, ConfigFactory }
-
 import scala.concurrent.Future
 import scala.concurrent.duration._
 import scala.util.{ Failure, Success }
+import akka.actor.ActorSystem
+import akka.pattern.ask
+import akka.util.Timeout
+import akka.stream.FlowMaterializer
+import akka.stream.scaladsl.Flow
+import akka.io.IO
+import akka.http.model.HttpMethods._
+import akka.http.model._
 
 object TestClient extends App {
   val testConf: Config = ConfigFactory.parseString("""
diff --git a/akka-http-core/src/test/scala/akka/http/TestServer.scala b/akka-http-core/src/test/scala/akka/http/TestServer.scala
index 87e1d0a17a..07272d678a 100644
--- a/akka-http-core/src/test/scala/akka/http/TestServer.scala
+++ b/akka-http-core/src/test/scala/akka/http/TestServer.scala
@@ -7,13 +7,13 @@ package akka.http
 import com.typesafe.config.{ ConfigFactory, Config }
 import scala.concurrent.duration._
 import akka.stream.scaladsl.Flow
+import akka.stream.FlowMaterializer
 import akka.io.IO
 import akka.util.Timeout
 import akka.actor.ActorSystem
 import akka.pattern.ask
 import akka.http.model._
 import HttpMethods._
-import akka.stream.{ MaterializerSettings, FlowMaterializer }
 
 object TestServer extends App {
   val testConf: Config = ConfigFactory.parseString("""
diff --git a/akka-http-core/src/test/scala/akka/http/engine/parsing/BoyerMooreSpec.scala b/akka-http-core/src/test/scala/akka/http/engine/parsing/BoyerMooreSpec.scala
index 26af7378c4..e0418444a5 100644
--- a/akka-http-core/src/test/scala/akka/http/engine/parsing/BoyerMooreSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/engine/parsing/BoyerMooreSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.parsing
+package akka.http.engine.parsing
 
 import java.util.regex.Pattern
 
diff --git a/akka-http-core/src/test/scala/akka/http/engine/parsing/ContentLengthHeaderParserSpec.scala b/akka-http-core/src/test/scala/akka/http/engine/parsing/ContentLengthHeaderParserSpec.scala
index 8ea663b935..349896d2c0 100644
--- a/akka-http-core/src/test/scala/akka/http/engine/parsing/ContentLengthHeaderParserSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/engine/parsing/ContentLengthHeaderParserSpec.scala
@@ -2,12 +2,12 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.parsing
+package akka.http.engine.parsing
 
 import org.scalatest.{ WordSpec, Matchers }
 import akka.util.ByteString
 import akka.http.model.headers.`Content-Length`
-import akka.http.parsing.SpecializedHeaderValueParsers.ContentLengthParser
+import akka.http.engine.parsing.SpecializedHeaderValueParsers.ContentLengthParser
 
 class ContentLengthHeaderParserSpec extends WordSpec with Matchers {
 
diff --git a/akka-http-core/src/test/scala/akka/http/engine/parsing/HttpHeaderParserSpec.scala b/akka-http-core/src/test/scala/akka/http/engine/parsing/HttpHeaderParserSpec.scala
index b82bcfc40e..c9ce3979b9 100644
--- a/akka-http-core/src/test/scala/akka/http/engine/parsing/HttpHeaderParserSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/engine/parsing/HttpHeaderParserSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.parsing
+package akka.http.engine.parsing
 
 import java.lang.{ StringBuilder ⇒ JStringBuilder }
 import com.typesafe.config.{ ConfigFactory, Config }
diff --git a/akka-http-core/src/test/scala/akka/http/engine/parsing/RequestParserSpec.scala b/akka-http-core/src/test/scala/akka/http/engine/parsing/RequestParserSpec.scala
index 0aff37d28c..e567302996 100644
--- a/akka-http-core/src/test/scala/akka/http/engine/parsing/RequestParserSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/engine/parsing/RequestParserSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.parsing
+package akka.http.engine.parsing
 
 import com.typesafe.config.{ ConfigFactory, Config }
 import scala.concurrent.{ Future, Await }
diff --git a/akka-http-core/src/test/scala/akka/http/engine/parsing/ResponseParserSpec.scala b/akka-http-core/src/test/scala/akka/http/engine/parsing/ResponseParserSpec.scala
index 02e1b64a9e..e1551686fb 100644
--- a/akka-http-core/src/test/scala/akka/http/engine/parsing/ResponseParserSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/engine/parsing/ResponseParserSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.parsing
+package akka.http.engine.parsing
 
 import com.typesafe.config.{ ConfigFactory, Config }
 import scala.concurrent.{ Future, Await }
diff --git a/akka-http-core/src/test/scala/akka/http/engine/rendering/RequestRendererSpec.scala b/akka-http-core/src/test/scala/akka/http/engine/rendering/RequestRendererSpec.scala
index 96563bd49d..484d291f95 100644
--- a/akka-http-core/src/test/scala/akka/http/engine/rendering/RequestRendererSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/engine/rendering/RequestRendererSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.rendering
+package akka.http.engine.rendering
 
 import com.typesafe.config.{ Config, ConfigFactory }
 import java.net.InetSocketAddress
diff --git a/akka-http-core/src/test/scala/akka/http/engine/rendering/ResponseRendererSpec.scala b/akka-http-core/src/test/scala/akka/http/engine/rendering/ResponseRendererSpec.scala
index 9401434119..b34fd2e9e7 100644
--- a/akka-http-core/src/test/scala/akka/http/engine/rendering/ResponseRendererSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/engine/rendering/ResponseRendererSpec.scala
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.rendering
+package akka.http.engine.rendering
 
 import com.typesafe.config.{ Config, ConfigFactory }
 import scala.concurrent.duration._
diff --git a/akka-http-core/src/test/scala/akka/http/engine/server/HttpServerPipelineSpec.scala b/akka-http-core/src/test/scala/akka/http/engine/server/HttpServerPipelineSpec.scala
index c1ae0d8431..232613936f 100644
--- a/akka-http-core/src/test/scala/akka/http/engine/server/HttpServerPipelineSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/engine/server/HttpServerPipelineSpec.scala
@@ -2,8 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http
-package server
+package akka.http.engine.server
 
 import scala.concurrent.duration._
 import akka.event.NoLogging
@@ -11,6 +10,7 @@ import akka.http.model.HttpEntity.{ Chunk, ChunkStreamPart, LastChunk }
 import akka.http.model._
 import akka.http.model.headers.Host
 import akka.http.util._
+import akka.http.Http
 import akka.stream.FlowMaterializer
 import akka.stream.io.StreamTcp
 import akka.stream.testkit.{ AkkaSpec, StreamTestKit }