diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md
index e26e802..b8782ab 100644
--- a/ARCHITECTURE.md
+++ b/ARCHITECTURE.md
@@ -56,7 +56,7 @@ This code has async code, to handle input streams and communication with clients
 - `filter.rs`: Filter managers: handle lines, persistance, store matches and trigger actions. This is the main piece of runtime logic.
 - `socket.rs`: The socket task, responsible for communication with clients.
 
-### `src/waltree`
+### `src/tree`
 
 Persistence layer.
 
diff --git a/src/daemon/filter.rs b/src/daemon/filter.rs
index e8f5d13..b628aa7 100644
--- a/src/daemon/filter.rs
+++ b/src/daemon/filter.rs
@@ -15,6 +15,10 @@ use tracing::{error, info};
 use crate::{
     concepts::{Action, Filter, Match, Pattern, Time},
     protocol::{Order, PatternStatus},
+    treedb::{
+        helpers::{to_match, to_matchtime, to_time, to_u64},
+        Database, Tree,
+    },
 };
 
 use super::{shutdown::ShutdownToken, KeyspaceExt as _, MatchTime, Tree};
diff --git a/src/lib.rs b/src/lib.rs
index ee73153..2e7d5af 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -16,4 +16,4 @@ pub mod concepts;
 pub mod daemon;
 pub mod protocol;
 pub mod tests;
-pub mod waltree;
+pub mod treedb;
diff --git a/src/waltree/helpers.rs b/src/treedb/helpers.rs
similarity index 100%
rename from src/waltree/helpers.rs
rename to src/treedb/helpers.rs
diff --git a/src/waltree/mod.rs b/src/treedb/mod.rs
similarity index 99%
rename from src/waltree/mod.rs
rename to src/treedb/mod.rs
index f550888..a8d82ef 100644
--- a/src/waltree/mod.rs
+++ b/src/treedb/mod.rs
@@ -372,7 +372,7 @@ mod tests {
 
     use crate::{
         concepts::Config,
-        waltree::{helpers::*, raw::WriteDB, rotate_db, Database, Entry, DB_NAME},
+        treedb::{helpers::*, raw::WriteDB, rotate_db, Database, Entry, DB_NAME},
     };
 
     #[tokio::test]
diff --git a/src/waltree/raw.rs b/src/treedb/raw.rs
similarity index 99%
rename from src/waltree/raw.rs
rename to src/treedb/raw.rs
index cc546e2..c2042ff 100644
--- a/src/waltree/raw.rs
+++ b/src/treedb/raw.rs
@@ -300,7 +300,7 @@ mod tests {
     use tempfile::NamedTempFile;
     use tokio::fs::{read, write, File};
 
-    use crate::waltree::{
+    use crate::treedb::{
         raw::{DatabaseError, ReadDB, WriteDB, DB_TREE_ID},
         Entry,
     };