diff --git a/pgrx/src/datum/mod.rs b/pgrx/src/datum/mod.rs
index 7dd3f38fa5..e9439a0217 100644
--- a/pgrx/src/datum/mod.rs
+++ b/pgrx/src/datum/mod.rs
@@ -20,33 +20,29 @@ mod borrow;
 mod bytea_type;
 mod from;
 pub mod geo;
-mod inet;
 mod internal;
 mod into;
-mod json;
-pub mod numeric;
-pub mod numeric_support;
 #[deny(unsafe_op_in_unsafe_fn)]
 mod range;
 mod tuples;
 mod unbox;
-mod uuid;
 mod varlena;
 
-pub use self::uuid::*;
 pub use crate::datetime::support as datetime_support;
 pub use crate::datetime::*;
+pub use crate::json::*;
+pub use crate::net::*;
+pub use crate::num::support as numeric_support;
+pub use crate::num::{AnyNumeric, Numeric, numeric};
+pub use crate::uuid::*;
 pub use anyarray::*;
 pub use anyelement::*;
 pub use array::*;
 pub use borrow::*;
 pub use bytea_type::*;
 pub use from::*;
-pub use inet::*;
 pub use internal::*;
 pub use into::*;
-pub use json::*;
-pub use numeric::{AnyNumeric, Numeric};
 pub use range::*;
 pub use unbox::*;
 pub use varlena::*;
diff --git a/pgrx/src/datum/unbox.rs b/pgrx/src/datum/unbox.rs
index ae965010dc..7f08deacdc 100644
--- a/pgrx/src/datum/unbox.rs
+++ b/pgrx/src/datum/unbox.rs
@@ -1,6 +1,6 @@
 use super::Datum;
-use super::uuid::Uuid;
 use crate::prelude::*;
+use crate::uuid::Uuid;
 use crate::varlena::{text_to_rust_str_unchecked, varlena_to_byte_slice};
 use crate::{Json, JsonB};
 use alloc::ffi::CString;
diff --git a/pgrx/src/datum/json.rs b/pgrx/src/json.rs
similarity index 100%
rename from pgrx/src/datum/json.rs
rename to pgrx/src/json.rs
diff --git a/pgrx/src/lib.rs b/pgrx/src/lib.rs
index 46df33fc54..2e58a753e0 100644
--- a/pgrx/src/lib.rs
+++ b/pgrx/src/lib.rs
@@ -56,6 +56,7 @@ pub mod htup;
 pub mod inoutfuncs;
 pub mod itemptr;
 pub mod iter;
+pub mod json;
 pub mod layout;
 pub mod list;
 pub mod lwlock;
@@ -64,8 +65,10 @@ pub mod memcxt;
 pub mod misc;
 #[cfg(feature = "cshim")]
 pub mod namespace;
+pub mod net;
 pub mod nodes;
 pub mod nullable;
+pub mod num;
 pub mod palloc;
 pub mod pg_catalog;
 pub mod pgbox;
@@ -77,6 +80,7 @@ pub mod spinlock;
 pub mod stringinfo;
 pub mod trigger_support;
 pub mod tupdesc;
+pub mod uuid;
 pub mod varlena;
 pub mod wrappers;
 pub mod xid;
diff --git a/pgrx/src/datum/inet.rs b/pgrx/src/net.rs
similarity index 100%
rename from pgrx/src/datum/inet.rs
rename to pgrx/src/net.rs
diff --git a/pgrx/src/num.rs b/pgrx/src/num.rs
new file mode 100644
index 0000000000..3638bbc7b9
--- /dev/null
+++ b/pgrx/src/num.rs
@@ -0,0 +1,13 @@
+//LICENSE Portions Copyright 2019-2021 ZomboDB, LLC.
+//LICENSE
+//LICENSE Portions Copyright 2021-2023 Technology Concepts & Design, Inc.
+//LICENSE
+//LICENSE Portions Copyright 2023-2023 PgCentral Foundation, Inc. <contact@pgcentral.org>
+//LICENSE
+//LICENSE All rights reserved.
+//LICENSE
+//LICENSE Use of this source code is governed by the MIT license that can be found in the LICENSE file.
+pub mod numeric;
+pub mod support;
+
+pub use numeric::{AnyNumeric, Numeric};
diff --git a/pgrx/src/datum/numeric.rs b/pgrx/src/num/numeric.rs
similarity index 98%
rename from pgrx/src/datum/numeric.rs
rename to pgrx/src/num/numeric.rs
index 2385b52258..f35beaaa73 100644
--- a/pgrx/src/datum/numeric.rs
+++ b/pgrx/src/num/numeric.rs
@@ -13,8 +13,8 @@ use std::cmp::Ordering;
 use std::fmt;
 use std::iter::Sum;
 
