diff --git a/bar/eww/bar.scss b/bar/eww/bar/style.scss
similarity index 100%
rename from bar/eww/bar.scss
rename to bar/eww/bar/style.scss
diff --git a/bar/eww/bar.yuck b/bar/eww/bar/widget.yuck
similarity index 100%
rename from bar/eww/bar.yuck
rename to bar/eww/bar/widget.yuck
diff --git a/bar/eww/eww.scss b/bar/eww/eww.scss
index 2e1dee8..cb7e88c 100644
--- a/bar/eww/eww.scss
+++ b/bar/eww/eww.scss
@@ -1,6 +1,6 @@
 @import "./theme.scss";
-@import "./bar.scss";
-@import "./timer.scss";
+@import "./bar/style.scss";
+@import "./timer/style.scss";
 
 * {
   all: unset;
diff --git a/bar/eww/eww.yuck b/bar/eww/eww.yuck
index 21de905..bd56765 100644
--- a/bar/eww/eww.yuck
+++ b/bar/eww/eww.yuck
@@ -1,5 +1,5 @@
-(include "./bar.yuck")
-(include "./timer.yuck")
+(include "./bar/widget.yuck")
+(include "./timer/widget.yuck")
 
 (defpoll bots 
   :initial `[]`
diff --git a/bar/eww/timer.scss b/bar/eww/timer/style.scss
similarity index 100%
rename from bar/eww/timer.scss
rename to bar/eww/timer/style.scss
diff --git a/bar/eww/timer.yuck b/bar/eww/timer/widget.yuck
similarity index 100%
rename from bar/eww/timer.yuck
rename to bar/eww/timer/widget.yuck