diff --git a/fiftyforms/akka-persistence/src/main/scala/fiftyforms/CommandHandlerException.scala b/fiftyforms/akka-persistence/src/main/scala/fiftyforms/CommandHandlerException.scala
deleted file mode 100644
index 49a0e3d..0000000
--- a/fiftyforms/akka-persistence/src/main/scala/fiftyforms/CommandHandlerException.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-package fiftyforms.akka
-
-// Base class for all command-processing related exceptions from handlers
-sealed abstract class CommandHandlerException(
-    msg: String,
-    cause: Option[Throwable] = None
-) extends Exception(msg, cause.orNull)
-
-// TODO: use a typeclass like "Show" to create the error message
-case class CommandNotAvailable[C, S](cmd: C, state: S)
-    extends CommandHandlerException(
-      s"Příkaz $cmd není dostupný ve stavu $state"
-    )
-
-// TODO: use a typeclass like "Show" to create the error message
-case class CommandRejected[C, S](reason: String, cmd: C, state: S)
-    extends CommandHandlerException(
-      s"Příkaz $cmd byl ve stavu $state odmítnut s odůvodněním $reason"
-    )

diff --git a/fiftyforms/akka-persistence/src/main/scala/fiftyforms/CommandHandlerException.scala b/fiftyforms/akka-persistence/src/main/scala/fiftyforms/CommandHandlerException.scala
deleted file mode 100644
index 49a0e3d..0000000
--- a/fiftyforms/akka-persistence/src/main/scala/fiftyforms/CommandHandlerException.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-package fiftyforms.akka
-
-// Base class for all command-processing related exceptions from handlers
-sealed abstract class CommandHandlerException(
-    msg: String,
-    cause: Option[Throwable] = None
-) extends Exception(msg, cause.orNull)
-
-// TODO: use a typeclass like "Show" to create the error message
-case class CommandNotAvailable[C, S](cmd: C, state: S)
-    extends CommandHandlerException(
-      s"Příkaz $cmd není dostupný ve stavu $state"
-    )
-
-// TODO: use a typeclass like "Show" to create the error message
-case class CommandRejected[C, S](reason: String, cmd: C, state: S)
-    extends CommandHandlerException(
-      s"Příkaz $cmd byl ve stavu $state odmítnut s odůvodněním $reason"
-    )
diff --git a/fiftyforms/akka-persistence/src/main/scala/fiftyforms/EventHandlerException.scala b/fiftyforms/akka-persistence/src/main/scala/fiftyforms/EventHandlerException.scala
deleted file mode 100644
index 77172d0..0000000
--- a/fiftyforms/akka-persistence/src/main/scala/fiftyforms/EventHandlerException.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package fiftyforms.akka
-
-sealed abstract class EventHandlerException(
-    msg: String,
-    cause: Option[Throwable] = None
-) extends Exception(msg, cause.orNull)
-
-case class UnhandledEvent[Event, State](event: Event, state: State)
-    extends EventHandlerException(
-      s"Událost $event nastala ve stavu $state bez možnosti zpracování"
-    )

diff --git a/fiftyforms/akka-persistence/src/main/scala/fiftyforms/CommandHandlerException.scala b/fiftyforms/akka-persistence/src/main/scala/fiftyforms/CommandHandlerException.scala
deleted file mode 100644
index 49a0e3d..0000000
--- a/fiftyforms/akka-persistence/src/main/scala/fiftyforms/CommandHandlerException.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-package fiftyforms.akka
-
-// Base class for all command-processing related exceptions from handlers
-sealed abstract class CommandHandlerException(
-    msg: String,
-    cause: Option[Throwable] = None
-) extends Exception(msg, cause.orNull)
-
-// TODO: use a typeclass like "Show" to create the error message
-case class CommandNotAvailable[C, S](cmd: C, state: S)
-    extends CommandHandlerException(
-      s"Příkaz $cmd není dostupný ve stavu $state"
-    )
-
-// TODO: use a typeclass like "Show" to create the error message
-case class CommandRejected[C, S](reason: String, cmd: C, state: S)
-    extends CommandHandlerException(
-      s"Příkaz $cmd byl ve stavu $state odmítnut s odůvodněním $reason"
-    )
diff --git a/fiftyforms/akka-persistence/src/main/scala/fiftyforms/EventHandlerException.scala b/fiftyforms/akka-persistence/src/main/scala/fiftyforms/EventHandlerException.scala
deleted file mode 100644
index 77172d0..0000000
--- a/fiftyforms/akka-persistence/src/main/scala/fiftyforms/EventHandlerException.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package fiftyforms.akka
-
-sealed abstract class EventHandlerException(
-    msg: String,
-    cause: Option[Throwable] = None
-) extends Exception(msg, cause.orNull)
-
-case class UnhandledEvent[Event, State](event: Event, state: State)
-    extends EventHandlerException(
-      s"Událost $event nastala ve stavu $state bez možnosti zpracování"
-    )
diff --git a/fiftyforms/akka-persistence/src/main/scala/fiftyforms/akka/CommandHandlerException.scala b/fiftyforms/akka-persistence/src/main/scala/fiftyforms/akka/CommandHandlerException.scala
new file mode 100644
index 0000000..49a0e3d
--- /dev/null
+++ b/fiftyforms/akka-persistence/src/main/scala/fiftyforms/akka/CommandHandlerException.scala
@@ -0,0 +1,19 @@
+package fiftyforms.akka
+
+// Base class for all command-processing related exceptions from handlers
+sealed abstract class CommandHandlerException(
+    msg: String,
+    cause: Option[Throwable] = None
+) extends Exception(msg, cause.orNull)
+
+// TODO: use a typeclass like "Show" to create the error message
+case class CommandNotAvailable[C, S](cmd: C, state: S)
+    extends CommandHandlerException(
+      s"Příkaz $cmd není dostupný ve stavu $state"
+    )
+
+// TODO: use a typeclass like "Show" to create the error message
+case class CommandRejected[C, S](reason: String, cmd: C, state: S)
+    extends CommandHandlerException(
+      s"Příkaz $cmd byl ve stavu $state odmítnut s odůvodněním $reason"
+    )

