diff --git a/src/add.rs b/src/add.rs
new file mode 100644
index 00000000..0f86d364
--- /dev/null
+++ b/src/add.rs
@@ -0,0 +1,61 @@
+use core::fmt;
+use crate::UnitError;
+
+/// Error returned by the derived implementations when an arithmetic or logic
+/// operation is invoked on mismatched enum variants.
+#[derive(Clone, Copy, Debug)]
+pub struct WrongVariantError {
+    operation_name: &'static str,
+}
+
+impl WrongVariantError {
+    #[doc(hidden)]
+    #[must_use]
+    #[inline]
+    pub const fn new(operation_name: &'static str) -> Self {
+        Self { operation_name }
+    }
+}
+
+impl fmt::Display for WrongVariantError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "Trying to {}() mismatched enum variants",
+            self.operation_name
+        )
+    }
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for WrongVariantError {}
+
+/// Possible errors returned by the derived implementations of binary
+/// arithmetic or logic operations.
+#[derive(Clone, Copy, Debug)]
+pub enum BinaryError {
+    /// Operation is attempted between mismatched enum variants.
+    Mismatch(WrongVariantError),
+
+    /// Operation is attempted on unit-like enum variants.
+    Unit(UnitError),
+}
+
+impl fmt::Display for BinaryError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Mismatch(e) => write!(f, "{e}"),
+            Self::Unit(e) => write!(f, "{e}"),
+        }
+    }
+}
+
+#[cfg(feature = "std")]
+impl std::error::Error for BinaryError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        match self {
+            Self::Mismatch(e) => e.source(),
+            Self::Unit(e) => e.source(),
+        }
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index 91201a19..9178cc4b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -59,7 +59,15 @@ pub mod __private {
 
 // The modules containing error types and other helpers
 #[cfg(any(feature = "add", feature = "not"))]
-pub mod ops;
+mod ops;
+
+#[cfg(any(feature = "add", feature = "not"))]
+pub use crate::ops::UnitError;
+
+#[cfg(feature = "add")]
+mod add;
+#[cfg(feature = "add")]
+pub use crate::add::{BinaryError, WrongVariantError};
 
 #[cfg(feature = "debug")]
 mod fmt;
diff --git a/src/ops.rs b/src/ops.rs
index fbac0e61..8b7b1477 100644
--- a/src/ops.rs
+++ b/src/ops.rs
@@ -26,67 +26,3 @@ impl fmt::Display for UnitError {
 
 #[cfg(feature = "std")]
 impl std::error::Error for UnitError {}
-
-#[cfg(feature = "add")]
-/// Error returned by the derived implementations when an arithmetic or logic
-/// operation is invoked on mismatched enum variants.
-#[derive(Clone, Copy, Debug)]
-pub struct WrongVariantError {
-    operation_name: &'static str,
-}
-
-#[cfg(feature = "add")]
-impl WrongVariantError {
-    #[doc(hidden)]
-    #[must_use]
-    #[inline]
-    pub const fn new(operation_name: &'static str) -> Self {
-        Self { operation_name }
-    }
-}
-
-#[cfg(feature = "add")]
-impl fmt::Display for WrongVariantError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "Trying to {}() mismatched enum variants",
-            self.operation_name
-        )
-    }
-}
-
-#[cfg(all(feature = "add", feature = "std"))]
-impl std::error::Error for WrongVariantError {}
-
-#[cfg(feature = "add")]
-/// Possible errors returned by the derived implementations of binary
-/// arithmetic or logic operations.
-#[derive(Clone, Copy, Debug)]
-pub enum BinaryError {
-    /// Operation is attempted between mismatched enum variants.
-    Mismatch(WrongVariantError),
-
-    /// Operation is attempted on unit-like enum variants.
-    Unit(UnitError),
-}
-
-#[cfg(feature = "add")]
-impl fmt::Display for BinaryError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Mismatch(e) => write!(f, "{e}"),
-            Self::Unit(e) => write!(f, "{e}"),
-        }
-    }
-}
-
-#[cfg(all(feature = "add", feature = "std"))]
-impl std::error::Error for BinaryError {
-    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-        match self {
-            Self::Mismatch(e) => e.source(),
-            Self::Unit(e) => e.source(),
-        }
-    }
-}