diff --git a/src/comp/mod.rs b/src/comp/mod.rs
new file mode 100644
index 00000000..42e8dd69
--- /dev/null
+++ b/src/comp/mod.rs
@@ -0,0 +1 @@
+pub(crate) mod cli;
diff --git a/src/config/mod.rs b/src/config/mod.rs
new file mode 100644
index 00000000..f7a32e1c
--- /dev/null
+++ b/src/config/mod.rs
@@ -0,0 +1,2 @@
+pub(crate) mod cli;
+pub(crate) mod model;
diff --git a/src/flag/mod.rs b/src/flag/mod.rs
new file mode 100644
index 00000000..f7a32e1c
--- /dev/null
+++ b/src/flag/mod.rs
@@ -0,0 +1,2 @@
+pub(crate) mod cli;
+pub(crate) mod model;
diff --git a/src/imap/mod.rs b/src/imap/mod.rs
new file mode 100644
index 00000000..f7a32e1c
--- /dev/null
+++ b/src/imap/mod.rs
@@ -0,0 +1,2 @@
+pub(crate) mod cli;
+pub(crate) mod model;
diff --git a/src/main.rs b/src/main.rs
index 16e857db..8de4fec4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,38 +3,16 @@ use error_chain::error_chain;
 use log::{debug, error, trace};
 use std::{env, path::PathBuf};
 
+mod comp;
+mod config;
+mod flag;
+mod imap;
 mod input;
+mod mbox;
+mod msg;
+mod output;
 mod smtp;
 mod table;
-mod config {
-    pub(crate) mod cli;
-    pub(crate) mod model;
-}
-mod output {
-    pub(crate) mod cli;
-    pub(crate) mod fmt;
-    pub(crate) mod log;
-    pub(crate) mod utils;
-}
-mod imap {
-    pub(crate) mod cli;
-    pub(crate) mod model;
-}
-mod flag {
-    pub(crate) mod cli;
-    pub(crate) mod model;
-}
-mod msg {
-    pub(crate) mod cli;
-    pub(crate) mod model;
-}
-mod mbox {
-    pub(crate) mod cli;
-    pub(crate) mod model;
-}
-mod comp {
-    pub(crate) mod cli;
-}
 
 use crate::{
     comp::cli::{comp_matches, comp_subcmds},
diff --git a/src/mbox/mod.rs b/src/mbox/mod.rs
new file mode 100644
index 00000000..f7a32e1c
--- /dev/null
+++ b/src/mbox/mod.rs
@@ -0,0 +1,2 @@
+pub(crate) mod cli;
+pub(crate) mod model;
diff --git a/src/msg/mod.rs b/src/msg/mod.rs
new file mode 100644
index 00000000..f7a32e1c
--- /dev/null
+++ b/src/msg/mod.rs
@@ -0,0 +1,2 @@
+pub(crate) mod cli;
+pub(crate) mod model;
diff --git a/src/output/mod.rs b/src/output/mod.rs
new file mode 100644
index 00000000..ddf5f1f0
--- /dev/null
+++ b/src/output/mod.rs
@@ -0,0 +1,4 @@
+pub(crate) mod cli;
+pub(crate) mod fmt;
+pub(crate) mod log;
+pub(crate) mod utils;