diff --git a/msmtp/.msmtprc b/msmtp/.msmtprc
index 1943741..615debe 100644
--- a/msmtp/.msmtprc
+++ b/msmtp/.msmtprc
@@ -13,6 +13,6 @@ host           mail.fsfe.org
 port           587
 from           max.mehl@fsfe.org
 user           max.mehl
-passwordeval   pass Mail/FSFE-SMTP
+passwordeval   pass Mail/SMTP-FSFE
 
 account default : fsfe
diff --git a/offlineimap/.offlineimap/getpass.py b/offlineimap/.offlineimap/getpass.py
index c290d0a..a21f422 100755
--- a/offlineimap/.offlineimap/getpass.py
+++ b/offlineimap/.offlineimap/getpass.py
@@ -2,4 +2,4 @@
 from subprocess import check_output
 
 def get_pass(account):
-    return check_output("pass Mail/" + account, shell=True).splitlines()[0]
+    return check_output("pass " + account, shell=True).splitlines()[0]
diff --git a/offlineimap/.offlineimap/getpass.pyc b/offlineimap/.offlineimap/getpass.pyc
index 8e07fd1..af86137 100644
Binary files a/offlineimap/.offlineimap/getpass.pyc and b/offlineimap/.offlineimap/getpass.pyc differ
diff --git a/offlineimap/.offlineimaprc b/offlineimap/.offlineimaprc
index 7964a09..2a297cf 100644
--- a/offlineimap/.offlineimaprc
+++ b/offlineimap/.offlineimaprc
@@ -28,5 +28,5 @@ type = IMAP
 remotehost = machholz.uberspace.de
 remoteuser = fsfe@ext2.mehl.mx
 sslcacertfile = /etc/ssl/certs/ca-certificates.crt
-remotepasseval = get_pass("FSFE")
+remotepasseval = get_pass("Mail/IMAP-FSFE")
 maxconnections = 4
diff --git a/pass/.password-store/.gpg-id b/pass/.password-store/.gpg-id
deleted file mode 100644
index a82c246..0000000
--- a/pass/.password-store/.gpg-id
+++ /dev/null
@@ -1 +0,0 @@
-96FE8C4B
diff --git a/pass/.password-store/BorgBackup.gpg b/pass/.password-store/BorgBackup.gpg
deleted file mode 100644
index e6ca348..0000000
Binary files a/pass/.password-store/BorgBackup.gpg and /dev/null differ
diff --git a/pass/.password-store/FSFE b/pass/.password-store/FSFE
deleted file mode 120000
index 6a24321..0000000
--- a/pass/.password-store/FSFE
+++ /dev/null
@@ -1 +0,0 @@
-/home/max/Repositories/fsfe/passwords/
\ No newline at end of file
diff --git a/pass/.password-store/Mail/PfadisWeb.gpg b/pass/.password-store/Mail/PfadisWeb.gpg
deleted file mode 100644
index 6642b3d..0000000
Binary files a/pass/.password-store/Mail/PfadisWeb.gpg and /dev/null differ
diff --git a/pass/Mail/.gpg-id b/pass/Mail/.gpg-id
new file mode 100644
index 0000000..735698f
--- /dev/null
+++ b/pass/Mail/.gpg-id
@@ -0,0 +1 @@
+E1DD1B5507036B458144104CDA0040918C702037
diff --git a/pass/.password-store/DAV/Baikal-mxmehl.gpg b/pass/Mail/Baikal-mxmehl.gpg
similarity index 100%
rename from pass/.password-store/DAV/Baikal-mxmehl.gpg
rename to pass/Mail/Baikal-mxmehl.gpg
diff --git a/pass/.password-store/Mail/FSFE.gpg b/pass/Mail/IMAP-FSFE.gpg
similarity index 100%
rename from pass/.password-store/Mail/FSFE.gpg
rename to pass/Mail/IMAP-FSFE.gpg
diff --git a/pass/.password-store/Mail/FSFE-SMTP.gpg b/pass/Mail/SMTP-FSFE.gpg
similarity index 100%
rename from pass/.password-store/Mail/FSFE-SMTP.gpg
rename to pass/Mail/SMTP-FSFE.gpg
diff --git a/vdirsyncer/config b/vdirsyncer/config
index f874472..3657c5e 100644
--- a/vdirsyncer/config
+++ b/vdirsyncer/config
@@ -47,4 +47,4 @@ url = "https://d.mehl.mx/baikal/html/dav.php/addressbooks"
 username = "mxmehl"
 # The password can also be fetched from the system password storage, netrc or a
 # custom command. See http://vdirsyncer.pimutils.org/en/stable/keyring.html
-password.fetch = ["command", "pass", "DAV/Baikal-mxmehl"]
+password.fetch = ["command", "pass", "Mail/Baikal-mxmehl"]