diff --git a/upstart-jobs/pcmcia.nix b/modules/hardware/pcmcia.nix
similarity index 100%
rename from upstart-jobs/pcmcia.nix
rename to modules/hardware/pcmcia.nix
diff --git a/modules/legacy.nix b/modules/legacy.nix
deleted file mode 100644
index 245b78384ac..00000000000
--- a/modules/legacy.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  require = [
-    ../upstart-jobs/cron/locate.nix
-    ../upstart-jobs/pcmcia.nix
-  ];
-}
diff --git a/upstart-jobs/cron/locate.nix b/modules/misc/locate.nix
similarity index 100%
rename from upstart-jobs/cron/locate.nix
rename to modules/misc/locate.nix
diff --git a/modules/module-list.nix b/modules/module-list.nix
index b1f701e6a68..6fc36d30369 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -9,11 +9,12 @@
   ./config/timezone.nix
   ./config/unix-odbc-drivers.nix
   ./config/users-groups.nix
+  ./hardware/pcmcia.nix
   ./installer/grub/grub.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
-  ./legacy.nix
   ./misc/assertions.nix
+  ./misc/locate.nix
   ./programs/bash/bash.nix
   ./programs/info.nix
   ./programs/pwdutils/pwdutils.nix