diff --git a/config b/config
index c5d9677..2939058 100644
--- a/config
+++ b/config
@@ -247,7 +247,7 @@ for_window [class=".*"] title_format "<b>%title</b> (%class:%instance)"
 # Read `man 5 sway-bar` for more information about this section.
 bar {
     position top
-    status_command i3status-rs $HOME/.config/sway/conf.d/i3status_$(hostname).toml
+    status_command i3status-rs $HOME/.config/sway/i3status.d/$(hostname).toml
     font $font
     colors {
         separator #666666
@@ -266,4 +266,4 @@ bar {
 exec --no-startup-id nextcloud --background
 
 include /etc/sway/config.d/*
-include $HOME/.config/sway/conf.d/$(hostname)
+include $HOME/.config/sway/hosts.d/$(hostname).conf
diff --git a/conf.d/7DPQTN2 b/hosts.d/7DPQTN2.conf
similarity index 100%
rename from conf.d/7DPQTN2
rename to hosts.d/7DPQTN2.conf
diff --git a/conf.d/silence b/hosts.d/silence.conf
similarity index 100%
rename from conf.d/silence
rename to hosts.d/silence.conf
diff --git a/conf.d/i3status_7DPQTN2.toml b/i3status.d/7DPQTN2.toml
similarity index 100%
rename from conf.d/i3status_7DPQTN2.toml
rename to i3status.d/7DPQTN2.toml
diff --git a/conf.d/i3status_annoyance.toml b/i3status.d/annoyance.toml
similarity index 100%
rename from conf.d/i3status_annoyance.toml
rename to i3status.d/annoyance.toml
diff --git a/conf.d/i3status_silence.toml b/i3status.d/silence.toml
similarity index 100%
rename from conf.d/i3status_silence.toml
rename to i3status.d/silence.toml