diff --git a/akka-http-core/src/main/scala/akka/http/client/ClientConnectionSettings.scala b/akka-http-core/src/main/scala/akka/http/engine/client/ClientConnectionSettings.scala
similarity index 100%
rename from akka-http-core/src/main/scala/akka/http/client/ClientConnectionSettings.scala
rename to akka-http-core/src/main/scala/akka/http/engine/client/ClientConnectionSettings.scala
diff --git a/akka-http-core/src/main/scala/akka/http/client/HttpClientPipeline.scala b/akka-http-core/src/main/scala/akka/http/engine/client/HttpClientPipeline.scala
similarity index 100%
rename from akka-http-core/src/main/scala/akka/http/client/HttpClientPipeline.scala
rename to akka-http-core/src/main/scala/akka/http/engine/client/HttpClientPipeline.scala
diff --git a/akka-http-core/src/main/scala/akka/http/client/HttpClientProcessor.scala b/akka-http-core/src/main/scala/akka/http/engine/client/HttpClientProcessor.scala
similarity index 100%
rename from akka-http-core/src/main/scala/akka/http/client/HttpClientProcessor.scala
rename to akka-http-core/src/main/scala/akka/http/engine/client/HttpClientProcessor.scala
diff --git a/akka-http-core/src/main/scala/akka/http/parsing/BodyPartParser.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/BodyPartParser.scala
similarity index 100%
rename from akka-http-core/src/main/scala/akka/http/parsing/BodyPartParser.scala
rename to akka-http-core/src/main/scala/akka/http/engine/parsing/BodyPartParser.scala
diff --git a/akka-http-core/src/main/scala/akka/http/parsing/BoyerMoore.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/BoyerMoore.scala
similarity index 100%
rename from akka-http-core/src/main/scala/akka/http/parsing/BoyerMoore.scala
rename to akka-http-core/src/main/scala/akka/http/engine/parsing/BoyerMoore.scala
diff --git a/akka-http-core/src/main/scala/akka/http/parsing/HttpHeaderParser.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpHeaderParser.scala
similarity index 100%
rename from akka-http-core/src/main/scala/akka/http/parsing/HttpHeaderParser.scala
rename to akka-http-core/src/main/scala/akka/http/engine/parsing/HttpHeaderParser.scala
diff --git a/akka-http-core/src/main/scala/akka/http/parsing/HttpMessageParser.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpMessageParser.scala
similarity index 100%
rename from akka-http-core/src/main/scala/akka/http/parsing/HttpMessageParser.scala
rename to akka-http-core/src/main/scala/akka/http/engine/parsing/HttpMessageParser.scala
diff --git a/akka-http-core/src/main/scala/akka/http/parsing/HttpRequestParser.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpRequestParser.scala
similarity index 100%
rename from akka-http-core/src/main/scala/akka/http/parsing/HttpRequestParser.scala
rename to akka-http-core/src/main/scala/akka/http/engine/parsing/HttpRequestParser.scala
diff --git a/akka-http-core/src/main/scala/akka/http/parsing/HttpResponseParser.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/HttpResponseParser.scala
similarity index 100%
rename from akka-http-core/src/main/scala/akka/http/parsing/HttpResponseParser.scala
rename to akka-http-core/src/main/scala/akka/http/engine/parsing/HttpResponseParser.scala
diff --git a/akka-http-core/src/main/scala/akka/http/parsing/ParserOutput.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/ParserOutput.scala
similarity index 100%
rename from akka-http-core/src/main/scala/akka/http/parsing/ParserOutput.scala
rename to akka-http-core/src/main/scala/akka/http/engine/parsing/ParserOutput.scala
diff --git a/akka-http-core/src/main/scala/akka/http/parsing/ParserSettings.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/ParserSettings.scala
similarity index 100%
rename from akka-http-core/src/main/scala/akka/http/parsing/ParserSettings.scala
rename to akka-http-core/src/main/scala/akka/http/engine/parsing/ParserSettings.scala
diff --git a/akka-http-core/src/main/scala/akka/http/parsing/SpecializedHeaderValueParsers.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/SpecializedHeaderValueParsers.scala
similarity index 100%
rename from akka-http-core/src/main/scala/akka/http/parsing/SpecializedHeaderValueParsers.scala
rename to akka-http-core/src/main/scala/akka/http/engine/parsing/SpecializedHeaderValueParsers.scala
diff --git a/akka-http-core/src/main/scala/akka/http/parsing/package.scala b/akka-http-core/src/main/scala/akka/http/engine/parsing/package.scala
similarity index 100%
rename from akka-http-core/src/main/scala/akka/http/parsing/package.scala
rename to akka-http-core/src/main/scala/akka/http/engine/parsing/package.scala
diff --git a/akka-http-core/src/main/scala/akka/http/rendering/BodyPartRenderer.scala b/akka-http-core/src/main/scala/akka/http/engine/rendering/BodyPartRenderer.scala
similarity index 100%
rename from akka-http-core/src/main/scala/akka/http/rendering/BodyPartRenderer.scala
rename to akka-http-core/src/main/scala/akka/http/engine/rendering/BodyPartRenderer.scala
diff --git a/akka-http-core/src/main/scala/akka/http/rendering/HttpRequestRendererFactory.scala b/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpRequestRendererFactory.scala
similarity index 100%
rename from akka-http-core/src/main/scala/akka/http/rendering/HttpRequestRendererFactory.scala
rename to akka-http-core/src/main/scala/akka/http/engine/rendering/HttpRequestRendererFactory.scala
diff --git a/akka-http-core/src/main/scala/akka/http/rendering/HttpResponseRendererFactory.scala b/akka-http-core/src/main/scala/akka/http/engine/rendering/HttpResponseRendererFactory.scala
similarity index 100%
rename from akka-http-core/src/main/scala/akka/http/rendering/HttpResponseRendererFactory.scala
rename to akka-http-core/src/main/scala/akka/http/engine/rendering/HttpResponseRendererFactory.scala
diff --git a/akka-http-core/src/main/scala/akka/http/rendering/RenderSupport.scala b/akka-http-core/src/main/scala/akka/http/engine/rendering/RenderSupport.scala
similarity index 100%
rename from akka-http-core/src/main/scala/akka/http/rendering/RenderSupport.scala
rename to akka-http-core/src/main/scala/akka/http/engine/rendering/RenderSupport.scala
diff --git a/akka-http-core/src/main/scala/akka/http/server/HttpServerPipeline.scala b/akka-http-core/src/main/scala/akka/http/engine/server/HttpServerPipeline.scala
similarity index 100%
rename from akka-http-core/src/main/scala/akka/http/server/HttpServerPipeline.scala
rename to akka-http-core/src/main/scala/akka/http/engine/server/HttpServerPipeline.scala
diff --git a/akka-http-core/src/main/scala/akka/http/server/ServerSettings.scala b/akka-http-core/src/main/scala/akka/http/engine/server/ServerSettings.scala
similarity index 100%
rename from akka-http-core/src/main/scala/akka/http/server/ServerSettings.scala
rename to akka-http-core/src/main/scala/akka/http/engine/server/ServerSettings.scala
diff --git a/akka-http-core/src/test/scala/akka/http/parsing/BoyerMooreSpec.scala b/akka-http-core/src/test/scala/akka/http/engine/parsing/BoyerMooreSpec.scala
similarity index 100%
rename from akka-http-core/src/test/scala/akka/http/parsing/BoyerMooreSpec.scala
rename to akka-http-core/src/test/scala/akka/http/engine/parsing/BoyerMooreSpec.scala
diff --git a/akka-http-core/src/test/scala/akka/http/parsing/ContentLengthHeaderParserSpec.scala b/akka-http-core/src/test/scala/akka/http/engine/parsing/ContentLengthHeaderParserSpec.scala
similarity index 100%
rename from akka-http-core/src/test/scala/akka/http/parsing/ContentLengthHeaderParserSpec.scala
rename to akka-http-core/src/test/scala/akka/http/engine/parsing/ContentLengthHeaderParserSpec.scala
diff --git a/akka-http-core/src/test/scala/akka/http/parsing/HttpHeaderParserSpec.scala b/akka-http-core/src/test/scala/akka/http/engine/parsing/HttpHeaderParserSpec.scala
similarity index 100%
rename from akka-http-core/src/test/scala/akka/http/parsing/HttpHeaderParserSpec.scala
rename to akka-http-core/src/test/scala/akka/http/engine/parsing/HttpHeaderParserSpec.scala
diff --git a/akka-http-core/src/test/scala/akka/http/parsing/RequestParserSpec.scala b/akka-http-core/src/test/scala/akka/http/engine/parsing/RequestParserSpec.scala
similarity index 100%
rename from akka-http-core/src/test/scala/akka/http/parsing/RequestParserSpec.scala
rename to akka-http-core/src/test/scala/akka/http/engine/parsing/RequestParserSpec.scala
diff --git a/akka-http-core/src/test/scala/akka/http/parsing/ResponseParserSpec.scala b/akka-http-core/src/test/scala/akka/http/engine/parsing/ResponseParserSpec.scala
similarity index 100%
rename from akka-http-core/src/test/scala/akka/http/parsing/ResponseParserSpec.scala
rename to akka-http-core/src/test/scala/akka/http/engine/parsing/ResponseParserSpec.scala
diff --git a/akka-http-core/src/test/scala/akka/http/rendering/RequestRendererSpec.scala b/akka-http-core/src/test/scala/akka/http/engine/rendering/RequestRendererSpec.scala
similarity index 100%
rename from akka-http-core/src/test/scala/akka/http/rendering/RequestRendererSpec.scala
rename to akka-http-core/src/test/scala/akka/http/engine/rendering/RequestRendererSpec.scala
diff --git a/akka-http-core/src/test/scala/akka/http/rendering/ResponseRendererSpec.scala b/akka-http-core/src/test/scala/akka/http/engine/rendering/ResponseRendererSpec.scala
similarity index 100%
rename from akka-http-core/src/test/scala/akka/http/rendering/ResponseRendererSpec.scala
rename to akka-http-core/src/test/scala/akka/http/engine/rendering/ResponseRendererSpec.scala
diff --git a/akka-http-core/src/test/scala/akka/http/server/HttpServerPipelineSpec.scala b/akka-http-core/src/test/scala/akka/http/engine/server/HttpServerPipelineSpec.scala
similarity index 100%
rename from akka-http-core/src/test/scala/akka/http/server/HttpServerPipelineSpec.scala
rename to akka-http-core/src/test/scala/akka/http/engine/server/HttpServerPipelineSpec.scala