diff --git a/README.md b/README.md
index 2075150..412fa74 100644
--- a/README.md
+++ b/README.md
@@ -70,17 +70,16 @@ use env_logger::Target;
 use log::info;
 
 use rs_matter_stack::eth::EthMatterStack;
-use rs_matter_stack::matter::data_model::device_types::DEV_TYPE_ON_OFF_LIGHT;
-use rs_matter_stack::matter::data_model::networks::unix::UnixNetifs;
-use rs_matter_stack::matter::data_model::objects::{Async, Dataver, Endpoint, Node};
-use rs_matter_stack::matter::data_model::objects::{EmptyHandler, EpClMatcher};
-use rs_matter_stack::matter::data_model::on_off;
-use rs_matter_stack::matter::data_model::on_off::ClusterHandler as _;
-use rs_matter_stack::matter::data_model::system_model::desc;
-use rs_matter_stack::matter::data_model::system_model::desc::ClusterHandler as _;
+use rs_matter_stack::matter::dm::clusters::desc;
+use rs_matter_stack::matter::dm::clusters::desc::ClusterHandler as _;
+use rs_matter_stack::matter::dm::clusters::on_off;
+use rs_matter_stack::matter::dm::clusters::on_off::ClusterHandler as _;
+use rs_matter_stack::matter::dm::devices::test::{TEST_DEV_ATT, TEST_DEV_COMM, TEST_DEV_DET};
+use rs_matter_stack::matter::dm::devices::DEV_TYPE_ON_OFF_LIGHT;
+use rs_matter_stack::matter::dm::networks::unix::UnixNetifs;
+use rs_matter_stack::matter::dm::{Async, Dataver, Endpoint, Node};
+use rs_matter_stack::matter::dm::{EmptyHandler, EpClMatcher};
 use rs_matter_stack::matter::error::Error;
-use rs_matter_stack::matter::test_device::TEST_DEV_DET;
-use rs_matter_stack::matter::test_device::{TEST_DEV_ATT, TEST_DEV_COMM};
 use rs_matter_stack::matter::utils::init::InitMaybeUninit;
 use rs_matter_stack::matter::utils::select::Coalesce;
 use rs_matter_stack::matter::{clusters, devices};
@@ -108,7 +107,7 @@ fn main() -> Result<(), Error> {
         ));
 
     // Our "light" on-off cluster.
-    // Can be anything implementing `rs_matter::data_model::AsyncHandler`
+    // Can be anything implementing `rs_matter::dm::AsyncHandler`
     let on_off = on_off::OnOffHandler::new(Dataver::new_rand(stack.matter().rand()));
 
     // Chain our endpoint clusters with the
diff --git a/examples/light.rs b/examples/light.rs
index 6efc3e9..5a25acb 100644
--- a/examples/light.rs
+++ b/examples/light.rs
@@ -14,18 +14,17 @@ use embassy_time::{Duration, Timer};
 
 use log::info;
 
-use rs_matter_stack::matter::data_model::device_types::DEV_TYPE_ON_OFF_LIGHT;
-use rs_matter_stack::matter::data_model::networks::unix::UnixNetifs;
-use rs_matter_stack::matter::data_model::networks::wireless::NoopWirelessNetCtl;
-use rs_matter_stack::matter::data_model::objects::{Async, Dataver, Endpoint, Node};
-use rs_matter_stack::matter::data_model::objects::{EmptyHandler, EpClMatcher};
-use rs_matter_stack::matter::data_model::on_off;
-use rs_matter_stack::matter::data_model::on_off::{ClusterHandler as _, OnOffHandler};
-use rs_matter_stack::matter::data_model::sdm::net_comm::NetworkType;
-use rs_matter_stack::matter::data_model::system_model::desc::{ClusterHandler as _, DescHandler};
+use rs_matter_stack::matter::dm::clusters::desc::{ClusterHandler as _, DescHandler};
+use rs_matter_stack::matter::dm::clusters::net_comm::NetworkType;
+use rs_matter_stack::matter::dm::clusters::on_off;
+use rs_matter_stack::matter::dm::clusters::on_off::{ClusterHandler as _, OnOffHandler};
+use rs_matter_stack::matter::dm::devices::test::{TEST_DEV_ATT, TEST_DEV_COMM, TEST_DEV_DET};
+use rs_matter_stack::matter::dm::devices::DEV_TYPE_ON_OFF_LIGHT;
+use rs_matter_stack::matter::dm::networks::unix::UnixNetifs;
+use rs_matter_stack::matter::dm::networks::wireless::NoopWirelessNetCtl;
+use rs_matter_stack::matter::dm::{Async, Dataver, Endpoint, Node};
+use rs_matter_stack::matter::dm::{EmptyHandler, EpClMatcher};
 use rs_matter_stack::matter::error::Error;
