diff --git a/src/document.rs b/src/document.rs
index 6c3ee71..3f50da8 100644
--- a/src/document.rs
+++ b/src/document.rs
@@ -1,3 +1,4 @@
 pub mod clock;
 pub mod create;
 pub mod definition;
+pub mod field;
diff --git a/src/document/create.rs b/src/document/create.rs
index 1f08ca6..b8bed26 100644
--- a/src/document/create.rs
+++ b/src/document/create.rs
@@ -1,7 +1,9 @@
 use crate::{
     data_director::{Include, Path, RegMsg, Register, RouteID},
-    document::definition::{DocDef, DocFuncType},
-    field::Field,
+    document::{
+        definition::{DocDef, DocFuncType},
+        field::Field,
+    },
     message::{
         Action, CalcValue, Calculation, InternalRecord, InternalRecords, Message, MsgAction, Oid,
         Query, Records, Reply, Update,
@@ -316,7 +318,7 @@ impl Indexes {
 #[cfg(test)]
 mod indexes {
     use super::*;
-    use crate::{field::FieldType, message::Operand};
+    use crate::{document::field::FieldType, message::Operand};
 
     fn get_fields(count: usize) -> Vec<Field> {
         let mut output = Vec::new();
@@ -819,7 +821,7 @@ impl DocumentFile {
 mod document_files {
     use super::*;
     use crate::{
-        field::FieldType,
+        document::field::FieldType,
         message::{Addition, Delete, Operand},
         name::{Name, Names},
         support_tests::TIMEOUT,
diff --git a/src/document/definition.rs b/src/document/definition.rs
index f692184..2a61c55 100644
--- a/src/document/definition.rs
+++ b/src/document/definition.rs
@@ -1,7 +1,9 @@
 use crate::{
     data_director::{Include, Path},
-    document::create::IndexType,
-    field::{Field, FieldType},
+    document::{
+        create::IndexType,
+        field::{Field, FieldType},
+    },
     message::{Action, CalcValue, MsgAction},
     mtterror::MTTError,
     name::{Name, NameType, Names},
diff --git a/src/field.rs b/src/document/field.rs
similarity index 100%
rename from src/field.rs
rename to src/document/field.rs
diff --git a/src/lib.rs b/src/lib.rs
index 5350653..02ef908 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,14 +1,16 @@
 mod data_director;
 mod document;
-mod field;
 mod message;
 mod mtterror;
 mod name;
 mod router;
 
 use data_director::{Include, Path, RegMsg, Register};
-use document::{clock::Clock, create::CreateDoc};
-use field::{Field, FieldType};
+use document::{
+    clock::Clock,
+    create::CreateDoc,
+    field::{Field, FieldType},
+};
 use message::{Action, Addition, CalcValue, Calculation, Message, Operand, Session};
 pub use message::{MsgAction, Query};
 use name::{Name, NameType};
diff --git a/src/message.rs b/src/message.rs
index fc5ef46..1bcfa60 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -3,8 +3,8 @@ use crate::{
     document::{
         create::IndexType,
         definition::{DocDef, DocFuncType},
+        field::{Field, FieldType},
     },
-    field::{Field, FieldType},
     mtterror::MTTError,
     name::{Name, NameType, Names},
     router::Queue,
diff --git a/src/mtterror.rs b/src/mtterror.rs
index e74c23e..522ca83 100644
--- a/src/mtterror.rs
+++ b/src/mtterror.rs
@@ -1,5 +1,5 @@
 use crate::{
-    field::{Field, FieldType},
+    document::field::{Field, FieldType},
     name::Name,
 };
 use isolang::Language;