diff --git a/home/mail/accounts.nix b/home/mail/accounts/default.nix
similarity index 100%
rename from home/mail/accounts.nix
rename to home/mail/accounts/default.nix
diff --git a/home/mail/default.nix b/home/mail/default.nix
index 3ec0c9a..ac44593 100644
--- a/home/mail/default.nix
+++ b/home/mail/default.nix
@@ -6,9 +6,9 @@ let
 in
 {
   imports = [
-    ./accounts.nix
-    ./himalaya.nix
-    ./msmtp.nix
+    ./accounts
+    ./himalaya
+    ./msmtp
   ];
 
   options.my.home.mail = with lib; {
diff --git a/home/mail/himalaya.nix b/home/mail/himalaya/default.nix
similarity index 100%
rename from home/mail/himalaya.nix
rename to home/mail/himalaya/default.nix
diff --git a/home/mail/msmtp.nix b/home/mail/msmtp/default.nix
similarity index 100%
rename from home/mail/msmtp.nix
rename to home/mail/msmtp/default.nix