diff --git a/shared-lib/lib-ot/src/core/mod.rs b/shared-lib/lib-ot/src/core/mod.rs
index e8253e6ebc..7d038c8b5d 100644
--- a/shared-lib/lib-ot/src/core/mod.rs
+++ b/shared-lib/lib-ot/src/core/mod.rs
@@ -1,12 +1,12 @@
 pub mod attributes;
 mod delta;
-mod document;
 mod interval;
+mod node_tree;
 mod ot_str;
 
 pub use attributes::*;
 pub use delta::operation::*;
 pub use delta::*;
-pub use document::*;
 pub use interval::*;
+pub use node_tree::*;
 pub use ot_str::*;
diff --git a/shared-lib/lib-ot/src/core/document/mod.rs b/shared-lib/lib-ot/src/core/node_tree/mod.rs
similarity index 84%
rename from shared-lib/lib-ot/src/core/document/mod.rs
rename to shared-lib/lib-ot/src/core/node_tree/mod.rs
index b60d8c0251..1f7205201d 100644
--- a/shared-lib/lib-ot/src/core/document/mod.rs
+++ b/shared-lib/lib-ot/src/core/node_tree/mod.rs
@@ -2,14 +2,14 @@
 
 mod node;
 mod node_serde;
-mod node_tree;
 mod operation;
 mod operation_serde;
 mod path;
 mod transaction;
+mod tree;
 
 pub use node::*;
-pub use node_tree::*;
 pub use operation::*;
 pub use path::*;
 pub use transaction::*;
+pub use tree::*;
diff --git a/shared-lib/lib-ot/src/core/document/node.rs b/shared-lib/lib-ot/src/core/node_tree/node.rs
similarity index 100%
rename from shared-lib/lib-ot/src/core/document/node.rs
rename to shared-lib/lib-ot/src/core/node_tree/node.rs
diff --git a/shared-lib/lib-ot/src/core/document/node_serde.rs b/shared-lib/lib-ot/src/core/node_tree/node_serde.rs
similarity index 100%
rename from shared-lib/lib-ot/src/core/document/node_serde.rs
rename to shared-lib/lib-ot/src/core/node_tree/node_serde.rs
diff --git a/shared-lib/lib-ot/src/core/document/operation.rs b/shared-lib/lib-ot/src/core/node_tree/operation.rs
similarity index 98%
rename from shared-lib/lib-ot/src/core/document/operation.rs
rename to shared-lib/lib-ot/src/core/node_tree/operation.rs
index c43fffd532..cdd2b99c7b 100644
--- a/shared-lib/lib-ot/src/core/document/operation.rs
+++ b/shared-lib/lib-ot/src/core/node_tree/operation.rs
@@ -1,6 +1,5 @@
 use crate::core::attributes::Attributes;
-use crate::core::document::path::Path;
-use crate::core::{NodeBodyChangeset, NodeData};
+use crate::core::{NodeBodyChangeset, NodeData, Path};
 use crate::errors::OTError;
 use serde::{Deserialize, Serialize};
 use std::rc::Rc;
diff --git a/shared-lib/lib-ot/src/core/document/operation_serde.rs b/shared-lib/lib-ot/src/core/node_tree/operation_serde.rs
similarity index 100%
rename from shared-lib/lib-ot/src/core/document/operation_serde.rs
rename to shared-lib/lib-ot/src/core/node_tree/operation_serde.rs
diff --git a/shared-lib/lib-ot/src/core/document/path.rs b/shared-lib/lib-ot/src/core/node_tree/path.rs
similarity index 100%
rename from shared-lib/lib-ot/src/core/document/path.rs
rename to shared-lib/lib-ot/src/core/node_tree/path.rs
diff --git a/shared-lib/lib-ot/src/core/document/transaction.rs b/shared-lib/lib-ot/src/core/node_tree/transaction.rs
similarity index 98%
rename from shared-lib/lib-ot/src/core/document/transaction.rs
rename to shared-lib/lib-ot/src/core/node_tree/transaction.rs
index dbe09bba4a..1f855698cf 100644
--- a/shared-lib/lib-ot/src/core/document/transaction.rs
+++ b/shared-lib/lib-ot/src/core/node_tree/transaction.rs
@@ -1,6 +1,5 @@
 use crate::core::attributes::Attributes;
-use crate::core::document::path::Path;
-use crate::core::{NodeData, NodeOperation, NodeTree};
+use crate::core::{NodeData, NodeOperation, NodeTree, Path};
 use crate::errors::OTError;
 use indextree::NodeId;
 use std::rc::Rc;
diff --git a/shared-lib/lib-ot/src/core/document/node_tree.rs b/shared-lib/lib-ot/src/core/node_tree/tree.rs
similarity index 99%
rename from shared-lib/lib-ot/src/core/document/node_tree.rs
rename to shared-lib/lib-ot/src/core/node_tree/tree.rs
index 700e55ef9c..fde8ccf20c 100644
--- a/shared-lib/lib-ot/src/core/document/node_tree.rs
+++ b/shared-lib/lib-ot/src/core/node_tree/tree.rs
@@ -1,6 +1,5 @@
 use crate::core::attributes::Attributes;
-use crate::core::document::path::Path;
-use crate::core::{Node, NodeBodyChangeset, NodeData, NodeOperation, OperationTransform, Transaction};
+use crate::core::{Node, NodeBodyChangeset, NodeData, NodeOperation, OperationTransform, Path, Transaction};
 use crate::errors::{ErrorBuilder, OTError, OTErrorCode};
 use indextree::{Arena, Children, FollowingSiblings, NodeId};
 use std::rc::Rc;