diff --git a/certs/freya_ca.crt b/files/certs/freya_ca.crt
similarity index 100%
rename from certs/freya_ca.crt
rename to files/certs/freya_ca.crt
diff --git a/certs/freya_intermediate.crt b/files/certs/freya_intermediate.crt
similarity index 100%
rename from certs/freya_intermediate.crt
rename to files/certs/freya_intermediate.crt
diff --git a/certs/tinternet.crt b/files/certs/tinternet.crt
similarity index 100%
rename from certs/tinternet.crt
rename to files/certs/tinternet.crt
diff --git a/keys/freya-gpg.pub b/files/keys/freya-gpg.pub
similarity index 100%
rename from keys/freya-gpg.pub
rename to files/keys/freya-gpg.pub
diff --git a/keys/freya-ssh.pub b/files/keys/freya-ssh.pub
similarity index 100%
rename from keys/freya-ssh.pub
rename to files/keys/freya-ssh.pub
diff --git a/keys/nonguix.pub b/files/keys/nonguix.pub
similarity index 100%
rename from keys/nonguix.pub
rename to files/keys/nonguix.pub
diff --git a/keys/sakura.pub b/files/keys/sakura.pub
similarity index 100%
rename from keys/sakura.pub
rename to files/keys/sakura.pub
diff --git a/home/home.scm b/home/home.scm
index 5e6a445..72b1d05 100644
--- a/home/home.scm
+++ b/home/home.scm
@@ -182,7 +182,7 @@
                     (".gtkrc-2.0" ,(local-file "config/gtk/gtk-2.0/settings"))
                     (".local/share/fonts" ,(local-file "local/fonts" #:recursive? #t))
                     (".local/share/dbus-1/services" ,(local-file "local/dbus/services" #:recursive? #t))
-                    (".mozilla/certificates" ,(local-file "../certs" #:recursive? #t))
+                    (".mozilla/certificates" ,(local-file "../files/certs" #:recursive? #t))
                     (".nix-channels" ,(local-file "nix/nix-channels"))
                     (".gitconfig" ,(local-file "config/git/gitconfig"))))
 
diff --git a/modules/freya/certs.scm b/modules/freya/certs.scm
index 9ba1fa2..71fa1bd 100644
--- a/modules/freya/certs.scm
+++ b/modules/freya/certs.scm
@@ -13,7 +13,7 @@
   (package
     (name "freya-ca-certs")
     (version "1")
-    (source (local-file "../../certs"
+    (source (local-file "../../files/certs"
                         #:recursive? #t))
     (build-system trivial-build-system)
     (license license:mpl2.0)
diff --git a/modules/freya/system.scm b/modules/freya/system.scm
index 03f67b4..002a910 100644
--- a/modules/freya/system.scm
+++ b/modules/freya/system.scm
@@ -220,8 +220,8 @@
           (service openssh-service-type
                    (openssh-configuration
                      (authorized-keys
-                       `(("freya" ,(local-file "../../keys/freya-ssh.pub"))
-                         ("root" ,(local-file "../../keys/freya-ssh.pub"))))
+                       `(("freya" ,(local-file "../../files/keys/freya-ssh.pub"))
+                         ("root" ,(local-file "../../files/keys/freya-ssh.pub"))))
                      (permit-root-login #t)
                      (allow-empty-passwords? #t)
                      (password-authentication? #f)
@@ -238,8 +238,8 @@
                           "https://substitutes.freya.cat")
                     %default-substitute-urls))
           (authorized-keys
-            (append (list (local-file "../../keys/nonguix.pub")
-                          (local-file "../../keys/sakura.pub"))
+            (append (list (local-file "../../files/keys/nonguix.pub")
+                          (local-file "../../files/keys/sakura.pub"))
                     %default-authorized-guix-keys)))))))
 
 (define-public %desktop-freya-services