-use rs_matter_stack::matter::test_device::TEST_DEV_DET;
-use rs_matter_stack::matter::test_device::{TEST_DEV_ATT, TEST_DEV_COMM};
 use rs_matter_stack::matter::transport::network::btp::BuiltinGattPeripheral;
 use rs_matter_stack::matter::utils::init::InitMaybeUninit;
 use rs_matter_stack::matter::utils::select::Coalesce;
@@ -55,7 +54,7 @@ fn main() -> Result<(), Error> {
         ));
 
     // Our "light" on-off cluster.
-    // Can be anything implementing `rs_matter::data_model::AsyncHandler`
+    // Can be anything implementing `rs_matter::dm::AsyncHandler`
     let on_off = on_off::OnOffHandler::new(Dataver::new_rand(stack.matter().rand()));
 
     // Chain our endpoint clusters with the
diff --git a/examples/light_eth.rs b/examples/light_eth.rs
index 5411abc..5b0c470 100644
--- a/examples/light_eth.rs
+++ b/examples/light_eth.rs
@@ -18,17 +18,16 @@ use env_logger::Target;
 use log::info;
 
 use rs_matter_stack::eth::EthMatterStack;
-use rs_matter_stack::matter::data_model::device_types::DEV_TYPE_ON_OFF_LIGHT;
-use rs_matter_stack::matter::data_model::networks::unix::UnixNetifs;
-use rs_matter_stack::matter::data_model::objects::{Async, Dataver, Endpoint, Node};
-use rs_matter_stack::matter::data_model::objects::{EmptyHandler, EpClMatcher};
-use rs_matter_stack::matter::data_model::on_off;
-use rs_matter_stack::matter::data_model::on_off::ClusterHandler as _;
-use rs_matter_stack::matter::data_model::system_model::desc;
-use rs_matter_stack::matter::data_model::system_model::desc::ClusterHandler as _;
+use rs_matter_stack::matter::dm::clusters::desc;
+use rs_matter_stack::matter::dm::clusters::desc::ClusterHandler as _;
+use rs_matter_stack::matter::dm::clusters::on_off;
+use rs_matter_stack::matter::dm::clusters::on_off::ClusterHandler as _;
+use rs_matter_stack::matter::dm::devices::test::{TEST_DEV_ATT, TEST_DEV_COMM, TEST_DEV_DET};
+use rs_matter_stack::matter::dm::devices::DEV_TYPE_ON_OFF_LIGHT;
+use rs_matter_stack::matter::dm::networks::unix::UnixNetifs;
+use rs_matter_stack::matter::dm::{Async, Dataver, Endpoint, Node};
+use rs_matter_stack::matter::dm::{EmptyHandler, EpClMatcher};
 use rs_matter_stack::matter::error::Error;
-use rs_matter_stack::matter::test_device::TEST_DEV_DET;
-use rs_matter_stack::matter::test_device::{TEST_DEV_ATT, TEST_DEV_COMM};
 use rs_matter_stack::matter::utils::init::InitMaybeUninit;
 use rs_matter_stack::matter::utils::select::Coalesce;
 use rs_matter_stack::matter::{clusters, devices};
