Refactor project layout

46 files changed, 52 insertions, 52 deletions

diff --git a/Documentation/manual.md b/Documentation/manual.md
index d1bd335..0a65e42 100644
--- a/Documentation/manual.md
+++ b/Documentation/manual.md
@@ -57,7 +57,7 @@ Flow's API follows that of an actor based system, where each actor is assigned s
 
 2. Serial "operators". Operators are created once per open serial port and serve as an intermediate between client code and native code dealing with serial data transmission and reception. They isolate the user from threading issues and enable the reactive dispatch of incoming data. A serial operator is said to be "associated" to its underlying open serial port.
 
-The messages understood by flow's actors are all contained in the `ch.jodersky.flow.Serial` object. They are well documented and should serve as the entry point when searching the API documentation.
+The messages understood by flow's actors are all contained in the `ch.jodersky.akka.serial.Serial` object. They are well documented and should serve as the entry point when searching the API documentation.
 
 ## Opening a Port
 A serial port is opened by sending an `Open` message to the serial manager. The response varies on the outcome of opening the underlying serial port.
@@ -67,7 +67,7 @@ A serial port is opened by sending an `Open` message to the serial manager. The
 2. In case of success, the sender is notified with an `Opened` message. This message is sent from an operator actor, spawned by the serial manager. It is useful to capture the sender (i.e. the operator) of this message as all further communication with the newly opened port must pass through the operator.
 
 ~~~scala
