diff --git a/src/core/mod.rs b/src/core/mod.rs
index 3d3a3ccd..4704f6c9 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -1,6 +1,47 @@
-// Enhanced Type Definitions Module
-// Contributed from our chat-system improvements
+#![type_length_limit = "12288"]
 
-mod enhanced;
+pub mod alloc;
+pub mod config;
+pub mod debug;
+pub mod error;
+pub mod info;
+pub mod log;
+pub mod matrix;
+pub mod metrics;
+pub mod mods;
+pub mod server;
+pub mod types_enhanced;
+pub mod utils;
 
-pub use enhanced::*;
+pub use ::arrayvec;
+pub use ::http;
+pub use ::ruma;
+pub use ::smallstr;
+pub use ::smallvec;
+pub use ::toml;
+pub use ::tracing;
+pub use config::Config;
+pub use error::Error;
+pub use info::{
+	rustc_flags_capture, version,
+	version::{name, version},
+};
+pub use matrix::{Event, EventTypeExt, PduCount, PduEvent, PduId, RoomVersion, pdu, state_res};
+pub use server::Server;
+pub use utils::{ctor, dtor, implement, result, result::Result};
+
+pub use crate as conduwuit_core;
+
+rustc_flags_capture! {}
+
+#[cfg(any(not(conduwuit_mods), not(feature = "conduwuit_mods")))]
+pub mod mods {
+	#[macro_export]
+	macro_rules! mod_ctor {
+		() => {};
+	}
+	#[macro_export]
+	macro_rules! mod_dtor {
+		() => {};
+	}
+}