@@ -56,7 +55,7 @@ fn main() -> Result<(), Error> {
         ));
 
     // Our "light" on-off cluster.
-    // Can be anything implementing `rs_matter::data_model::AsyncHandler`
+    // Can be anything implementing `rs_matter::dm::AsyncHandler`
     let on_off = on_off::OnOffHandler::new(Dataver::new_rand(stack.matter().rand()));
 
     // Chain our endpoint clusters with the
diff --git a/src/eth.rs b/src/eth.rs
index 47b7a96..ce68ca5 100644
--- a/src/eth.rs
+++ b/src/eth.rs
@@ -4,12 +4,12 @@ use edge_nal::UdpBind;
 
 use embassy_futures::select::{select, select3};
 
-use rs_matter::data_model::networks::NetChangeNotif;
-use rs_matter::data_model::objects::{AsyncHandler, AsyncMetadata, Endpoint};
-use rs_matter::data_model::root_endpoint::{self, with_eth, with_sys, EthHandler, SysHandler};
-use rs_matter::data_model::sdm::gen_comm::CommPolicy;
-use rs_matter::data_model::sdm::gen_diag::{GenDiag, NetifDiag};
-use rs_matter::data_model::sdm::net_comm::NetworkType;
+use rs_matter::dm::clusters::gen_comm::CommPolicy;
+use rs_matter::dm::clusters::gen_diag::{GenDiag, NetifDiag};
+use rs_matter::dm::clusters::net_comm::NetworkType;
+use rs_matter::dm::endpoints::{self, with_eth, with_sys, EthHandler, SysHandler};
+use rs_matter::dm::networks::NetChangeNotif;
+use rs_matter::dm::{AsyncHandler, AsyncMetadata, Endpoint};
 use rs_matter::error::Error;
 use rs_matter::pairing::DiscoveryCapabilities;
 use rs_matter::transport::network::NoNetwork;
@@ -140,7 +140,7 @@ where
     /// Return a metadata for the root (Endpoint 0) of the Matter Node
     /// configured for Ethernet network.
     pub const fn root_endpoint() -> Endpoint<'static> {
-        root_endpoint::root_endpoint(NetworkType::Ethernet)
+        endpoints::root_endpoint(NetworkType::Ethernet)
     }
 
     /// Return a handler for the root (Endpoint 0) of the Matter Node
diff --git a/src/lib.rs b/src/lib.rs
index d2bde6f..7d7d544 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -19,13 +19,13 @@ use embassy_futures::select::{select4, Either4};
 use embassy_sync::blocking_mutex::raw::NoopRawMutex;
 
 use persist::{KvBlobBuffer, KvBlobStore, MatterPersist, NetworkPersist};
-use rs_matter::data_model::basic_info::BasicInfoConfig;
-use rs_matter::data_model::core::IMBuffer;
-use rs_matter::data_model::networks::NetChangeNotif;
-use rs_matter::data_model::objects::{AsyncHandler, AsyncMetadata};
-use rs_matter::data_model::sdm::dev_att::DevAttDataFetcher;
-use rs_matter::data_model::sdm::gen_diag::NetifDiag;
-use rs_matter::data_model::subscriptions::Subscriptions;
+use rs_matter::dm::clusters::basic_info::BasicInfoConfig;
+use rs_matter::dm::clusters::dev_att::DevAttDataFetcher;
+use rs_matter::dm::clusters::gen_diag::NetifDiag;
+use rs_matter::dm::networks::NetChangeNotif;
+use rs_matter::dm::subscriptions::Subscriptions;
+use rs_matter::dm::IMBuffer;
+use rs_matter::dm::{AsyncHandler, AsyncMetadata};
 use rs_matter::error::{Error, ErrorCode};
 use rs_matter::mdns::{Mdns, MdnsService};
 use rs_matter::respond::DefaultResponder;
