diff --git a/src/action.rs b/src/action.rs
index e64729f..c694a25 100644
--- a/src/action.rs
+++ b/src/action.rs
@@ -1,7 +1,9 @@
+mod action_type;
 mod message;
 mod query;
 mod user;
 
+pub use action_type::Action;
 pub use crate::document::{definition::DocDef, field::FieldType};
 pub use message::MsgAction;
 pub use query::Query;
diff --git a/src/message/action.rs b/src/action/action_type.rs
similarity index 84%
rename from src/message/action.rs
rename to src/action/action_type.rs
index bcb7f8c..8b19e6e 100644
--- a/src/message/action.rs
+++ b/src/action/action_type.rs
@@ -1,11 +1,4 @@
-use crate::{
-    action::{MsgAction, Query},
-    document::definition::DocDef,
-    message::wrapper::{Addition, Delete, Records, Reply, Update},
-    mtterror::MTTError,
-    queue::data_director::Register,
-    UserAction,
-};
+use super::MsgAction;
 
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
 pub enum Action {
diff --git a/src/document/clock.rs b/src/document/clock.rs
index d568329..78cd2e3 100644
--- a/src/document/clock.rs
+++ b/src/document/clock.rs
@@ -1,7 +1,6 @@
 use crate::{
-    action::MsgAction,
+    action::{Action, MsgAction},
     message::{
-        action::Action,
         wrapper::{Message, Records},
     },
     name::{Name, NameType, Names},
diff --git a/src/document/create.rs b/src/document/create.rs
index 7d6d3e0..d7cc9fe 100644
--- a/src/document/create.rs
+++ b/src/document/create.rs
@@ -1,11 +1,10 @@
 use crate::{
-    action::{MsgAction, Query},
+    action::{Action, MsgAction, Query},
     document::{
         definition::{DocDef, DocFuncType},
         field::Field,
     },
     message::{
-        action::Action,
         wrapper::{
             CalcValue, Calculation, InternalRecord, InternalRecords, Message, Oid, Records, Reply,
             Update,
diff --git a/src/document/definition.rs b/src/document/definition.rs
index 0ad5574..3cb7cc1 100644
--- a/src/document/definition.rs
+++ b/src/document/definition.rs
@@ -1,10 +1,10 @@
 use crate::{
-    action::MsgAction,
+    action::{Action, MsgAction},
     document::{
         create::IndexType,
         field::{Field, FieldType},
     },
-    message::{action::Action, wrapper::CalcValue},
+    message::wrapper::CalcValue,
     mtterror::MTTError,
     name::{Name, NameType, Names},
     queue::data_director::{Include, Path},
diff --git a/src/document/session.rs b/src/document/session.rs
index 525ab9a..8886a7c 100644
--- a/src/document/session.rs
+++ b/src/document/session.rs
@@ -1,5 +1,5 @@
 use crate::{
-    action::Query,
+    action::{Action, Query},
     document::{
         clock::Clock,
         create::IndexType,
@@ -7,7 +7,6 @@ use crate::{
         field::FieldType,
     },
     message::{
-        action::Action,
         wrapper::{CalcValue, Calculation, Delete, Message, Operand, Update},
     },
     name::{Name, NameType},
diff --git a/src/lib.rs b/src/lib.rs
index efeb33f..7a56c02 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -5,7 +5,7 @@ mod mtterror;
 mod name;
 mod queue;
 
-use action::{DocDef, MsgAction, Query, UserAction};
+use action::{Action, DocDef, MsgAction, Query, UserAction};
 use document::{
     clock::Clock,
     create::CreateDoc,
@@ -13,7 +13,6 @@ use document::{
     session::Session,
 };
 use message::{
-    action::Action,
     wrapper::{Addition, CalcValue, Calculation, Message, Operand},
 };
 pub use mtterror::MTTError;
diff --git a/src/message.rs b/src/message.rs
index 0f3213c..e4ea5ca 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -1,2 +1 @@
-pub mod action;
 pub mod wrapper;
diff --git a/src/queue/data_director.rs b/src/queue/data_director.rs
index 15a134e..e8dc801 100644
--- a/src/queue/data_director.rs
+++ b/src/queue/data_director.rs
@@ -1,6 +1,6 @@
 use crate::{
-    action::MsgAction,
-    message::{action::Action, wrapper::Message},
+    action::{Action, MsgAction},
+    message::wrapper::Message,
     mtterror::MTTError,
     name::{Name, NameType, Names},
     queue::router::Queue,