diff --git a/gstreamer/src/bufferlist.rs b/gstreamer/src/bufferlist.rs
index c7133f574..a17a0e2ea 100644
--- a/gstreamer/src/bufferlist.rs
+++ b/gstreamer/src/bufferlist.rs
@@ -191,8 +191,8 @@ impl fmt::Debug for BufferList {
 
 impl fmt::Debug for BufferListRef {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        use crate::clock_time::ClockTime;
         use crate::utils::Displayable;
+        use crate::ClockTime;
 
         let size = self.iter().map(|b| b.size()).sum::<usize>();
         let (pts, dts) = self
diff --git a/gstreamer/src/clock_time.rs b/gstreamer/src/format/clock_time.rs
similarity index 100%
rename from gstreamer/src/clock_time.rs
rename to gstreamer/src/format/clock_time.rs
diff --git a/gstreamer/src/clock_time_serde.rs b/gstreamer/src/format/clock_time_serde.rs
similarity index 100%
rename from gstreamer/src/clock_time_serde.rs
rename to gstreamer/src/format/clock_time_serde.rs
diff --git a/gstreamer/src/macros.rs b/gstreamer/src/format/macros.rs
similarity index 100%
rename from gstreamer/src/macros.rs
rename to gstreamer/src/format/macros.rs
diff --git a/gstreamer/src/format.rs b/gstreamer/src/format/mod.rs
similarity index 99%
rename from gstreamer/src/format.rs
rename to gstreamer/src/format/mod.rs
index 52a71789f..e64279dcd 100644
--- a/gstreamer/src/format.rs
+++ b/gstreamer/src/format/mod.rs
@@ -1,7 +1,16 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
+#[macro_use]
+mod macros;
+
 use crate::utils::Displayable;
-use crate::ClockTime;
+
+mod clock_time;
+pub use clock_time::ClockTime;
+
+#[cfg(feature = "serde")]
+mod clock_time_serde;
+
 use crate::Format;
 use glib::translate::{FromGlib, GlibNoneError, IntoGlib, OptionIntoGlib, TryFromGlib};
 use muldiv::MulDiv;
diff --git a/gstreamer/src/lib.rs b/gstreamer/src/lib.rs
index b6e80ea0b..2a03b3e13 100644
--- a/gstreamer/src/lib.rs
+++ b/gstreamer/src/lib.rs
@@ -46,9 +46,6 @@ mod auto;
 pub use crate::auto::functions::*;
 pub use crate::auto::*;
 
-#[macro_use]
-mod macros;
-
 #[macro_use]
 #[cfg(feature = "serde")]
 mod serde_macros;
@@ -170,9 +167,6 @@ mod bus_unix;
 mod bus_windows;
 
 mod child_proxy;
-mod clock_time;
-#[cfg(feature = "serde")]
-mod clock_time_serde;
 mod date_time;
 #[cfg(feature = "serde")]
 mod date_time_serde;
@@ -207,7 +201,6 @@ pub use crate::element::{
 pub use crate::task_pool::{TaskHandle, TaskPoolTaskHandle};
 
 pub use self::iterator::{Iterator, IteratorError, IteratorImpl, StdIterator};
-pub use crate::clock_time::ClockTime;
 pub use crate::device_monitor::DeviceMonitorFilterId;
 pub use crate::enums::{
     ClockError, ClockSuccess, FlowError, FlowSuccess, PadLinkError, PadLinkSuccess,
@@ -226,10 +219,10 @@ mod typefind_factory;
 
 pub mod format;
 pub use crate::format::{
-    CompatibleFormattedValue, FormattedValue, FormattedValueFullRange, FormattedValueIntrinsic,
-    FormattedValueNoneBuilder, GenericFormattedValue, NoneSignedBuilder, Signed,
-    SpecificFormattedValue, SpecificFormattedValueFullRange, SpecificFormattedValueIntrinsic,
-    UnsignedIntoSigned,
+    ClockTime, CompatibleFormattedValue, FormattedValue, FormattedValueFullRange,
+    FormattedValueIntrinsic, FormattedValueNoneBuilder, GenericFormattedValue, NoneSignedBuilder,
+    Signed, SpecificFormattedValue, SpecificFormattedValueFullRange,
+    SpecificFormattedValueIntrinsic, UnsignedIntoSigned,
 };
 #[cfg(feature = "serde")]
 mod format_serde;