diff --git a/src/mdns.rs b/src/mdns.rs
index 0a3cb74..88c5296 100644
--- a/src/mdns.rs
+++ b/src/mdns.rs
@@ -17,7 +17,7 @@
 use embassy_sync::blocking_mutex::raw::RawMutex;
 use embassy_sync::signal::Signal;
 
-use rs_matter::data_model::basic_info::BasicInfoConfig;
+use rs_matter::dm::clusters::basic_info::BasicInfoConfig;
 use rs_matter::error::{Error, ErrorCode};
 use rs_matter::mdns::{Mdns, Service, ServiceMode};
 use rs_matter::utils::cell::RefCell;
diff --git a/src/persist.rs b/src/persist.rs
index 64f1e66..38fe31e 100644
--- a/src/persist.rs
+++ b/src/persist.rs
@@ -3,7 +3,7 @@ use core::fmt::Display;
 use embassy_futures::select::select;
 use embassy_sync::blocking_mutex::raw::{NoopRawMutex, RawMutex};
 
-use rs_matter::data_model::networks::wireless::{WirelessNetwork, WirelessNetworks};
+use rs_matter::dm::networks::wireless::{WirelessNetwork, WirelessNetworks};
 use rs_matter::error::Error;
 use rs_matter::utils::storage::pooled::{BufferAccess, PooledBuffer, PooledBuffers};
 use rs_matter::utils::sync::{IfMutex, IfMutexGuard};
diff --git a/src/wireless.rs b/src/wireless.rs
index a9f39c8..6802b66 100644
--- a/src/wireless.rs
+++ b/src/wireless.rs
@@ -5,13 +5,13 @@ use edge_nal::UdpBind;
 use embassy_futures::select::{select, select3};
 use embassy_sync::blocking_mutex::raw::RawMutex;
 
