diff --git a/komorebi-bar/src/bar.rs b/komorebi-bar/src/bar.rs
index 1ddc636d..78455ad3 100644
--- a/komorebi-bar/src/bar.rs
+++ b/komorebi-bar/src/bar.rs
@@ -4,15 +4,15 @@ use crate::config::KomobarTheme;
 use crate::config::MonitorConfigOrIndex;
 use crate::config::Position;
 use crate::config::PositionConfig;
-use crate::komorebi::Komorebi;
-use crate::komorebi::KomorebiNotificationState;
 use crate::process_hwnd;
 use crate::render::Color32Ext;
 use crate::render::Grouping;
 use crate::render::RenderConfig;
 use crate::render::RenderExt;
-use crate::widget::BarWidget;
-use crate::widget::WidgetConfig;
+use crate::widgets::komorebi::Komorebi;
+use crate::widgets::komorebi::KomorebiNotificationState;
+use crate::widgets::widget::BarWidget;
+use crate::widgets::widget::WidgetConfig;
 use crate::KomorebiEvent;
 use crate::BAR_HEIGHT;
 use crate::DEFAULT_PADDING;
diff --git a/komorebi-bar/src/config.rs b/komorebi-bar/src/config.rs
index 3511c645..1f295604 100644
--- a/komorebi-bar/src/config.rs
+++ b/komorebi-bar/src/config.rs
@@ -1,5 +1,5 @@
 use crate::render::Grouping;
-use crate::widget::WidgetConfig;
+use crate::widgets::widget::WidgetConfig;
 use crate::DEFAULT_PADDING;
 use eframe::egui::Pos2;
 use eframe::egui::TextBuffer;
diff --git a/komorebi-bar/src/main.rs b/komorebi-bar/src/main.rs
index 78de52f2..bb92b7de 100644
--- a/komorebi-bar/src/main.rs
+++ b/komorebi-bar/src/main.rs
@@ -1,21 +1,9 @@
 mod bar;
-mod battery;
 mod config;
-mod cpu;
-mod date;
-mod keyboard;
-mod komorebi;
-mod komorebi_layout;
-mod media;
-mod memory;
-mod network;
 mod render;
 mod selected_frame;
-mod storage;
-mod time;
 mod ui;
-mod update;
-mod widget;
+mod widgets;
 
 use crate::bar::Komobar;
 use crate::config::KomobarConfig;
diff --git a/komorebi-bar/src/battery.rs b/komorebi-bar/src/widgets/battery.rs
similarity index 99%
rename from komorebi-bar/src/battery.rs
rename to komorebi-bar/src/widgets/battery.rs
index 350c8ea8..84a74751 100644
--- a/komorebi-bar/src/battery.rs
+++ b/komorebi-bar/src/widgets/battery.rs
@@ -1,7 +1,7 @@
 use crate::config::LabelPrefix;
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
-use crate::widget::BarWidget;
+use crate::widgets::widget::BarWidget;
 use eframe::egui::text::LayoutJob;
 use eframe::egui::Align;
 use eframe::egui::Context;
diff --git a/komorebi-bar/src/cpu.rs b/komorebi-bar/src/widgets/cpu.rs
similarity index 98%
rename from komorebi-bar/src/cpu.rs
rename to komorebi-bar/src/widgets/cpu.rs
index 92713d3b..b3160819 100644
--- a/komorebi-bar/src/cpu.rs
+++ b/komorebi-bar/src/widgets/cpu.rs
@@ -1,7 +1,7 @@
 use crate::config::LabelPrefix;
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
-use crate::widget::BarWidget;
+use crate::widgets::widget::BarWidget;
 use eframe::egui::text::LayoutJob;
 use eframe::egui::Align;
 use eframe::egui::Context;
diff --git a/komorebi-bar/src/date.rs b/komorebi-bar/src/widgets/date.rs
similarity index 99%
rename from komorebi-bar/src/date.rs
rename to komorebi-bar/src/widgets/date.rs
index 87e409a7..aaf4435e 100644
--- a/komorebi-bar/src/date.rs
+++ b/komorebi-bar/src/widgets/date.rs
@@ -1,7 +1,7 @@
 use crate::config::LabelPrefix;
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
-use crate::widget::BarWidget;
+use crate::widgets::widget::BarWidget;
 use chrono::Local;
 use chrono_tz::Tz;
 use eframe::egui::text::LayoutJob;
diff --git a/komorebi-bar/src/keyboard.rs b/komorebi-bar/src/widgets/keyboard.rs
old mode 100755
new mode 100644
similarity index 99%
rename from komorebi-bar/src/keyboard.rs
rename to komorebi-bar/src/widgets/keyboard.rs
index 7ba57846..7018cfa3
--- a/komorebi-bar/src/keyboard.rs
+++ b/komorebi-bar/src/widgets/keyboard.rs
@@ -1,6 +1,6 @@
 use crate::config::LabelPrefix;
 use crate::render::RenderConfig;
