diff --git a/nixos/i3.nix b/nixos/i3/i3.nix
similarity index 100%
rename from nixos/i3.nix
rename to nixos/i3/i3.nix
diff --git a/lock.sh b/nixos/i3/lock.sh
similarity index 100%
rename from lock.sh
rename to nixos/i3/lock.sh
diff --git a/cpu-temp.sh b/nixos/i3/polybar/cpu-temp.sh
similarity index 90%
rename from cpu-temp.sh
rename to nixos/i3/polybar/cpu-temp.sh
index c7c80523..fcf4283d 100755
--- a/cpu-temp.sh
+++ b/nixos/i3/polybar/cpu-temp.sh
@@ -6,4 +6,4 @@ sensors="$profile/sensors"
 
 max_temp=`$sensors | $system/egrep -o '[0-9][0-9]\.[0-9]' | $system/sort | $system/uniq | $system/tail -n 1`
 
-echo "${max_temp}°C"
+echo " ${max_temp}°C"
diff --git a/openweathermap-fullfeatured.sh b/nixos/i3/polybar/openweathermap-fullfeatured.sh
similarity index 100%
rename from openweathermap-fullfeatured.sh
rename to nixos/i3/polybar/openweathermap-fullfeatured.sh
diff --git a/nixos/polybar.nix b/nixos/i3/polybar/polybar.nix
similarity index 94%
rename from nixos/polybar.nix
rename to nixos/i3/polybar/polybar.nix
index e725ab3f..e5f12396 100644
--- a/nixos/polybar.nix
+++ b/nixos/i3/polybar/polybar.nix
@@ -41,7 +41,7 @@
       "module/weather" = {
         type = "custom/script";
         interval = 600;
-        exec = "~/dev/dotfiles/openweathermap-fullfeatured.sh";
+        exec = "~/dev/dotfiles/nixos/i3/polybar/openweathermap-fullfeatured.sh";
         label-font = 2;
       };
 
@@ -58,7 +58,7 @@
       "module/temperature" = {
         type = "custom/script";
         interval = 5;
-        exec = "~/dev/dotfiles/cpu-temp.sh";
+        exec = "~/dev/dotfiles/nixos/i3/polybar/cpu-temp.sh";
       };
 
       "module/memory" = {
diff --git a/nixos/user-xsession.nix b/nixos/user-xsession.nix
index b5b5a143..e65f6bde 100644
--- a/nixos/user-xsession.nix
+++ b/nixos/user-xsession.nix
@@ -45,7 +45,7 @@
   };
 
   imports = [
-    ./polybar.nix
-    ./i3.nix
+    ./i3/polybar/polybar.nix
+    ./i3/i3.nix
   ];
 }