Moved queue into separate module.

src/document/clock.rs

@@ -1,8 +1,10 @@
 use crate::{
-    data_director::{RegMsg, Register},
     message::{Message, MsgAction, Records},
     name::{Name, NameType, Names},
-    router::Queue,
+    queue::{
+        data_director::{RegMsg, Register},
+        router::Queue,
+    },
 };
 use std::{
     sync::mpsc::channel,
@@ -48,7 +50,7 @@ impl Clock {
 #[cfg(test)]
 mod clocks {
     use super::*;
-    use crate::data_director::{Include, Path};
+    use crate::queue::data_director::{Include, Path};
     use chrono::{TimeDelta, Utc};
 
     static TIMEOUT: Duration = Duration::from_millis(1500);

src/document/create.rs

@@ -1,5 +1,4 @@
 use crate::{
-    data_director::{Include, Path, RegMsg, Register, RouteID},
     document::{
         definition::{DocDef, DocFuncType},
         field::Field,
@@ -10,7 +9,10 @@ use crate::{
     },
     mtterror::MTTError,
     name::NameType,
-    router::Queue,
+    queue::{
+        data_director::{Include, Path, RegMsg, Register, RouteID},
+        router::Queue,
+    },
 };
 use std::{
     collections::{HashMap, HashSet},

src/document/definition.rs

@@ -1,5 +1,4 @@
 use crate::{
-    data_director::{Include, Path},
     document::{
         create::IndexType,
         field::{Field, FieldType},
@@ -7,6 +6,7 @@ use crate::{
     message::{Action, CalcValue, MsgAction},
     mtterror::MTTError,
     name::{Name, NameType, Names},
+    queue::data_director::{Include, Path},
 };
 use std::collections::{HashMap, HashSet};
 use uuid::Uuid;

src/document/session.rs

@@ -1,5 +1,4 @@
 use crate::{
-    data_director::{Include, Path, RegMsg, Register},
     document::{
         create::IndexType,
         definition::{DocDef, DocFuncType},
@@ -7,7 +6,10 @@ use crate::{
     },
     message::{Action, CalcValue, Calculation, Delete, Message, Operand, Query, Update},
     name::{Name, NameType},
-    router::Queue,
+    queue::{
+        data_director::{Include, Path, RegMsg, Register},
+        router::Queue,
+    },
 };
 use std::{sync::mpsc::channel, time::Duration};
 
@@ -86,11 +88,11 @@ impl Session {
 mod sessions {
     use super::*;
     use crate::{
-        data_director::{Include, Path, RegMsg, Register},
         document::{clock::Clock, create::CreateDoc, field::Field},
         message::{Addition, MsgAction, Query, Records},
         mtterror::MTTError,
         name::{Name, NameType, Names},
+        queue::data_director::{Include, Path, RegMsg, Register},
         support_tests::TIMEOUT,
     };
     use chrono::{DateTime, Utc};

src/lib.rs

@@ -1,11 +1,9 @@
-mod data_director;
 mod document;
 mod message;
 mod mtterror;
 mod name;
-mod router;
+mod queue;
 
-use data_director::{Include, Path, RegMsg, Register};
 use document::{
     clock::Clock,
     create::CreateDoc,
@@ -15,7 +13,10 @@ use document::{
 use message::{Action, Addition, CalcValue, Calculation, Message, Operand};
 pub use message::{MsgAction, Query};
 use name::{Name, NameType};
-use router::Queue;
+use queue::{
+    data_director::{Include, Path, RegMsg, Register},
+    router::Queue,
+};
 use std::sync::mpsc::{channel, Receiver};
 use uuid::Uuid;
 

src/message.rs

@@ -1,11 +1,11 @@
 use crate::{
-    data_director::{Include, Path, Register, Route},
     document::{
         definition::DocDef,
         field::{Field, FieldType},
     },
     mtterror::MTTError,
     name::{NameType, Names},
+    queue::data_director::{Include, Path, Register, Route},
 };
 use chrono::prelude::*;
 use std::{

src/queue.rs

@@ -0,0 +1,2 @@
+pub mod data_director;
+pub mod router;

src/queue/data_director.rs

@@ -2,7 +2,7 @@ use crate::{
     message::{Action, Message, MsgAction},
     mtterror::MTTError,
     name::{Name, NameType, Names},
-    router::Queue,
+    queue::router::Queue,
 };
 use std::{
     collections::{HashMap, HashSet},

src/queue/router.rs

@@ -1,8 +1,8 @@
 use crate::{
-    data_director::{DocRegistry, RegMsg, Register},
     message::Message,
     mtterror::MTTError,
     name::NameType,
+    queue::data_director::{DocRegistry, RegMsg, Register},
 };
 use std::{
     collections::HashMap,
@@ -244,9 +244,9 @@ mod routers {
 mod queues {
     use super::*;
     use crate::{
-        data_director::{Include, Path},
         message::MsgAction,
         name::Name,
+        queue::data_director::{Include, Path},
         support_tests::TIMEOUT,
     };
     use std::sync::mpsc::{Receiver, RecvTimeoutError};