diff --git a/src/client/request_options.rs b/src/client/request_options.rs
index ff626b4..f5f17af 100644
--- a/src/client/request_options.rs
+++ b/src/client/request_options.rs
@@ -23,7 +23,7 @@ pub struct ReadEventsRequestOptions<'a> {
 }
 
 /// Options for observing events from the database
-#[derive(Debug, Clone, Serialize)]
+#[derive(Debug, Default, Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct ObserveEventsRequestOptions<'a> {
     /// Start reading events from this start event
diff --git a/src/lib.rs b/src/lib.rs
index 3843944..653157c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -22,3 +22,6 @@ pub mod client;
 pub mod container;
 pub mod error;
 pub mod event;
+
+pub use client::{Client, Precondition, request_options};
+pub use event::{Event, EventCandidate, ManagementEvent, TraceInfo};
diff --git a/tests/essentials.rs b/tests/essentials.rs
index 34a447f..1c91762 100644
--- a/tests/essentials.rs
+++ b/tests/essentials.rs
@@ -1,4 +1,4 @@
-use eventsourcingdb::{client::Client, container::Container};
+use eventsourcingdb::{Client, container::Container};
 
 #[tokio::test]
 async fn ping() {
diff --git a/tests/read_events.rs b/tests/read_events.rs
index f74c5c6..fbd7f67 100644
--- a/tests/read_events.rs
+++ b/tests/read_events.rs
@@ -1,10 +1,10 @@
 mod utils;
 
 use eventsourcingdb::{
-    client::request_options::{
+    container::Container,
+    request_options::{
         EventMissingStrategy, FromLatestEventOptions, Ordering, ReadEventsRequestOptions,
     },
-    container::Container,
 };
 use futures::TryStreamExt;
 use serde_json::json;
diff --git a/tests/utils/mod.rs b/tests/utils/mod.rs
index e444a5e..cf2fd3d 100644
--- a/tests/utils/mod.rs
+++ b/tests/utils/mod.rs
@@ -1,5 +1,5 @@
 use chrono::{TimeDelta, Utc};
-use eventsourcingdb::event::{Event, EventCandidate};
+use eventsourcingdb::{Event, EventCandidate};
 use serde_json::{Value, json};
 
 pub fn create_test_eventcandidate(
diff --git a/tests/write_events.rs b/tests/write_events.rs
index bf73a55..b5d74da 100644
--- a/tests/write_events.rs
+++ b/tests/write_events.rs
@@ -1,10 +1,6 @@
 mod utils;
 
-use eventsourcingdb::{
-    client::Precondition,
-    container::Container,
-    event::{EventCandidate, TraceInfo},
-};
+use eventsourcingdb::{EventCandidate, Precondition, TraceInfo, container::Container};
 use serde_json::json;
 use utils::{
     assert_event_match_eventcandidate, assert_events_match_eventcandidates,