diff --git a/src/bin/broadcaster.rs b/src/bin/broadcaster.rs
index c640fab..8c78f50 100644
--- a/src/bin/broadcaster.rs
+++ b/src/bin/broadcaster.rs
@@ -4,7 +4,7 @@ async fn main() -> anyhow::Result<()> {
     let token = std::env::var("TOKEN")?;
     let device_name = "my_bot";
 
-    let broadcaster = j7s_matrix_sdk::MatrixBroadcaster::new(&url, &token, &device_name).await?;
+    let broadcaster = j7s_matrix_sdk::MatrixListener::new(&url, &token, &device_name).await?;
 
     let message = matrix_sdk::ruma::events::room::message::MessageType::text_plain("Hi!");
     loop {
diff --git a/src/bin/ex.rs b/src/bin/ex.rs
deleted file mode 100644
index f434a93..0000000
--- a/src/bin/ex.rs
+++ /dev/null
@@ -1,87 +0,0 @@
-use matrix_sdk::{
-    config::SyncSettings,
-    ruma::events::room::{
-        member::StrippedRoomMemberEvent,
-        message::{MessageType, OriginalSyncRoomMessageEvent, RoomMessageEventContent},
-    },
-    Client, Room, RoomState,
-};
-use tokio::time::{sleep, Duration};
-
-#[tokio::main]
-async fn main() -> anyhow::Result<()> {
-    let client = Client::builder()
-        .homeserver_url("http://matrix.internal.jpace121.net:8008")
-        .build()
-        .await?;
-
-    let token = std::env::var("TOKEN")?;
-
-    // First we need to log in.
-    let mut login_data = serde_json::Map::new();
-    login_data.insert("token".to_string(), token.into());
-    client
-        .matrix_auth()
-        .login_custom("org.matrix.login.jwt", login_data)?
-        .initial_device_display_name("bot")
-        .send()
-        .await?;
-
-    client.add_event_handler(on_stripped_state_member);
-    let sync_token = client
-        .sync_once(SyncSettings::default())
-        .await
-        .unwrap()
-        .next_batch;
-
-    client.add_event_handler(on_room_message);
-
-    let settings = SyncSettings::default().token(sync_token);
-    client.sync(settings).await?;
-
-    Ok(())
-}
-
-// This is going to respond to invites.
-async fn on_stripped_state_member(
-    room_member: StrippedRoomMemberEvent,
-    client: Client,
-    room: Room,
-) {
-    if room_member.state_key != client.user_id().unwrap() {
-        return;
-    }
-
-    tokio::spawn(async move {
-        println!("Autojoining room {}", room.room_id());
-        let mut delay = 2;
-
-        while let Err(err) = room.join().await {
-            sleep(Duration::from_secs(delay)).await;
-            delay *= 2;
-
-            if delay > 3600 {
-                eprintln!("Can't join room {} ({err:?})", room.room_id());
-                break;
-            }
-        }
-        println!("Successfully joined room {}", room.room_id());
-    });
-}
-
-async fn on_room_message(event: OriginalSyncRoomMessageEvent, room: Room, client: Client) {
-    if room.state() != RoomState::Joined {
-        return;
-    }
-    if event.sender == client.user_id().unwrap() {
-        return;
-    }
-    let MessageType::Text(text_content) = event.content.msgtype else {
-        return;
-    };
-
-    println!("{:?}", text_content.body);
-
-    let content = RoomMessageEventContent::text_plain("i am groot");
-    room.send(content).await.unwrap();
-}
diff --git a/src/broadcaster.rs b/src/broadcaster.rs
deleted file mode 100644
index e8abdf9..0000000
--- a/src/broadcaster.rs
+++ /dev/null
@@ -1,117 +0,0 @@
-use anyhow::Context;
-use std::sync::Arc;
-use tokio::sync::RwLock;
-
-#[derive(Clone)]
-pub struct MatrixBroadcaster {
-    client: Arc<matrix_sdk::Client>,
-    rooms: Arc<RwLock<Vec<matrix_sdk::Room>>>,
-}
-
-impl MatrixBroadcaster {
-    pub async fn new(url: &str, token: &str, device_name: &str) -> anyhow::Result<Self> {
-        let mut login_data = serde_json::Map::new();
-        login_data.insert("token".to_string(), token.into());
-
-        // Make a client.
-        let client = matrix_sdk::Client::builder()
-            .homeserver_url(url)
-            .build()
-            .await
-            .context("Could not build client.")?;
-
-        // Now log the client in.
-        client
-            .matrix_auth()
-            .login_custom("org.matrix.login.jwt", login_data)
-            .context("Failed to set custom login up.")?
-            .initial_device_display_name(device_name)
-            .send()
-            .await
-            .context("Failed to login.")?;
-
-        // Build our object with the client.
-        let object = Self {
-            client: Arc::new(client),
-            rooms: Arc::new(RwLock::new(Vec::new())),
-        };
-        object.spin().await?;
-        return Ok(object);
-    }
-
-    pub async fn broadcast(
-        self: &Self,
-        msg: &matrix_sdk::ruma::events::room::message::MessageType,
-    ) -> anyhow::Result<()> {
-        let rooms_clone = self.rooms.clone();
-        let rooms = rooms_clone.read().await.clone();
-
-        for room in rooms {
-            room.send(
-                matrix_sdk::ruma::events::room::message::RoomMessageEventContent::new(msg.clone()),
-            )
-            .await
-            .context("Failed to send message to room.")?;
-        }
-
-        Ok(())
-    }
-
-    async fn spin(self: &Self) -> anyhow::Result<()> {
-        // The callback function.
-        let clone_of_me = self.clone();
-        let on_stripped_state_member =
-            |room_member: matrix_sdk::ruma::events::room::member::StrippedRoomMemberEvent,
-             client: matrix_sdk::Client,
-             room: matrix_sdk::Room| async move {
-                clone_of_me.join_callback(room_member, client, room).await;
-            };
-        self.client.add_event_handler(on_stripped_state_member);
-        // Spawn a task to sync.
-        let spawn_client = self.client.clone();
-        tokio::spawn(async move {
-            let sync_err = spawn_client
-                .sync(matrix_sdk::config::SyncSettings::default())
-                .await;
-            if sync_err.is_err() {
-                log::error!("Sync error: {:?}", sync_err);
-            }
-        });
-
-        Ok(())
-    }
-
-    async fn join_callback(
-        self: &Self,
-        room_member: matrix_sdk::ruma::events::room::member::StrippedRoomMemberEvent,
-        client: matrix_sdk::Client,
-        room: matrix_sdk::Room,
-    ) {
-        // This event wasn't for me...
-        if room_member.state_key != client.user_id().unwrap() {
-            return;
-        }
-
-        // Spawn a task to try to join the room.
-        let self_copy = self.clone();
-        tokio::spawn(async move {
-            log::debug!("Autojoining room {}", room.room_id());
-            let mut delay = 2;
-
-            while let Err(err) = room.join().await {
-                tokio::time::sleep(tokio::time::Duration::from_secs(delay)).await;
-                delay *= 2;
-
-                if delay > 3600 {
-                    log::debug!("Can't join room {} ({err:?})", room.room_id());
-                    break;
-                }
-            }
-            log::debug!("Successfully joined room {}", room.room_id());
-            let rooms_clone = self_copy.rooms.clone();
-            let mut rooms = rooms_clone.write().await;
-            rooms.push(room);
-            log::debug!("Tracking {} rooms.", rooms.len());
-        });
-    }
-}
diff --git a/src/lib.rs b/src/lib.rs
index 237e80b..e126e2b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,5 +1,2 @@
-mod broadcaster;
 mod listener;
-
-pub use broadcaster::*;
 pub use listener::*;