-use crate::widget::BarWidget;
+use crate::widgets::widget::BarWidget;
 use eframe::egui::text::LayoutJob;
 use eframe::egui::Align;
 use eframe::egui::Context;
diff --git a/komorebi-bar/src/komorebi.rs b/komorebi-bar/src/widgets/komorebi.rs
similarity index 99%
rename from komorebi-bar/src/komorebi.rs
rename to komorebi-bar/src/widgets/komorebi.rs
index 58cadbaa..c4d51057 100644
--- a/komorebi-bar/src/komorebi.rs
+++ b/komorebi-bar/src/widgets/komorebi.rs
@@ -2,12 +2,12 @@ use crate::bar::apply_theme;
 use crate::config::DisplayFormat;
 use crate::config::KomobarTheme;
 use crate::config::WorkspacesDisplayFormat;
-use crate::komorebi_layout::KomorebiLayout;
 use crate::render::Grouping;
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
 use crate::ui::CustomUi;
-use crate::widget::BarWidget;
+use crate::widgets::komorebi_layout::KomorebiLayout;
+use crate::widgets::widget::BarWidget;
 use crate::ICON_CACHE;
 use crate::MAX_LABEL_WIDTH;
 use crate::MONITOR_INDEX;
diff --git a/komorebi-bar/src/komorebi_layout.rs b/komorebi-bar/src/widgets/komorebi_layout.rs
similarity index 99%
rename from komorebi-bar/src/komorebi_layout.rs
rename to komorebi-bar/src/widgets/komorebi_layout.rs
index 8dab2c69..495d980c 100644
--- a/komorebi-bar/src/komorebi_layout.rs
+++ b/komorebi-bar/src/widgets/komorebi_layout.rs
@@ -1,7 +1,7 @@
 use crate::config::DisplayFormat;
-use crate::komorebi::KomorebiLayoutConfig;
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
+use crate::widgets::komorebi::KomorebiLayoutConfig;
 use eframe::egui::vec2;
 use eframe::egui::Context;
 use eframe::egui::CornerRadius;
diff --git a/komorebi-bar/src/media.rs b/komorebi-bar/src/widgets/media.rs
similarity index 99%
rename from komorebi-bar/src/media.rs
rename to komorebi-bar/src/widgets/media.rs
index 40f2f249..cc87f190 100644
--- a/komorebi-bar/src/media.rs
+++ b/komorebi-bar/src/widgets/media.rs
@@ -1,7 +1,7 @@
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
 use crate::ui::CustomUi;
-use crate::widget::BarWidget;
+use crate::widgets::widget::BarWidget;
 use crate::MAX_LABEL_WIDTH;
 use eframe::egui::text::LayoutJob;
 use eframe::egui::Align;
diff --git a/komorebi-bar/src/memory.rs b/komorebi-bar/src/widgets/memory.rs
similarity index 99%
rename from komorebi-bar/src/memory.rs
rename to komorebi-bar/src/widgets/memory.rs
index 79d8b12a..7466f696 100644
--- a/komorebi-bar/src/memory.rs
+++ b/komorebi-bar/src/widgets/memory.rs
@@ -1,7 +1,7 @@
 use crate::config::LabelPrefix;
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
-use crate::widget::BarWidget;
+use crate::widgets::widget::BarWidget;
 use eframe::egui::text::LayoutJob;
 use eframe::egui::Align;
 use eframe::egui::Context;
diff --git a/komorebi-bar/src/widgets/mod.rs b/komorebi-bar/src/widgets/mod.rs
new file mode 100644
index 00000000..478960bf
--- /dev/null
+++ b/komorebi-bar/src/widgets/mod.rs
@@ -0,0 +1,13 @@
+pub mod battery;
+pub mod cpu;
+pub mod date;
+pub mod keyboard;
+pub mod komorebi;
+mod komorebi_layout;
+pub mod media;
+pub mod memory;
+pub mod network;
+pub mod storage;
+pub mod time;
+pub mod update;
+pub mod widget;
diff --git a/komorebi-bar/src/network.rs b/komorebi-bar/src/widgets/network.rs
similarity index 99%
rename from komorebi-bar/src/network.rs
rename to komorebi-bar/src/widgets/network.rs
index 1e906fbd..b7132cd2 100644
--- a/komorebi-bar/src/network.rs
+++ b/komorebi-bar/src/widgets/network.rs
@@ -1,7 +1,7 @@
 use crate::config::LabelPrefix;
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
-use crate::widget::BarWidget;
+use crate::widgets::widget::BarWidget;
 use eframe::egui::text::LayoutJob;
 use eframe::egui::Align;
 use eframe::egui::Context;
