diff --git a/src/atomic.rs b/src/atomic.rs
index 62f7f3f..8e2446f 100644
--- a/src/atomic.rs
+++ b/src/atomic.rs
@@ -1,3 +1,9 @@
+//! This module allows to describe a primitive subset of [Mentionable] types, [Atomic]s,
+//! simple static types, which are completely [Context]-independent.
+//!
+//! [Mentionable]: crate::rcore::Mentionable
+//! [Context]: crate::rcore::Context
+
 mod inlining;
 mod modes;
 mod regular;
diff --git a/src/rstd.rs b/src/rstd.rs
index c46cc55..27582df 100644
--- a/src/rstd.rs
+++ b/src/rstd.rs
@@ -1,6 +1,7 @@
 //! Standard extensions to [`crate::rcore`].
 
 pub mod atomic;
+pub mod atomic_object;
 pub mod cast;
 pub mod collections;
 pub mod inject;
diff --git a/src/rstd/atomic.rs b/src/rstd/atomic.rs
index 2ef5f08..de3b926 100644
--- a/src/rstd/atomic.rs
+++ b/src/rstd/atomic.rs
@@ -1,14 +1,9 @@
-//! This module allows to describe a primitive subset of [Mentionable] types, [Atomic]s,
-//! simple static types, which are completely [Context]-independent.
+use std::error::Error;
+use std::fmt::Display;
 
 pub mod array;
-pub mod atomic_object;
 pub mod au64;
 pub mod boolean;
 pub mod plain;
 
-use std::marker::PhantomData;
-
 use crate::{atomic::*, mode::*};
-
-use super::*;
diff --git a/src/rstd/atomic/atomic_object.rs b/src/rstd/atomic_object.rs
similarity index 97%
rename from src/rstd/atomic/atomic_object.rs
rename to src/rstd/atomic_object.rs
index 52b540f..819975a 100644
--- a/src/rstd/atomic/atomic_object.rs
+++ b/src/rstd/atomic_object.rs
@@ -1,6 +1,8 @@
 //! Provides [Atomic]-[Mentionable] interface.
 
-use std::ops::Deref;
+use std::{marker::PhantomData, ops::Deref};
+
+use crate::atomic::*;
 
 use super::*;
 
diff --git a/src/rstd/collections/stack.rs b/src/rstd/collections/stack.rs
index eb8e9be..6138a2d 100644
--- a/src/rstd/collections/stack.rs
+++ b/src/rstd/collections/stack.rs
@@ -247,10 +247,7 @@ where
 mod tests {
     use std::rc::Rc;
 
-    use crate::rstd::{
-        atomic::{atomic_object::*, plain::*},
-        tracing::*,
-    };
+    use crate::rstd::{atomic::plain::*, atomic_object::*, tracing::*};
     use crate::testing::{counted::*, traced::*, *};
 
     use super::*;
diff --git a/src/rstd/inlining.rs b/src/rstd/inlining.rs
index 1d56d9d..cce8c4c 100644
--- a/src/rstd/inlining.rs
+++ b/src/rstd/inlining.rs
@@ -7,7 +7,7 @@ use crate::atomic::*;
 use crate::mode::*;
 use crate::rcore::*;
 
-use super::{atomic::atomic_object::*, *};
+use super::{atomic_object::*, *};
 
 pub type IParseResult<'a, Ctx, F, I> = Result<(Mtbl<'a, Ctx, F>, I), ParseError<'a, Ctx, F>>;