4 files changed, 5 insertions, 4 deletions
diff --git a/src/imap/command/anonymous.rs b/src/imap/command/anonymous.rs
index 0582b06..811d1e4 100644
--- a/src/imap/command/anonymous.rs
+++ b/src/imap/command/anonymous.rs
@@ -9,7 +9,7 @@ use crate::imap::command::anystate;
 use crate::imap::flow;
 use crate::imap::response::Response;
 use crate::login::ArcLoginProvider;
-use crate::mail::user::User;
+use crate::user::User;
 
 //--- dispatching
 
diff --git a/src/imap/command/authenticated.rs b/src/imap/command/authenticated.rs
index eb8833d..3d332ec 100644
--- a/src/imap/command/authenticated.rs
+++ b/src/imap/command/authenticated.rs
@@ -22,8 +22,9 @@ use crate::imap::response::Response;
 use crate::imap::Body;
 
 use crate::mail::uidindex::*;
-use crate::mail::user::{User, MAILBOX_HIERARCHY_DELIMITER as MBX_HIER_DELIM_RAW};
+use crate::user::User;
 use crate::mail::IMF;
+use crate::mail::namespace::MAILBOX_HIERARCHY_DELIMITER as MBX_HIER_DELIM_RAW;
 
 pub struct AuthenticatedContext<'a> {
     pub req: &'a Command<'static>,
diff --git a/src/imap/command/mod.rs b/src/imap/command/mod.rs
index 073040e..f201eb6 100644
--- a/src/imap/command/mod.rs
+++ b/src/imap/command/mod.rs
@@ -3,7 +3,7 @@ pub mod anystate;
 pub mod authenticated;
 pub mod selected;
 
-use crate::mail::user::INBOX;
+use crate::mail::namespace::INBOX;
 use imap_codec::imap_types::mailbox::Mailbox as MailboxCodec;
 
 /// Convert an IMAP mailbox name/identifier representation
diff --git a/src/imap/command/selected.rs b/src/imap/command/selected.rs
index d000905..eedfbd6 100644
--- a/src/imap/command/selected.rs
+++ b/src/imap/command/selected.rs
@@ -17,7 +17,7 @@ use crate::imap::command::{anystate, authenticated, MailboxName};
 use crate::imap::flow;
 use crate::imap::mailbox_view::{MailboxView, UpdateParameters};
 use crate::imap::response::Response;
-use crate::mail::user::User;
+use crate::user::User;
 
 pub struct SelectedContext<'a> {
     pub req: &'a Command<'static>,