diff --git a/komorebi-bar/src/storage.rs b/komorebi-bar/src/widgets/storage.rs
similarity index 99%
rename from komorebi-bar/src/storage.rs
rename to komorebi-bar/src/widgets/storage.rs
index 4e271829..a455061d 100644
--- a/komorebi-bar/src/storage.rs
+++ b/komorebi-bar/src/widgets/storage.rs
@@ -1,7 +1,7 @@
 use crate::config::LabelPrefix;
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
-use crate::widget::BarWidget;
+use crate::widgets::widget::BarWidget;
 use eframe::egui::text::LayoutJob;
 use eframe::egui::Align;
 use eframe::egui::Context;
diff --git a/komorebi-bar/src/time.rs b/komorebi-bar/src/widgets/time.rs
similarity index 99%
rename from komorebi-bar/src/time.rs
rename to komorebi-bar/src/widgets/time.rs
index 0d47b986..aed8f093 100644
--- a/komorebi-bar/src/time.rs
+++ b/komorebi-bar/src/widgets/time.rs
@@ -2,7 +2,7 @@ use crate::bar::Alignment;
 use crate::config::LabelPrefix;
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
-use crate::widget::BarWidget;
+use crate::widgets::widget::BarWidget;
 use chrono::Local;
 use chrono::NaiveTime;
 use chrono_tz::Tz;
diff --git a/komorebi-bar/src/update.rs b/komorebi-bar/src/widgets/update.rs
similarity index 99%
rename from komorebi-bar/src/update.rs
rename to komorebi-bar/src/widgets/update.rs
index a80b7063..4d02573c 100644
--- a/komorebi-bar/src/update.rs
+++ b/komorebi-bar/src/widgets/update.rs
@@ -1,7 +1,7 @@
 use crate::config::LabelPrefix;
 use crate::render::RenderConfig;
 use crate::selected_frame::SelectableFrame;
-use crate::widget::BarWidget;
+use crate::widgets::widget::BarWidget;
 use eframe::egui::text::LayoutJob;
 use eframe::egui::Align;
 use eframe::egui::Context;
diff --git a/komorebi-bar/src/widget.rs b/komorebi-bar/src/widgets/widget.rs
similarity index 76%
rename from komorebi-bar/src/widget.rs
rename to komorebi-bar/src/widgets/widget.rs
index e0f02491..1ad0f43d 100644
--- a/komorebi-bar/src/widget.rs
+++ b/komorebi-bar/src/widgets/widget.rs
@@ -1,26 +1,26 @@
-use crate::battery::Battery;
-use crate::battery::BatteryConfig;
-use crate::cpu::Cpu;
-use crate::cpu::CpuConfig;
-use crate::date::Date;
-use crate::date::DateConfig;
-use crate::keyboard::Keyboard;
-use crate::keyboard::KeyboardConfig;
-use crate::komorebi::Komorebi;
-use crate::komorebi::KomorebiConfig;
-use crate::media::Media;
-use crate::media::MediaConfig;
-use crate::memory::Memory;
-use crate::memory::MemoryConfig;
-use crate::network::Network;
-use crate::network::NetworkConfig;
 use crate::render::RenderConfig;
-use crate::storage::Storage;
-use crate::storage::StorageConfig;
-use crate::time::Time;
-use crate::time::TimeConfig;
-use crate::update::Update;
-use crate::update::UpdateConfig;
+use crate::widgets::battery::Battery;
+use crate::widgets::battery::BatteryConfig;
+use crate::widgets::cpu::Cpu;
+use crate::widgets::cpu::CpuConfig;
+use crate::widgets::date::Date;
+use crate::widgets::date::DateConfig;
+use crate::widgets::keyboard::Keyboard;
+use crate::widgets::keyboard::KeyboardConfig;
+use crate::widgets::komorebi::Komorebi;
+use crate::widgets::komorebi::KomorebiConfig;
+use crate::widgets::media::Media;
+use crate::widgets::media::MediaConfig;
+use crate::widgets::memory::Memory;
+use crate::widgets::memory::MemoryConfig;
+use crate::widgets::network::Network;
+use crate::widgets::network::NetworkConfig;
+use crate::widgets::storage::Storage;
+use crate::widgets::storage::StorageConfig;
+use crate::widgets::time::Time;
+use crate::widgets::time::TimeConfig;
+use crate::widgets::update::Update;
+use crate::widgets::update::UpdateConfig;
 use eframe::egui::Context;
 use eframe::egui::Ui;
 use serde::Deserialize;