diff --git a/radicle-node/src/service.rs b/radicle-node/src/service.rs
index 955d2e3a..419ef675 100644
--- a/radicle-node/src/service.rs
+++ b/radicle-node/src/service.rs
@@ -6,7 +6,6 @@ pub mod io;
 pub mod limitter;
 pub mod message;
 pub mod session;
-pub mod tracking;
 
 use std::collections::hash_map::Entry;
 use std::collections::{BTreeMap, HashMap, HashSet};
@@ -23,6 +22,7 @@ use nonempty::NonEmpty;
 use radicle::node::address;
 use radicle::node::address::{AddressBook, KnownAddress};
 use radicle::node::config::PeerConfig;
+pub use radicle::node::tracking::config as tracking;
 use radicle::node::ConnectOptions;
 use radicle::storage::RepositoryError;
 
diff --git a/radicle/src/node/tracking.rs b/radicle/src/node/tracking.rs
index 94a44349..d097c93c 100644
--- a/radicle/src/node/tracking.rs
+++ b/radicle/src/node/tracking.rs
@@ -1,3 +1,4 @@
+pub mod config;
 pub mod store;
 
 use std::fmt;
diff --git a/radicle-node/src/service/tracking.rs b/radicle/src/node/tracking/config.rs
similarity index 95%
rename from radicle-node/src/service/tracking.rs
rename to radicle/src/node/tracking/config.rs
index efc8edc5..a350db8e 100644
--- a/radicle-node/src/service/tracking.rs
+++ b/radicle/src/node/tracking/config.rs
@@ -5,11 +5,9 @@ use std::ops;
 use log::error;
 use thiserror::Error;
 
-use radicle::crypto::PublicKey;
-use radicle::storage::{Namespaces, ReadRepository as _, ReadStorage, RepositoryError};
-
-use crate::prelude::Id;
-use crate::service::NodeId;
+use crate::crypto::PublicKey;
+use crate::prelude::{Id, NodeId};
+use crate::storage::{Namespaces, ReadRepository as _, ReadStorage, RepositoryError};
 
 pub use crate::node::tracking::store;
 pub use crate::node::tracking::store::Config as Store;
@@ -38,6 +36,8 @@ pub enum NamespacesError {
         #[source]
         err: RepositoryError,
     },
+    #[error(transparent)]
+    Git(#[from] crate::git::raw::Error),
     #[error("Could not find any trusted nodes for {rid}")]
     NoTrusted { rid: Id },
 }