move core::pdu and core::state_res into core::matrix::

Signed-off-by: Jason Volk <jason@zemos.net>

src/service/rooms/state_accessor/room_state.rs

@@ -1,6 +1,9 @@
 use std::borrow::Borrow;
 
-use conduwuit::{PduEvent, Result, StateKey, err, implement};
+use conduwuit::{
+	Result, err, implement,
+	matrix::{PduEvent, StateKey},
+};
 use futures::{Stream, StreamExt, TryFutureExt};
 use ruma::{EventId, RoomId, events::StateEventType};
 use serde::Deserialize;

src/service/rooms/state_accessor/state.rs

@@ -1,13 +1,15 @@
 use std::{borrow::Borrow, ops::Deref, sync::Arc};
 
 use conduwuit::{
-	PduEvent, Result, StateKey, at, err, implement, pair_of,
+	Result, at, err, implement,
+	matrix::{PduEvent, StateKey},
+	pair_of,
 	utils::{
 		result::FlatOk,
 		stream::{BroadbandExt, IterStream, ReadyExt, TryIgnore},
 	},
 };
-use database::Deserialized;
+use conduwuit_database::Deserialized;
 use futures::{FutureExt, Stream, StreamExt, TryFutureExt, future::try_join, pin_mut};
 use ruma::{
 	EventId, OwnedEventId, UserId,