diff --git a/src/Bound.php b/src/Bound.php
index 048afb9..2ff2036 100644
--- a/src/Bound.php
+++ b/src/Bound.php
@@ -6,12 +6,6 @@
 
 use JsonSerializable;
 
-enum BoundType: string
-{
-    case INCLUSIVE = 'inclusive';
-    case EXCLUSIVE = 'exclusive';
-}
-
 final readonly class Bound implements JsonSerializable
 {
     public function __construct(
diff --git a/src/BoundType.php b/src/BoundType.php
new file mode 100644
index 0000000..cab69aa
--- /dev/null
+++ b/src/BoundType.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Thenativeweb\Eventsourcingdb;
+
+enum BoundType: string
+{
+    case INCLUSIVE = 'inclusive';
+    case EXCLUSIVE = 'exclusive';
+}
diff --git a/src/Ed25519.php b/src/Ed25519.php
new file mode 100644
index 0000000..cc296d7
--- /dev/null
+++ b/src/Ed25519.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Thenativeweb\Eventsourcingdb;
+
+final readonly class Ed25519
+{
+    public function __construct(
+        public string $privateKey,
+        public string $publicKey,
+    ) {
+    }
+}
diff --git a/src/ObserveEventsOptions.php b/src/ObserveEventsOptions.php
index f1f950d..a26a857 100755
--- a/src/ObserveEventsOptions.php
+++ b/src/ObserveEventsOptions.php
@@ -6,31 +6,6 @@
 
 use JsonSerializable;
 
-enum ObserveIfEventIsMissing: string
-{
-    case READ_EVERYTHING = 'read-everything';
-    case WAIT_FOR_EVENT = 'wait-for-event';
-}
-
-final readonly class ObserveFromLatestEvent implements JsonSerializable
-{
-    public function __construct(
-        public string $subject,
-        public string $type,
-        public ObserveIfEventIsMissing $ifEventIsMissing,
-    ) {
-    }
-
-    public function jsonSerialize(): array
-    {
-        return [
-            'subject' => $this->subject,
-            'type' => $this->type,
-            'ifEventIsMissing' => $this->ifEventIsMissing->value,
-        ];
-    }
-}
-
 final readonly class ObserveEventsOptions implements JsonSerializable
 {
     public function __construct(
diff --git a/src/ObserveFromLatestEvent.php b/src/ObserveFromLatestEvent.php
new file mode 100755
index 0000000..a970413
--- /dev/null
+++ b/src/ObserveFromLatestEvent.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Thenativeweb\Eventsourcingdb;
+
+use JsonSerializable;
+
+final readonly class ObserveFromLatestEvent implements JsonSerializable
+{
+    public function __construct(
+        public string $subject,
+        public string $type,
+        public ObserveIfEventIsMissing $ifEventIsMissing,
+    ) {
+    }
+
+    public function jsonSerialize(): array
+    {
+        return [
+            'subject' => $this->subject,
+            'type' => $this->type,
+            'ifEventIsMissing' => $this->ifEventIsMissing->value,
+        ];
+    }
+}
diff --git a/src/ObserveIfEventIsMissing.php b/src/ObserveIfEventIsMissing.php
new file mode 100755
index 0000000..fda16a0
--- /dev/null
+++ b/src/ObserveIfEventIsMissing.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Thenativeweb\Eventsourcingdb;
+
+enum ObserveIfEventIsMissing: string
+{
+    case READ_EVERYTHING = 'read-everything';
+    case WAIT_FOR_EVENT = 'wait-for-event';
+}
diff --git a/src/Order.php b/src/Order.php
new file mode 100644
index 0000000..4b774bb
--- /dev/null
+++ b/src/Order.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Thenativeweb\Eventsourcingdb;
+
+enum Order: string
+{
+    case CHRONOLOGICAL = 'chronological';
+    case ANTICHRONOLOGICAL = 'antichronological';
+}
diff --git a/src/ReadEventsOptions.php b/src/ReadEventsOptions.php
index 2c074ea..1b669bc 100644
--- a/src/ReadEventsOptions.php
+++ b/src/ReadEventsOptions.php
@@ -6,37 +6,6 @@
 
 use JsonSerializable;
 
-enum Order: string
-{
-    case CHRONOLOGICAL = 'chronological';
-    case ANTICHRONOLOGICAL = 'antichronological';
-}
-
-enum ReadIfEventIsMissing: string
-{
-    case READ_NOTHING = 'read-nothing';
-    case READ_EVERYTHING = 'read-everything';
-}
-
-final readonly class ReadFromLatestEvent implements JsonSerializable
-{
-    public function __construct(
-        public string $subject,
-        public string $type,
-        public ReadIfEventIsMissing $ifEventIsMissing,
-    ) {
-    }
-
-    public function jsonSerialize(): array
-    {
-        return [
-            'subject' => $this->subject,
-            'type' => $this->type,
-            'ifEventIsMissing' => $this->ifEventIsMissing->value,
-        ];
-    }
-}
-
 final readonly class ReadEventsOptions implements JsonSerializable
 {
     public function __construct(
diff --git a/src/ReadFromLatestEvent.php b/src/ReadFromLatestEvent.php
new file mode 100644
index 0000000..f19d4fd
--- /dev/null
+++ b/src/ReadFromLatestEvent.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Thenativeweb\Eventsourcingdb;
+
+use JsonSerializable;
+
+final readonly class ReadFromLatestEvent implements JsonSerializable
+{
+    public function __construct(
+        public string $subject,
+        public string $type,
+        public ReadIfEventIsMissing $ifEventIsMissing,
+    ) {
+    }
+
+    public function jsonSerialize(): array
+    {
+        return [
+            'subject' => $this->subject,
+            'type' => $this->type,
+            'ifEventIsMissing' => $this->ifEventIsMissing->value,
+        ];
+    }
+}
diff --git a/src/ReadIfEventIsMissing.php b/src/ReadIfEventIsMissing.php
new file mode 100644
index 0000000..73783f4
--- /dev/null
+++ b/src/ReadIfEventIsMissing.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Thenativeweb\Eventsourcingdb;
+
+enum ReadIfEventIsMissing: string
+{
+    case READ_NOTHING = 'read-nothing';
+    case READ_EVERYTHING = 'read-everything';
+}
diff --git a/src/SigningKey.php b/src/SigningKey.php
index 255ac28..016b4a4 100644
--- a/src/SigningKey.php
+++ b/src/SigningKey.php
@@ -12,15 +12,6 @@
     define('OPENSSL_KEYTYPE_ED25519', 5);
 }
 
-final readonly class Ed25519
-{
-    public function __construct(
-        public string $privateKey,
-        public string $publicKey,
-    ) {
-    }
-}
-
 final class SigningKey
 {
     public string $privateKeyPem;