diff --git a/home/scripts/brightness.nix b/home/scripts/brightness/default.nix
similarity index 100%
rename from home/scripts/brightness.nix
rename to home/scripts/brightness/default.nix
diff --git a/home/scripts/caffeine.nix b/home/scripts/caffeine/default.nix
similarity index 100%
rename from home/scripts/caffeine.nix
rename to home/scripts/caffeine/default.nix
diff --git a/home/scripts/default.nix b/home/scripts/default.nix
index 229dff8..789431f 100644
--- a/home/scripts/default.nix
+++ b/home/scripts/default.nix
@@ -1,14 +1,15 @@
 {
   imports = [
-    ./misc.nix
-    ./nerdfetch.nix
-    ./nixy.nix
-    ./sounds.nix
-    ./brightness.nix
-    ./caffeine.nix
-    ./night-shift.nix
-    ./screenshot.nix
-    ./startup.nix
+    ./nixy
+    ./nerdfetch
+    ./sounds
+    ./brightness
+    ./caffeine
+    ./night-shift
+    ./screenshot
+    ./startup
     ./nerdfont_fzf
+
+    ./misc.nix
   ];
 }
diff --git a/home/scripts/nerdfetch.nix b/home/scripts/nerdfetch/default.nix
similarity index 100%
rename from home/scripts/nerdfetch.nix
rename to home/scripts/nerdfetch/default.nix
diff --git a/home/scripts/night-shift.nix b/home/scripts/night-shift/default.nix
similarity index 100%
rename from home/scripts/night-shift.nix
rename to home/scripts/night-shift/default.nix
diff --git a/home/scripts/nixy.nix b/home/scripts/nixy/default.nix
similarity index 100%
rename from home/scripts/nixy.nix
rename to home/scripts/nixy/default.nix
diff --git a/home/scripts/screenshot.nix b/home/scripts/screenshot/default.nix
similarity index 100%
rename from home/scripts/screenshot.nix
rename to home/scripts/screenshot/default.nix
diff --git a/home/scripts/sounds.nix b/home/scripts/sounds/default.nix
similarity index 100%
rename from home/scripts/sounds.nix
rename to home/scripts/sounds/default.nix
diff --git a/home/scripts/startup.nix b/home/scripts/startup/default.nix
similarity index 97%
rename from home/scripts/startup.nix
rename to home/scripts/startup/default.nix
index fbad004..9e3ecb3 100644
--- a/home/scripts/startup.nix
+++ b/home/scripts/startup/default.nix
@@ -2,7 +2,7 @@
 { pkgs, config, ... }:
 let
   homedir = config.home.homeDirectory;
-  variable = import ../../variables.nix;
+  variable = import ../../../variables.nix;
 
   battery-notif = pkgs.writeShellScriptBin "battery-notif" ''
     # Send notifications when low on battery and not in charge