diff --git a/akka-http-marshallers-java/akka-http-jackson/src/main/scala/akka/http/marshallers/jackson/Jackson.scala b/akka-http-marshallers-java/akka-http-jackson/src/main/scala/akka/http/javadsl/marshallers/jackson/Jackson.scala
similarity index 80%
rename from akka-http-marshallers-java/akka-http-jackson/src/main/scala/akka/http/marshallers/jackson/Jackson.scala
rename to akka-http-marshallers-java/akka-http-jackson/src/main/scala/akka/http/javadsl/marshallers/jackson/Jackson.scala
index e90c2a48bf..a3136542a9 100644
--- a/akka-http-marshallers-java/akka-http-jackson/src/main/scala/akka/http/marshallers/jackson/Jackson.scala
+++ b/akka-http-marshallers-java/akka-http-jackson/src/main/scala/akka/http/javadsl/marshallers/jackson/Jackson.scala
@@ -2,15 +2,15 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.marshallers.jackson
+package akka.http.javadsl.marshallers.jackson
 
-import scala.reflect.ClassTag
-import akka.http.marshalling
-import akka.http.unmarshalling
-import akka.http.model.MediaTypes._
-import akka.http.server.japi.{ Unmarshaller, Marshaller }
-import akka.http.server.japi.impl.{ UnmarshallerImpl, MarshallerImpl }
 import com.fasterxml.jackson.databind.{ MapperFeature, ObjectMapper }
+import scala.reflect.ClassTag
+import akka.http.scaladsl.marshalling
+import akka.http.scaladsl.unmarshalling
+import akka.http.scaladsl.model.MediaTypes._
+import akka.http.javadsl.server.{ Unmarshaller, Marshaller }
+import akka.http.impl.server.{ UnmarshallerImpl, MarshallerImpl }
 
 object Jackson {
   def json[T <: AnyRef]: Marshaller[T] = _jsonMarshaller.asInstanceOf[Marshaller[T]]
diff --git a/akka-http-tests-java8/src/main/java/akka/http/server/japi/examples/simple/SimpleServerApp8.java b/akka-http-tests-java8/src/main/java/akka/http/javadsl/server/examples/simple/SimpleServerApp8.java
similarity index 97%
rename from akka-http-tests-java8/src/main/java/akka/http/server/japi/examples/simple/SimpleServerApp8.java
rename to akka-http-tests-java8/src/main/java/akka/http/javadsl/server/examples/simple/SimpleServerApp8.java
index fd88e40ce6..801c5b24cd 100644
--- a/akka-http-tests-java8/src/main/java/akka/http/server/japi/examples/simple/SimpleServerApp8.java
+++ b/akka-http-tests-java8/src/main/java/akka/http/javadsl/server/examples/simple/SimpleServerApp8.java
@@ -2,11 +2,10 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.server.japi.examples.simple;
+package akka.http.javadsl.server.examples.simple;
 
 import akka.actor.ActorSystem;
-import akka.http.server.japi.*;
-
+import akka.http.javadsl.server.*;
 import java.io.IOException;
 
 public class SimpleServerApp8 extends HttpApp {
diff --git a/akka-http-tests-java8/src/test/java/AllJavaTests.java b/akka-http-tests-java8/src/test/java/AllJavaTests.java
index 6c3f425fc5..be754e78a5 100644
--- a/akka-http-tests-java8/src/test/java/AllJavaTests.java
+++ b/akka-http-tests-java8/src/test/java/AllJavaTests.java
@@ -2,7 +2,7 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-import akka.http.server.japi.HandlerBindingTest;
+import akka.http.javadsl.server.HandlerBindingTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/akka-http-tests-java8/src/test/java/akka/http/server/japi/HandlerBindingTest.java b/akka-http-tests-java8/src/test/java/akka/http/javadsl/server/HandlerBindingTest.java
similarity index 94%
rename from akka-http-tests-java8/src/test/java/akka/http/server/japi/HandlerBindingTest.java
rename to akka-http-tests-java8/src/test/java/akka/http/javadsl/server/HandlerBindingTest.java
index 68556071ca..9f8ac777e7 100644
--- a/akka-http-tests-java8/src/test/java/akka/http/server/japi/HandlerBindingTest.java
+++ b/akka-http-tests-java8/src/test/java/akka/http/javadsl/server/HandlerBindingTest.java
@@ -2,12 +2,12 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.server.japi;
+package akka.http.javadsl.server;
 
-import akka.http.model.HttpRequest;
+import akka.http.scaladsl.model.HttpRequest;
 import org.junit.Test;
-
-import static akka.http.server.japi.Directives.*;
+import akka.http.javadsl.testkit.*;
+import static akka.http.javadsl.server.Directives.*;
 
 public class HandlerBindingTest extends JUnitRouteTest {
     @Test