diff --git a/fiftyforms/akka-persistence/src/main/scala/fiftyforms/CommandHandlerException.scala b/fiftyforms/akka-persistence/src/main/scala/fiftyforms/CommandHandlerException.scala
deleted file mode 100644
index 49a0e3d..0000000
--- a/fiftyforms/akka-persistence/src/main/scala/fiftyforms/CommandHandlerException.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-package fiftyforms.akka
-
-// Base class for all command-processing related exceptions from handlers
-sealed abstract class CommandHandlerException(
-    msg: String,
-    cause: Option[Throwable] = None
-) extends Exception(msg, cause.orNull)
-
-// TODO: use a typeclass like "Show" to create the error message
-case class CommandNotAvailable[C, S](cmd: C, state: S)
-    extends CommandHandlerException(
-      s"Příkaz $cmd není dostupný ve stavu $state"
-    )
-
-// TODO: use a typeclass like "Show" to create the error message
-case class CommandRejected[C, S](reason: String, cmd: C, state: S)
-    extends CommandHandlerException(
-      s"Příkaz $cmd byl ve stavu $state odmítnut s odůvodněním $reason"
-    )
diff --git a/fiftyforms/akka-persistence/src/main/scala/fiftyforms/EventHandlerException.scala b/fiftyforms/akka-persistence/src/main/scala/fiftyforms/EventHandlerException.scala
deleted file mode 100644
index 77172d0..0000000
--- a/fiftyforms/akka-persistence/src/main/scala/fiftyforms/EventHandlerException.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package fiftyforms.akka
-
-sealed abstract class EventHandlerException(
-    msg: String,
-    cause: Option[Throwable] = None
-) extends Exception(msg, cause.orNull)
-
-case class UnhandledEvent[Event, State](event: Event, state: State)
-    extends EventHandlerException(
-      s"Událost $event nastala ve stavu $state bez možnosti zpracování"
-    )
diff --git a/fiftyforms/akka-persistence/src/main/scala/fiftyforms/akka/CommandHandlerException.scala b/fiftyforms/akka-persistence/src/main/scala/fiftyforms/akka/CommandHandlerException.scala
new file mode 100644
index 0000000..49a0e3d
--- /dev/null
+++ b/fiftyforms/akka-persistence/src/main/scala/fiftyforms/akka/CommandHandlerException.scala
@@ -0,0 +1,19 @@
+package fiftyforms.akka
+
+// Base class for all command-processing related exceptions from handlers
+sealed abstract class CommandHandlerException(
+    msg: String,
+    cause: Option[Throwable] = None
+) extends Exception(msg, cause.orNull)
+
+// TODO: use a typeclass like "Show" to create the error message
+case class CommandNotAvailable[C, S](cmd: C, state: S)
+    extends CommandHandlerException(
+      s"Příkaz $cmd není dostupný ve stavu $state"
+    )
+
+// TODO: use a typeclass like "Show" to create the error message
+case class CommandRejected[C, S](reason: String, cmd: C, state: S)
+    extends CommandHandlerException(
+      s"Příkaz $cmd byl ve stavu $state odmítnut s odůvodněním $reason"
+    )
diff --git a/fiftyforms/akka-persistence/src/main/scala/fiftyforms/akka/EventHandlerException.scala b/fiftyforms/akka-persistence/src/main/scala/fiftyforms/akka/EventHandlerException.scala
new file mode 100644
index 0000000..77172d0
--- /dev/null
+++ b/fiftyforms/akka-persistence/src/main/scala/fiftyforms/akka/EventHandlerException.scala
@@ -0,0 +1,11 @@
+package fiftyforms.akka
+
+sealed abstract class EventHandlerException(
+    msg: String,
+    cause: Option[Throwable] = None
+) extends Exception(msg, cause.orNull)
+
+case class UnhandledEvent[Event, State](event: Event, state: State)
+    extends EventHandlerException(
+      s"Událost $event nastala ve stavu $state bez možnosti zpracování"
+    )