-use crate::datum::numeric_support::convert::{FromPrimitiveFunc, from_primitive_helper};
-pub use crate::datum::numeric_support::error::Error;
+use crate::num::support::convert::{FromPrimitiveFunc, from_primitive_helper};
+pub use crate::num::support::error::Error;
 use crate::{direct_function_call, pg_sys};
 
 /// A wrapper around the Postgres SQL `NUMERIC(P, S)` type.  Its `Precision` and `Scale` values
diff --git a/pgrx/src/datum/numeric_support/cmp.rs b/pgrx/src/num/support/cmp.rs
similarity index 100%
rename from pgrx/src/datum/numeric_support/cmp.rs
rename to pgrx/src/num/support/cmp.rs
diff --git a/pgrx/src/datum/numeric_support/convert.rs b/pgrx/src/num/support/convert.rs
similarity index 99%
rename from pgrx/src/datum/numeric_support/convert.rs
rename to pgrx/src/num/support/convert.rs
index 10a986d520..248bf46e6e 100644
--- a/pgrx/src/datum/numeric_support/convert.rs
+++ b/pgrx/src/num/support/convert.rs
@@ -12,8 +12,8 @@ use pgrx_pg_sys::errcodes::PgSqlErrorCode;
 use pgrx_pg_sys::panic::CaughtError;
 
 use super::error::Error;
-use crate::datum::numeric::make_typmod;
 use crate::datum::{AnyNumeric, FromDatum, IntoDatum, Numeric};
+use crate::num::numeric::make_typmod;
 use crate::{direct_function_call, direct_function_call_as_datum, pg_sys};
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
diff --git a/pgrx/src/datum/numeric_support/convert_anynumeric.rs b/pgrx/src/num/support/convert_anynumeric.rs
similarity index 100%
rename from pgrx/src/datum/numeric_support/convert_anynumeric.rs
rename to pgrx/src/num/support/convert_anynumeric.rs
diff --git a/pgrx/src/datum/numeric_support/convert_numeric.rs b/pgrx/src/num/support/convert_numeric.rs
similarity index 100%
rename from pgrx/src/datum/numeric_support/convert_numeric.rs
rename to pgrx/src/num/support/convert_numeric.rs
diff --git a/pgrx/src/datum/numeric_support/convert_primitive.rs b/pgrx/src/num/support/convert_primitive.rs
similarity index 100%
rename from pgrx/src/datum/numeric_support/convert_primitive.rs
rename to pgrx/src/num/support/convert_primitive.rs
diff --git a/pgrx/src/datum/numeric_support/datum.rs b/pgrx/src/num/support/datum.rs
similarity index 100%
rename from pgrx/src/datum/numeric_support/datum.rs
rename to pgrx/src/num/support/datum.rs
diff --git a/pgrx/src/datum/numeric_support/error.rs b/pgrx/src/num/support/error.rs
similarity index 100%
rename from pgrx/src/datum/numeric_support/error.rs
rename to pgrx/src/num/support/error.rs
diff --git a/pgrx/src/datum/numeric_support/hash.rs b/pgrx/src/num/support/hash.rs
similarity index 100%
rename from pgrx/src/datum/numeric_support/hash.rs
rename to pgrx/src/num/support/hash.rs
diff --git a/pgrx/src/datum/numeric_support/mod.rs b/pgrx/src/num/support/mod.rs
similarity index 100%
rename from pgrx/src/datum/numeric_support/mod.rs
rename to pgrx/src/num/support/mod.rs
diff --git a/pgrx/src/datum/numeric_support/ops.rs b/pgrx/src/num/support/ops.rs
similarity index 100%
rename from pgrx/src/datum/numeric_support/ops.rs
rename to pgrx/src/num/support/ops.rs
diff --git a/pgrx/src/datum/numeric_support/serde.rs b/pgrx/src/num/support/serde.rs
similarity index 100%
rename from pgrx/src/datum/numeric_support/serde.rs
rename to pgrx/src/num/support/serde.rs
diff --git a/pgrx/src/datum/numeric_support/sql.rs b/pgrx/src/num/support/sql.rs
similarity index 100%
rename from pgrx/src/datum/numeric_support/sql.rs
rename to pgrx/src/num/support/sql.rs
diff --git a/pgrx/src/datum/uuid.rs b/pgrx/src/uuid.rs
similarity index 100%
rename from pgrx/src/datum/uuid.rs
rename to pgrx/src/uuid.rs