diff --git a/users/simon/modules/default.nix b/users/simon/modules/default.nix
index b19fd06..7799cd3 100644
--- a/users/simon/modules/default.nix
+++ b/users/simon/modules/default.nix
@@ -13,7 +13,7 @@
     ./neovim
     ./pass.nix
     ./programs.nix
-    ./scripts.nix
+    ./scripts
     ./sway.nix
     ./tmate.nix
     ./tmux.nix
diff --git a/users/simon/files/scripts/btsync b/users/simon/modules/scripts/btsync
similarity index 100%
rename from users/simon/files/scripts/btsync
rename to users/simon/modules/scripts/btsync
diff --git a/users/simon/files/scripts/calibre-remote b/users/simon/modules/scripts/calibre-remote
similarity index 100%
rename from users/simon/files/scripts/calibre-remote
rename to users/simon/modules/scripts/calibre-remote
diff --git a/users/simon/modules/scripts.nix b/users/simon/modules/scripts/default.nix
similarity index 86%
rename from users/simon/modules/scripts.nix
rename to users/simon/modules/scripts/default.nix
index ebb814b..3a4f127 100644
--- a/users/simon/modules/scripts.nix
+++ b/users/simon/modules/scripts/default.nix
@@ -3,10 +3,11 @@ let
   scripts = pkgs.stdenvNoCC.mkDerivation {
     name = "scripts";
 
-    src = ../files/scripts;
+    src = ./.;
 
     dontBuild = true;
     installPhase = ''
+      rm default.nix
       mkdir -p $out
       cp -r . $out/bin
     '';
diff --git a/users/simon/files/scripts/mkvextract-all-attachments b/users/simon/modules/scripts/mkvextract-all-attachments
similarity index 100%
rename from users/simon/files/scripts/mkvextract-all-attachments
rename to users/simon/modules/scripts/mkvextract-all-attachments
diff --git a/users/simon/files/scripts/mkvpropedit-add-fonts b/users/simon/modules/scripts/mkvpropedit-add-fonts
similarity index 100%
rename from users/simon/files/scripts/mkvpropedit-add-fonts
rename to users/simon/modules/scripts/mkvpropedit-add-fonts
diff --git a/users/simon/files/scripts/nixify b/users/simon/modules/scripts/nixify
similarity index 100%
rename from users/simon/files/scripts/nixify
rename to users/simon/modules/scripts/nixify
diff --git a/users/simon/files/scripts/renumber b/users/simon/modules/scripts/renumber
similarity index 100%
rename from users/simon/files/scripts/renumber
rename to users/simon/modules/scripts/renumber