diff --git a/euphoxide-bot/examples/examplebot.rs b/euphoxide-bot/examples/examplebot.rs
index 292993e..b4083b7 100644
--- a/euphoxide-bot/examples/examplebot.rs
+++ b/euphoxide-bot/examples/examplebot.rs
@@ -4,7 +4,10 @@ use euphoxide::{
     api::{Data, Message, Nick, Send},
     client::conn::ClientConnHandle,
 };
-use euphoxide_bot::{Bot, BotEvent, ServerConfig};
+use euphoxide_bot::{
+    bot::{Bot, BotEvent},
+    instance::ServerConfig,
+};
 
 async fn set_nick(conn: &ClientConnHandle) -> anyhow::Result<()> {
     conn.send_only(Nick {
diff --git a/euphoxide-bot/examples/examplebot_instance.rs b/euphoxide-bot/examples/examplebot_instance.rs
index 59a52a6..de0c882 100644
--- a/euphoxide-bot/examples/examplebot_instance.rs
+++ b/euphoxide-bot/examples/examplebot_instance.rs
@@ -4,7 +4,7 @@ use euphoxide::{
     api::{Data, Message, Nick, Send},
     client::conn::ClientConnHandle,
 };
-use euphoxide_bot::{Instance, InstanceEvent, ServerConfig};
+use euphoxide_bot::instance::{Instance, InstanceEvent, ServerConfig};
 use tokio::sync::mpsc;
 
 async fn set_nick(conn: &ClientConnHandle) -> anyhow::Result<()> {
diff --git a/euphoxide-bot/src/bot.rs b/euphoxide-bot/src/bot.rs
index 63d1175..2adac80 100644
--- a/euphoxide-bot/src/bot.rs
+++ b/euphoxide-bot/src/bot.rs
@@ -10,7 +10,7 @@ use euphoxide::{
 };
 use tokio::sync::mpsc;
 
-use crate::{Instance, InstanceConfig, InstanceEvent};
+use crate::instance::{Instance, InstanceConfig, InstanceEvent};
 
 #[derive(Debug)]
 pub enum BotEvent {
diff --git a/euphoxide-bot/src/lib.rs b/euphoxide-bot/src/lib.rs
index f07d986..6eeeba5 100644
--- a/euphoxide-bot/src/lib.rs
+++ b/euphoxide-bot/src/lib.rs
@@ -1,4 +1,2 @@
-mod bot;
-mod instance;
-
-pub use crate::{bot::*, instance::*};
+pub mod bot;
+pub mod instance;