-use rs_matter::data_model::networks::wireless::{
+use rs_matter::dm::clusters::gen_diag::NetifDiag;
+use rs_matter::dm::clusters::net_comm::NetCtl;
+use rs_matter::dm::clusters::wifi_diag::WirelessDiag;
+use rs_matter::dm::networks::wireless::{
     NetCtlState, WirelessMgr, WirelessNetwork, WirelessNetworks, MAX_CREDS_SIZE,
 };
-use rs_matter::data_model::networks::NetChangeNotif;
-use rs_matter::data_model::sdm::gen_diag::NetifDiag;
-use rs_matter::data_model::sdm::net_comm::NetCtl;
-use rs_matter::data_model::sdm::wifi_diag::WirelessDiag;
+use rs_matter::dm::networks::NetChangeNotif;
 use rs_matter::error::Error;
 use rs_matter::pairing::DiscoveryCapabilities;
 use rs_matter::transport::network::btp::{Btp, BtpContext, GattPeripheral};
diff --git a/src/wireless/thread.rs b/src/wireless/thread.rs
index 5703573..6b42925 100644
--- a/src/wireless/thread.rs
+++ b/src/wireless/thread.rs
@@ -5,19 +5,17 @@ use edge_nal::UdpBind;
 use embassy_futures::select::{select, select3, select4};
 use embassy_sync::blocking_mutex::raw::RawMutex;
 
-use rs_matter::data_model::networks::wireless::{
+use rs_matter::dm::clusters::gen_comm::CommPolicy;
+use rs_matter::dm::clusters::gen_diag::GenDiag;
+use rs_matter::dm::clusters::net_comm::{NetCtl, NetCtlStatus, NetworkType};
+use rs_matter::dm::clusters::thread_diag::ThreadDiag;
+use rs_matter::dm::endpoints::{self, with_sys, with_thread, SysHandler, ThreadHandler};
+use rs_matter::dm::networks::wireless::{
     self, NetCtlWithStatusImpl, NoopWirelessNetCtl, WirelessMgr,
 };
-use rs_matter::data_model::networks::NetChangeNotif;
-use rs_matter::data_model::objects::{AsyncMetadata, Endpoint};
-use rs_matter::data_model::root_endpoint::{
-    self, with_sys, with_thread, SysHandler, ThreadHandler,
-};
-use rs_matter::data_model::sdm::gen_comm::CommPolicy;
-use rs_matter::data_model::sdm::gen_diag::GenDiag;
-use rs_matter::data_model::sdm::net_comm::{NetCtl, NetCtlStatus, NetworkType};
-use rs_matter::data_model::sdm::thread_diag::ThreadDiag;
-use rs_matter::data_model::{objects::AsyncHandler, sdm::gen_diag::NetifDiag};
+use rs_matter::dm::networks::NetChangeNotif;
+use rs_matter::dm::{clusters::gen_diag::NetifDiag, AsyncHandler};
+use rs_matter::dm::{AsyncMetadata, Endpoint};
 use rs_matter::error::Error;
 use rs_matter::pairing::DiscoveryCapabilities;
 use rs_matter::transport::network::btp::GattPeripheral;
@@ -203,7 +201,7 @@ where
     /// Return a metadata for the root (Endpoint 0) of the Matter Node
     /// configured for BLE+Thread network.
     pub const fn root_endpoint() -> Endpoint<'static> {
-        root_endpoint::root_endpoint(NetworkType::Thread)
+        endpoints::root_endpoint(NetworkType::Thread)
     }
 
     /// Return a handler for the root (Endpoint 0) of the Matter Node
diff --git a/src/wireless/wifi.rs b/src/wireless/wifi.rs
index 52099c3..77802df 100644
--- a/src/wireless/wifi.rs
+++ b/src/wireless/wifi.rs
@@ -5,17 +5,17 @@ use edge_nal::UdpBind;
 use embassy_futures::select::{select, select3, select4};
 use embassy_sync::blocking_mutex::raw::RawMutex;
 
-use rs_matter::data_model::networks::wireless::{
+use rs_matter::dm::clusters::gen_comm::CommPolicy;
+use rs_matter::dm::clusters::gen_diag::GenDiag;
+use rs_matter::dm::clusters::net_comm::{NetCtl, NetCtlStatus, NetworkType};
+use rs_matter::dm::clusters::wifi_diag::WifiDiag;
+use rs_matter::dm::endpoints::{self, with_sys, with_wifi, SysHandler, WifiHandler};
+use rs_matter::dm::networks::wireless::{
     self, NetCtlWithStatusImpl, NoopWirelessNetCtl, WirelessMgr,
 };
-use rs_matter::data_model::networks::NetChangeNotif;
-use rs_matter::data_model::objects::{AsyncMetadata, Endpoint};
-use rs_matter::data_model::root_endpoint::{self, with_sys, with_wifi, SysHandler, WifiHandler};
-use rs_matter::data_model::sdm::gen_comm::CommPolicy;
-use rs_matter::data_model::sdm::gen_diag::GenDiag;
-use rs_matter::data_model::sdm::net_comm::{NetCtl, NetCtlStatus, NetworkType};
-use rs_matter::data_model::sdm::wifi_diag::WifiDiag;
-use rs_matter::data_model::{objects::AsyncHandler, sdm::gen_diag::NetifDiag};
+use rs_matter::dm::networks::NetChangeNotif;
+use rs_matter::dm::{clusters::gen_diag::NetifDiag, AsyncHandler};
+use rs_matter::dm::{AsyncMetadata, Endpoint};
 use rs_matter::error::Error;
 use rs_matter::pairing::DiscoveryCapabilities;
 use rs_matter::transport::network::btp::GattPeripheral;
@@ -199,7 +199,7 @@ where
     /// Return a metadata for the root (Endpoint 0) of the Matter Node
     /// configured for BLE+Wifi network.
     pub const fn root_endpoint() -> Endpoint<'static> {
-        root_endpoint::root_endpoint(NetworkType::Wifi)
+        endpoints::root_endpoint(NetworkType::Wifi)
     }
 
     /// Return a handler for the root (Endpoint 0) of the Matter Node