diff --git a/src/main.rs b/src/main.rs
index 19af21c..fd9cdf2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -19,26 +19,23 @@ use wayland_protocols::wlr::unstable::layer_shell::v1::client::{
     zwlr_layer_shell_v1, zwlr_layer_surface_v1,
 };
 
-mod backlight;
-mod battery;
+
+
 mod buffer;
-mod calendar;
-mod clock;
 mod color;
 mod draw;
-mod launcher;
-mod module;
-mod sound;
+mod modules;
 
-use crate::backlight::Backlight;
-use crate::battery::UpowerBattery;
-use crate::buffer::Buffer;
-use crate::calendar::Calendar;
-use crate::clock::Clock;
 use crate::color::Color;
-use crate::launcher::Launcher;
-use crate::module::{Input, Module};
-use crate::sound::PulseAudio;
+use crate::buffer::Buffer;
+
+use crate::modules::backlight::Backlight;
+use crate::modules::battery::UpowerBattery;
+use crate::modules::calendar::Calendar;
+use crate::modules::clock::Clock;
+use crate::modules::launcher::Launcher;
+use crate::modules::module::{Input, Module};
+use crate::modules::sound::PulseAudio;
 
 enum Cmd {
     Exit,
diff --git a/src/backlight.rs b/src/modules/backlight.rs
similarity index 99%
rename from src/backlight.rs
rename to src/modules/backlight.rs
index e6e33e1..4f2e2f8 100644
--- a/src/backlight.rs
+++ b/src/modules/backlight.rs
@@ -1,7 +1,7 @@
 use crate::buffer::Buffer;
 use crate::color::Color;
 use crate::draw::{draw_bar, draw_box, Font, ROBOTO_REGULAR};
-use crate::module::{Input, ModuleImpl};
+use crate::modules::module::{Input, ModuleImpl};
 
 use std::fs::OpenOptions;
 use std::io::{Error, ErrorKind};
diff --git a/src/battery.rs b/src/modules/battery.rs
similarity index 99%
rename from src/battery.rs
rename to src/modules/battery.rs
index 981f89b..f3b02b0 100644
--- a/src/battery.rs
+++ b/src/modules/battery.rs
@@ -1,7 +1,7 @@
 use crate::buffer::Buffer;
 use crate::color::Color;
 use crate::draw::{draw_bar, draw_box, Font, ROBOTO_REGULAR};
-use crate::module::{Input, ModuleImpl};
+use crate::modules::module::{Input, ModuleImpl};
 
 use std::sync::mpsc::Sender;
 use std::sync::{Arc, Mutex};
diff --git a/src/calendar.rs b/src/modules/calendar.rs
similarity index 99%
rename from src/calendar.rs
rename to src/modules/calendar.rs
index 51cca4d..81f08e6 100644
--- a/src/calendar.rs
+++ b/src/modules/calendar.rs
@@ -1,7 +1,7 @@
 use crate::buffer::Buffer;
 use crate::color::Color;
 use crate::draw::{Font, DEJAVUSANS_MONO, ROBOTO_REGULAR};
-use crate::module::{Input, ModuleImpl};
+use crate::modules::module::{Input, ModuleImpl};
 
 use chrono::{Date, DateTime, Datelike, Local};
 
diff --git a/src/clock.rs b/src/modules/clock.rs
similarity index 98%
rename from src/clock.rs
rename to src/modules/clock.rs
index 1151cbf..224e33d 100644
--- a/src/clock.rs
+++ b/src/modules/clock.rs
@@ -1,7 +1,7 @@
 use crate::buffer::Buffer;
 use crate::color::Color;
 use crate::draw::{Font, ROBOTO_REGULAR};
-use crate::module::{Input, ModuleImpl};
+use crate::modules::module::{Input, ModuleImpl};
 
 use std::sync::mpsc::Sender;
 
diff --git a/src/launcher.rs b/src/modules/launcher.rs
similarity index 99%
rename from src/launcher.rs
rename to src/modules/launcher.rs
index 824719f..d7bde7f 100644
--- a/src/launcher.rs
+++ b/src/modules/launcher.rs
@@ -1,7 +1,7 @@
 use crate::buffer::Buffer;
 use crate::color::Color;
 use crate::draw::{Font, ROBOTO_REGULAR};
-use crate::module::{Input, ModuleImpl};
+use crate::modules::module::{Input, ModuleImpl};
 
 use std::cell::RefCell;
 use std::cmp::Ordering;
diff --git a/src/modules/mod.rs b/src/modules/mod.rs
new file mode 100644
index 0000000..520b566
--- /dev/null
+++ b/src/modules/mod.rs
@@ -0,0 +1,7 @@
+pub mod module;
+pub mod backlight;
+pub mod battery;
+pub mod calendar;
+pub mod clock;
+pub mod launcher;
+pub mod sound;
\ No newline at end of file
diff --git a/src/module.rs b/src/modules/module.rs
similarity index 100%
rename from src/module.rs
rename to src/modules/module.rs
diff --git a/src/sound.rs b/src/modules/sound.rs
similarity index 99%
rename from src/sound.rs
rename to src/modules/sound.rs
index da437b2..c45e9f3 100644
--- a/src/sound.rs
+++ b/src/modules/sound.rs
@@ -1,7 +1,7 @@
 use crate::buffer::Buffer;
 use crate::color::Color;
 use crate::draw::{draw_bar, draw_box, Font, ROBOTO_REGULAR};
-use crate::module::{Input, ModuleImpl};
+use crate::modules::module::{Input, ModuleImpl};
 
 use std::cell::RefCell;
 use std::cmp::{max, min};