-import ch.jodersky.flow.{ Serial, SerialSettings, AccessDeniedException }
+import ch.jodersky.akka.serial.{ Serial, SerialSettings, AccessDeniedException }
 
 val port = "/dev/ttyXXX"
 val settings = SerialSettings(
@@ -189,7 +189,7 @@ Flow provides support for Akka streams and thus can be interfaced with reactive-
 libraryDependencies += "ch.jodersky" %% "flow-stream" % "@version@"
 ~~~
 
-The main entry point for serial streaming is `ch.jodersky.flow.stream.Serial`. It's API is also well documented and should serve as the starting point when searching documentation on serial streaming.
+The main entry point for serial streaming is `ch.jodersky.akka.serial.stream.Serial`. Its API is also well documented and should serve as the starting point when searching documentation on serial streaming.
 
 ## Opening a Port
 Connection is established by materializing a `Flow[ByteString, ByteString, Future[Connection]]` obtained by calling `Serial().open()`
diff --git a/build.sbt b/build.sbt
index 50d9f8a..0fe8e5c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -36,24 +36,24 @@ pomExtra in ThisBuild := {
 lazy val root = (project in file("."))
   .aggregate(core, native, stream)
 
-lazy val core = (project in file("flow-core"))
-  .settings(name := "flow-core")
+lazy val core = (project in file("core"))
+  .settings(name := "akka-serial-core")
   .dependsOn(native % "test->runtime")
 
-lazy val native = (project in file("flow-native"))
-  .settings(name := "flow-native")
+lazy val native = (project in file("native"))
+  .settings(name := "akka-serial-native")
 
-lazy val stream = (project in file("flow-stream"))
-  .settings(name := "flow-stream")
+lazy val stream = (project in file("stream"))
+  .settings(name := "akka-serial-stream")
   .dependsOn(core, core % "test->test", native % "test->runtime")
 
-lazy val samplesTerminal = (project in file("flow-samples") / "terminal")
+lazy val samplesTerminal = (project in file("samples") / "terminal")
   .dependsOn(core, native % Runtime)
 
-lazy val samplesTerminalStream = (project in file("flow-samples") / "terminal-stream")
+lazy val samplesTerminalStream = (project in file("samples") / "terminal-stream")
   .dependsOn(stream, native % Runtime)
 
-lazy val samplesWatcher = (project in file("flow-samples") / "watcher")
+lazy val samplesWatcher = (project in file("samples") / "watcher")
   .dependsOn(core, native % Runtime)
 
 // Root project settings
@@ -83,7 +83,7 @@ scalacOptions in (ScalaUnidoc, doc) ++= Seq(
 ) ++ {
   val latestTag: String = "git describe --abbrev=0 --match v[0-9].*".!!
   Opts.doc.sourceUrl(
-    s"https://github.com/jodersky/flow/blob/$latestTag€{FILE_PATH}.scala"
+    s"https://github.com/jodersky/akka-serial/blob/$latestTag€{FILE_PATH}.scala"
   )
 }
 siteMappings ++= (mappings in (ScalaUnidoc, packageDoc)).value.map{ case (file, path) =>
diff --git a/flow-core/build.sbt b/core/build.sbt
index fdfcbab..fdfcbab 100644
--- a/flow-core/build.sbt
+++ b/core/build.sbt
diff --git a/flow-core/src/main/scala/ch/jodersky/flow/Parity.scala b/core/src/main/scala/ch/jodersky/akka/serial/Parity.scala
index 30596d2..4e90744 100644
--- a/flow-core/src/main/scala/ch/jodersky/flow/Parity.scala
+++ b/core/src/main/scala/ch/jodersky/akka/serial/Parity.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 
 /** Specifies available parities used in serial communication. */
 object Parity extends Enumeration {
diff --git a/flow-core/src/main/scala/ch/jodersky/flow/Serial.scala b/core/src/main/scala/ch/jodersky/akka/serial/Serial.scala
index 43b1d19..889d3b0 100644
--- a/flow-core/src/main/scala/ch/jodersky/flow/Serial.scala
+++ b/core/src/main/scala/ch/jodersky/akka/serial/Serial.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 
 import akka.actor.ExtensionKey
 import akka.util.ByteString
diff --git a/flow-core/src/main/scala/ch/jodersky/flow/SerialConnection.scala b/core/src/main/scala/ch/jodersky/akka/serial/SerialConnection.scala
index 1cd1046..6481ee6 100644
--- a/flow-core/src/main/scala/ch/jodersky/flow/SerialConnection.scala
+++ b/core/src/main/scala/ch/jodersky/akka/serial/SerialConnection.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 
 import java.nio.ByteBuffer
 import java.util.concurrent.atomic.AtomicBoolean
@@ -10,7 +10,7 @@ import java.util.concurrent.atomic.AtomicBoolean
  *
  * The underlying serial port is assumed open when this class is initialized.
  */
-private[flow] class SerialConnection private (
+private[serial] class SerialConnection private (
   unsafe: UnsafeSerial,
   val port: String
 ) {
@@ -108,7 +108,7 @@ private[flow] class SerialConnection private (
 
 }
 
-private[flow] object SerialConnection {
+private[serial] object SerialConnection {
 
   /**
    * Opens a new connection to a serial port.
diff --git a/flow-core/src/main/scala/ch/jodersky/flow/SerialExt.scala b/core/src/main/scala/ch/jodersky/akka/serial/SerialExt.scala
index 4ed3e2e..1b954cf 100644
--- a/flow-core/src/main/scala/ch/jodersky/flow/SerialExt.scala
+++ b/core/src/main/scala/ch/jodersky/akka/serial/SerialExt.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 
 import akka.actor.{ ExtendedActorSystem, Props }
 import akka.io.IO
diff --git a/flow-core/src/main/scala/ch/jodersky/flow/SerialManager.scala b/core/src/main/scala/ch/jodersky/akka/serial/SerialManager.scala
index 7967087..a6647cd 100644
--- a/flow-core/src/main/scala/ch/jodersky/flow/SerialManager.scala
+++ b/core/src/main/scala/ch/jodersky/akka/serial/SerialManager.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 
 import akka.actor.{ Actor, ActorLogging, OneForOneStrategy }
 import akka.actor.SupervisorStrategy.{ Escalate, Stop }
@@ -9,7 +9,7 @@ import scala.util.{ Failure, Success, Try }
  * a dedicated operator actor that acts as an intermediate between client code and the native system serial port.
  * @see SerialOperator
  */
-private[flow] class SerialManager extends Actor {
+private[serial] class SerialManager extends Actor {
   import SerialManager._
   import context._
 
@@ -37,7 +37,7 @@ private[flow] class SerialManager extends Actor {
 
 }
 
-private[flow] object SerialManager {
+private[serial] object SerialManager {
 
   private def escapePortString(port: String) = port map {
     case '/' => '-'
diff --git a/flow-core/src/main/scala/ch/jodersky/flow/SerialOperator.scala b/core/src/main/scala/ch/jodersky/akka/serial/SerialOperator.scala
index d5c131c..1cfc703 100644
--- a/flow-core/src/main/scala/ch/jodersky/flow/SerialOperator.scala
+++ b/core/src/main/scala/ch/jodersky/akka/serial/SerialOperator.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 
 import akka.actor.{ Actor, ActorLogging, ActorRef, Props, Terminated }
 import akka.util.ByteString
@@ -8,7 +8,7 @@ import java.nio.ByteBuffer
   * Operator associated to an open serial port. All communication with a port is done via an operator. Operators are created though the serial manager.
   * @see SerialManager
   */
-private[flow] class SerialOperator(connection: SerialConnection, bufferSize: Int, client: ActorRef) extends Actor {
+private[serial] class SerialOperator(connection: SerialConnection, bufferSize: Int, client: ActorRef) extends Actor {
   import SerialOperator._
   import context._
 
@@ -78,6 +78,6 @@ private[flow] class SerialOperator(connection: SerialConnection, bufferSize: Int
 
 }
 
-private[flow] object SerialOperator {
+private[serial] object SerialOperator {
   def apply(connection: SerialConnection, bufferSize: Int, client: ActorRef) = Props(classOf[SerialOperator], connection, bufferSize, client)
 }
diff --git a/flow-core/src/main/scala/ch/jodersky/flow/SerialSettings.scala b/core/src/main/scala/ch/jodersky/akka/serial/SerialSettings.scala
index 2d3a6ed..e5ab797 100644
--- a/flow-core/src/main/scala/ch/jodersky/flow/SerialSettings.scala
+++ b/core/src/main/scala/ch/jodersky/akka/serial/SerialSettings.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 
 /**
  * Groups settings used in communication over a serial port.
diff --git a/flow-core/src/main/scala/ch/jodersky/flow/UnsafeSerial.scala b/core/src/main/scala/ch/jodersky/akka/serial/UnsafeSerial.scala
index 3126618..91d8be6 100644
--- a/flow-core/src/main/scala/ch/jodersky/flow/UnsafeSerial.scala
+++ b/core/src/main/scala/ch/jodersky/akka/serial/UnsafeSerial.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 
 import java.nio.ByteBuffer
 
@@ -17,7 +17,7 @@ import ch.jodersky.jni.nativeLoader
   * @param serialAddr address of natively allocated serial configuration structure
   */
 @nativeLoader("flow4")
-private[flow] class UnsafeSerial(final val serialAddr: Long) {
+private[serial] class UnsafeSerial(final val serialAddr: Long) {
 
   final val ParityNone: Int = 0
   final val ParityOdd: Int = 1
@@ -79,7 +79,7 @@ private[flow] class UnsafeSerial(final val serialAddr: Long) {
 
 }
 
-private[flow] object UnsafeSerial {
+private[serial] object UnsafeSerial {
 
   /**
     * Opens a serial port.
diff --git a/flow-core/src/main/scala/ch/jodersky/flow/Watcher.scala b/core/src/main/scala/ch/jodersky/akka/serial/Watcher.scala
index 9fa519b..e079290 100644
--- a/flow-core/src/main/scala/ch/jodersky/flow/Watcher.scala
+++ b/core/src/main/scala/ch/jodersky/akka/serial/Watcher.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 
 import akka.actor.{ Actor, ActorRef, Props, Terminated }
 import java.nio.file.{ ClosedWatchServiceException, FileSystems, Files, Path, Paths, WatchEvent, WatchKey }
@@ -7,7 +7,7 @@ import scala.collection.JavaConversions._
 import scala.collection.mutable.{ HashMap, Map, MultiMap, Set }
 import scala.util.{ Failure, Success, Try }
 
-private[flow] class Watcher(from: Option[ActorRef]) extends Actor {
+private[serial] class Watcher(from: Option[ActorRef]) extends Actor {
 
   case class WatcherDied(reason: Throwable)
   object WatcherThread extends Thread {
@@ -135,7 +135,7 @@ private[flow] class Watcher(from: Option[ActorRef]) extends Actor {
 
 }
 
-private[flow] object Watcher {
+private[serial] object Watcher {
   private case class NewFile(directory: Path, file: Path)
 
   def apply(from: ActorRef) = Props(classOf[Watcher], Some(from))
diff --git a/flow-core/src/main/scala/ch/jodersky/flow/exceptions.scala b/core/src/main/scala/ch/jodersky/akka/serial/exceptions.scala
index ee087a8..47a59e4 100644
--- a/flow-core/src/main/scala/ch/jodersky/flow/exceptions.scala
+++ b/core/src/main/scala/ch/jodersky/akka/serial/exceptions.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 
 /** The requested port could not be found. */
 class NoSuchPortException(message: String) extends Exception(message)
diff --git a/flow-core/src/test/scala/ch/jodersky/flow/PseudoTerminal.scala b/core/src/test/scala/ch/jodersky/flow/PseudoTerminal.scala
index 8e891ae..86919d2 100644
--- a/flow-core/src/test/scala/ch/jodersky/flow/PseudoTerminal.scala
+++ b/core/src/test/scala/ch/jodersky/flow/PseudoTerminal.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 
 import java.io.{File, IOException}
 import java.nio.file.Files
diff --git a/flow-core/src/test/scala/ch/jodersky/flow/SerialManagerSpec.scala b/core/src/test/scala/ch/jodersky/flow/SerialManagerSpec.scala
index 59af305..cac07fa 100644
--- a/flow-core/src/test/scala/ch/jodersky/flow/SerialManagerSpec.scala
+++ b/core/src/test/scala/ch/jodersky/flow/SerialManagerSpec.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 
 import akka.actor.ActorSystem
 import akka.io.IO
diff --git a/flow-core/src/test/scala/ch/jodersky/flow/SerialOperatorSpec.scala b/core/src/test/scala/ch/jodersky/flow/SerialOperatorSpec.scala
index 4c1dd94..5c9ca49 100644
--- a/flow-core/src/test/scala/ch/jodersky/flow/SerialOperatorSpec.scala
+++ b/core/src/test/scala/ch/jodersky/flow/SerialOperatorSpec.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 
 import scala.concurrent.duration._
 
diff --git a/flow-native/build.sbt b/native/build.sbt
index 2c7ffea..2c7ffea 100644
--- a/flow-native/build.sbt
+++ b/native/build.sbt
diff --git a/flow-native/lib_native/armv7l-linux/libflow4.so b/native/lib_native/armv7l-linux/libflow4.so
index f5d9ae0..f5d9ae0 100755
--- a/flow-native/lib_native/armv7l-linux/libflow4.so
+++ b/native/lib_native/armv7l-linux/libflow4.so
diff --git a/flow-native/lib_native/i686-linux/libflow4.so b/native/lib_native/i686-linux/libflow4.so
index fb438e2..fb438e2 100644
--- a/flow-native/lib_native/i686-linux/libflow4.so
+++ b/native/lib_native/i686-linux/libflow4.so
diff --git a/flow-native/lib_native/x86_64-darwin/libflow4.dylib b/native/lib_native/x86_64-darwin/libflow4.dylib
index 213415d..213415d 100644
--- a/flow-native/lib_native/x86_64-darwin/libflow4.dylib
+++ b/native/lib_native/x86_64-darwin/libflow4.dylib
diff --git a/flow-native/lib_native/x86_64-linux/libflow4.so b/native/lib_native/x86_64-linux/libflow4.so
index 18fb300..18fb300 100755
--- a/flow-native/lib_native/x86_64-linux/libflow4.so
+++ b/native/lib_native/x86_64-linux/libflow4.so
diff --git a/flow-native/src/.gitignore b/native/src/.gitignore
index 1785c46..1785c46 100644
--- a/flow-native/src/.gitignore
+++ b/native/src/.gitignore
diff --git a/flow-native/src/CMakeLists.txt b/native/src/CMakeLists.txt
index a57451c..a57451c 100644
--- a/flow-native/src/CMakeLists.txt
+++ b/native/src/CMakeLists.txt
diff --git a/flow-native/src/flow_jni.c b/native/src/flow_jni.c
index 75bffff..75bffff 100644
--- a/flow-native/src/flow_jni.c
+++ b/native/src/flow_jni.c
diff --git a/flow-native/src/include/ch_jodersky_flow_UnsafeSerial.h b/native/src/include/ch_jodersky_flow_UnsafeSerial.h
index f80ada0..f80ada0 100644
--- a/flow-native/src/include/ch_jodersky_flow_UnsafeSerial.h
+++ b/native/src/include/ch_jodersky_flow_UnsafeSerial.h
diff --git a/flow-native/src/include/ch_jodersky_flow_UnsafeSerial__.h b/native/src/include/ch_jodersky_flow_UnsafeSerial__.h
index 617875f..617875f 100644
--- a/flow-native/src/include/ch_jodersky_flow_UnsafeSerial__.h
+++ b/native/src/include/ch_jodersky_flow_UnsafeSerial__.h
diff --git a/flow-native/src/include/flow.h b/native/src/include/flow.h
index e3f33b9..e3f33b9 100644
--- a/flow-native/src/include/flow.h
+++ b/native/src/include/flow.h
diff --git a/flow-native/src/platform/posix/flow.c b/native/src/platform/posix/flow.c
index 969949b..969949b 100644
--- a/flow-native/src/platform/posix/flow.c
+++ b/native/src/platform/posix/flow.c
diff --git a/flow-native/src/platform/windows/README b/native/src/platform/windows/README
index 3d24410..3d24410 100644
--- a/flow-native/src/platform/windows/README
+++ b/native/src/platform/windows/README
diff --git a/flow-native/src/platform/windows/flow.c.disabled b/native/src/platform/windows/flow.c.disabled
index 86a267c..86a267c 100644
--- a/flow-native/src/platform/windows/flow.c.disabled
+++ b/native/src/platform/windows/flow.c.disabled
diff --git a/flow-native/src/readme.md b/native/src/readme.md
index 84306fe..84306fe 100644
--- a/flow-native/src/readme.md
+++ b/native/src/readme.md
diff --git a/flow-samples/README.md b/samples/README.md
index 5460b4d..5460b4d 100644
--- a/flow-samples/README.md
+++ b/samples/README.md
diff --git a/flow-samples/terminal-stream/src/main/scala/ch/jodersky/flow/samples/terminalstream/Main.scala b/samples/terminal-stream/src/main/scala/ch/jodersky/flow/samples/terminalstream/Main.scala
index 74433db..a669ce7 100644
--- a/flow-samples/terminal-stream/src/main/scala/ch/jodersky/flow/samples/terminalstream/Main.scala
+++ b/samples/terminal-stream/src/main/scala/ch/jodersky/flow/samples/terminalstream/Main.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 package samples.terminalstream
 
 import scala.concurrent.Future
diff --git a/flow-samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/ConsoleReader.scala b/samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/ConsoleReader.scala
index 2b30663..1bc547a 100644
--- a/flow-samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/ConsoleReader.scala
+++ b/samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/ConsoleReader.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 package samples.terminal
 
 import akka.actor.Actor
diff --git a/flow-samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/Main.scala b/samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/Main.scala
index 80c0f80..394c417 100644
--- a/flow-samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/Main.scala
+++ b/samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/Main.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 package samples.terminal
 
 import akka.actor.ActorSystem
diff --git a/flow-samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/Terminal.scala b/samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/Terminal.scala
index de60620..5e1fc2f 100644
--- a/flow-samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/Terminal.scala
+++ b/samples/terminal/src/main/scala/ch/jodersky/flow/samples/terminal/Terminal.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 package samples.terminal
 
 import akka.actor.{ Actor, ActorLogging, ActorRef, Props, Terminated, actorRef2Scala }
diff --git a/flow-samples/watcher/src/main/scala/ch/jodersky/flow/samples/watcher/main.scala b/samples/watcher/src/main/scala/ch/jodersky/flow/samples/watcher/main.scala
index 650d08e..6393953 100644
--- a/flow-samples/watcher/src/main/scala/ch/jodersky/flow/samples/watcher/main.scala
+++ b/samples/watcher/src/main/scala/ch/jodersky/flow/samples/watcher/main.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 package samples.watcher
 
 import akka.actor.{ Actor, ActorLogging, ActorSystem, Props }
diff --git a/flow-stream/build.sbt b/stream/build.sbt
index c9aa7eb..c9aa7eb 100644
--- a/flow-stream/build.sbt
+++ b/stream/build.sbt
diff --git a/flow-stream/src/main/scala/ch/jodersky/flow/stream/Serial.scala b/stream/src/main/scala/ch/jodersky/flow/stream/Serial.scala
index d478de8..2195435 100644
--- a/flow-stream/src/main/scala/ch/jodersky/flow/stream/Serial.scala
+++ b/stream/src/main/scala/ch/jodersky/flow/stream/Serial.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 package stream
 
 import akka.stream.scaladsl.Source
@@ -9,7 +9,7 @@ import akka.io.IO
 import akka.stream.scaladsl.Flow
 import akka.util.ByteString
 
-import ch.jodersky.flow.{Serial => CoreSerial}
+import ch.jodersky.akka.serial.{Serial => CoreSerial}
 import impl._
 
 object Serial extends ExtensionId[Serial] with ExtensionIdProvider {
diff --git a/flow-stream/src/main/scala/ch/jodersky/flow/stream/StreamSerialException.scala b/stream/src/main/scala/ch/jodersky/flow/stream/StreamSerialException.scala
index 78438f9..ed94374 100644
--- a/flow-stream/src/main/scala/ch/jodersky/flow/stream/StreamSerialException.scala
+++ b/stream/src/main/scala/ch/jodersky/flow/stream/StreamSerialException.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 package stream
 
 /** Represents a generic exception occured during streaming of serial data. */
diff --git a/flow-stream/src/main/scala/ch/jodersky/flow/stream/StreamWatcherException.scala b/stream/src/main/scala/ch/jodersky/flow/stream/StreamWatcherException.scala
index 8eee61c..96fbb77 100644
--- a/flow-stream/src/main/scala/ch/jodersky/flow/stream/StreamWatcherException.scala
+++ b/stream/src/main/scala/ch/jodersky/flow/stream/StreamWatcherException.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 package stream
 
 class StreamWatcherException(message: String, cause: Throwable = null) extends RuntimeException(message, cause)
diff --git a/flow-stream/src/main/scala/ch/jodersky/flow/stream/impl/SerialConnectionLogic.scala b/stream/src/main/scala/ch/jodersky/flow/stream/impl/SerialConnectionLogic.scala
index 764b054..13ee5d6 100644
--- a/flow-stream/src/main/scala/ch/jodersky/flow/stream/impl/SerialConnectionLogic.scala
+++ b/stream/src/main/scala/ch/jodersky/flow/stream/impl/SerialConnectionLogic.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 package stream
 package impl
 
@@ -9,7 +9,7 @@ import akka.stream.{FlowShape, Inlet, Outlet}
 import akka.stream.stage.{GraphStageLogic, InHandler, OutHandler}
 import akka.util.ByteString
 
-import ch.jodersky.flow.{Serial => CoreSerial, SerialSettings}
+import ch.jodersky.akka.serial.{Serial => CoreSerial, SerialSettings}
 
 /**
   * Graph logic that handles establishing and forwarding serial communication.
diff --git a/flow-stream/src/main/scala/ch/jodersky/flow/stream/impl/SerialConnectionStage.scala b/stream/src/main/scala/ch/jodersky/flow/stream/impl/SerialConnectionStage.scala
index ceeac01..20f38eb 100644
--- a/flow-stream/src/main/scala/ch/jodersky/flow/stream/impl/SerialConnectionStage.scala
+++ b/stream/src/main/scala/ch/jodersky/flow/stream/impl/SerialConnectionStage.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 package stream
 package impl
 
diff --git a/flow-stream/src/main/scala/ch/jodersky/flow/stream/impl/WatcherLogic.scala b/stream/src/main/scala/ch/jodersky/flow/stream/impl/WatcherLogic.scala
index 60b7c90..e9dc41d 100644
--- a/flow-stream/src/main/scala/ch/jodersky/flow/stream/impl/WatcherLogic.scala
+++ b/stream/src/main/scala/ch/jodersky/flow/stream/impl/WatcherLogic.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 package stream
 package impl
 
@@ -7,7 +7,7 @@ import scala.concurrent.Promise
 import akka.actor.{ActorRef, Terminated}
 import akka.stream.SourceShape
 import akka.stream.stage.GraphStageLogic
-import ch.jodersky.flow.{Serial => CoreSerial}
+import ch.jodersky.akka.serial.{Serial => CoreSerial}
 
 private[stream] class WatcherLogic(
   shape: SourceShape[String],
diff --git a/flow-stream/src/main/scala/ch/jodersky/flow/stream/impl/WatcherStage.scala b/stream/src/main/scala/ch/jodersky/flow/stream/impl/WatcherStage.scala
index 82fad69..be6af18 100644
--- a/flow-stream/src/main/scala/ch/jodersky/flow/stream/impl/WatcherStage.scala
+++ b/stream/src/main/scala/ch/jodersky/flow/stream/impl/WatcherStage.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 package stream
 package impl
 
diff --git a/flow-stream/src/test/scala/ch/jodersky/flow/stream/SerialSpec.scala b/stream/src/test/scala/ch/jodersky/flow/stream/SerialSpec.scala
index 1a1ebdc..29c4ef6 100644
--- a/flow-stream/src/test/scala/ch/jodersky/flow/stream/SerialSpec.scala
+++ b/stream/src/test/scala/ch/jodersky/flow/stream/SerialSpec.scala
@@ -1,4 +1,4 @@
-package ch.jodersky.flow
+package ch.jodersky.akka.serial
 package stream
 
 import scala.concurrent.Await