diff --git a/akka-actor/src/main/scala/akka/util/AkkaException.scala b/akka-actor/src/main/scala/akka/AkkaException.scala
similarity index 100%
rename from akka-actor/src/main/scala/akka/util/AkkaException.scala
rename to akka-actor/src/main/scala/akka/AkkaException.scala
diff --git a/akka-actor/src/main/scala/akka/actor/Implicits.scala b/akka-actor/src/main/scala/akka/Implicits.scala
similarity index 100%
rename from akka-actor/src/main/scala/akka/actor/Implicits.scala
rename to akka-actor/src/main/scala/akka/Implicits.scala
diff --git a/akka-http/src/main/scala/Jersey.scala b/akka-http/src/main/scala/akka/http/AkkaRestServlet.scala
similarity index 100%
rename from akka-http/src/main/scala/Jersey.scala
rename to akka-http/src/main/scala/akka/http/AkkaRestServlet.scala
diff --git a/akka-http/src/main/scala/DefaultAkkaLoader.scala b/akka-http/src/main/scala/akka/http/DefaultAkkaLoader.scala
similarity index 100%
rename from akka-http/src/main/scala/DefaultAkkaLoader.scala
rename to akka-http/src/main/scala/akka/http/DefaultAkkaLoader.scala
diff --git a/akka-http/src/main/scala/EmbeddedAppServer.scala b/akka-http/src/main/scala/akka/http/EmbeddedAppServer.scala
similarity index 100%
rename from akka-http/src/main/scala/EmbeddedAppServer.scala
rename to akka-http/src/main/scala/akka/http/EmbeddedAppServer.scala
diff --git a/akka-http/src/main/scala/JettyContinuation.scala b/akka-http/src/main/scala/akka/http/JettyContinuation.scala
similarity index 100%
rename from akka-http/src/main/scala/JettyContinuation.scala
rename to akka-http/src/main/scala/akka/http/JettyContinuation.scala
diff --git a/akka-http/src/main/scala/ListWriter.scala b/akka-http/src/main/scala/akka/http/ListWriter.scala
similarity index 100%
rename from akka-http/src/main/scala/ListWriter.scala
rename to akka-http/src/main/scala/akka/http/ListWriter.scala
diff --git a/akka-http/src/main/scala/Mist.scala b/akka-http/src/main/scala/akka/http/Mist.scala
similarity index 100%
rename from akka-http/src/main/scala/Mist.scala
rename to akka-http/src/main/scala/akka/http/Mist.scala
diff --git a/akka-http/src/main/scala/Servlet30Context.scala b/akka-http/src/main/scala/akka/http/Servlet30Context.scala
similarity index 100%
rename from akka-http/src/main/scala/Servlet30Context.scala
rename to akka-http/src/main/scala/akka/http/Servlet30Context.scala
diff --git a/akka-http/src/main/scala/Security.scala b/akka-http/src/main/scala/akka/security/Security.scala
similarity index 100%
rename from akka-http/src/main/scala/Security.scala
rename to akka-http/src/main/scala/akka/security/Security.scala
diff --git a/akka-http/src/main/scala/AkkaLoader.scala b/akka-http/src/main/scala/akka/servlet/AkkaLoader.scala
similarity index 100%
rename from akka-http/src/main/scala/AkkaLoader.scala
rename to akka-http/src/main/scala/akka/servlet/AkkaLoader.scala
diff --git a/akka-http/src/main/scala/Initializer.scala b/akka-http/src/main/scala/akka/servlet/Initializer.scala
similarity index 100%
rename from akka-http/src/main/scala/Initializer.scala
rename to akka-http/src/main/scala/akka/servlet/Initializer.scala
diff --git a/akka-remote/src/main/scala/akka/serialization/package.scala b/akka-remote/src/main/scala/akka/Package.scala
similarity index 100%
rename from akka-remote/src/main/scala/akka/serialization/package.scala
rename to akka-remote/src/main/scala/akka/Package.scala