diff --git a/coolj.el b/emacs/coolj.el
similarity index 100%
rename from coolj.el
rename to emacs/coolj.el
diff --git a/make-deps.el b/emacs/make-deps.el
similarity index 100%
rename from make-deps.el
rename to emacs/make-deps.el
diff --git a/notmuch-address.el b/emacs/notmuch-address.el
similarity index 100%
rename from notmuch-address.el
rename to emacs/notmuch-address.el
diff --git a/notmuch-company.el b/emacs/notmuch-company.el
similarity index 100%
rename from notmuch-company.el
rename to emacs/notmuch-company.el
diff --git a/notmuch-compat.el b/emacs/notmuch-compat.el
similarity index 100%
rename from notmuch-compat.el
rename to emacs/notmuch-compat.el
diff --git a/notmuch-crypto.el b/emacs/notmuch-crypto.el
similarity index 100%
rename from notmuch-crypto.el
rename to emacs/notmuch-crypto.el
diff --git a/notmuch-draft.el b/emacs/notmuch-draft.el
similarity index 100%
rename from notmuch-draft.el
rename to emacs/notmuch-draft.el
diff --git a/notmuch-hello.el b/emacs/notmuch-hello.el
similarity index 100%
rename from notmuch-hello.el
rename to emacs/notmuch-hello.el
diff --git a/notmuch-jump.el b/emacs/notmuch-jump.el
similarity index 100%
rename from notmuch-jump.el
rename to emacs/notmuch-jump.el
diff --git a/notmuch-lib.el b/emacs/notmuch-lib.el
similarity index 100%
rename from notmuch-lib.el
rename to emacs/notmuch-lib.el
diff --git a/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el
similarity index 100%
rename from notmuch-maildir-fcc.el
rename to emacs/notmuch-maildir-fcc.el
diff --git a/notmuch-message.el b/emacs/notmuch-message.el
similarity index 100%
rename from notmuch-message.el
rename to emacs/notmuch-message.el
diff --git a/notmuch-mua.el b/emacs/notmuch-mua.el
similarity index 100%
rename from notmuch-mua.el
rename to emacs/notmuch-mua.el
diff --git a/notmuch-parser.el b/emacs/notmuch-parser.el
similarity index 100%
rename from notmuch-parser.el
rename to emacs/notmuch-parser.el
diff --git a/notmuch-print.el b/emacs/notmuch-print.el
similarity index 100%
rename from notmuch-print.el
rename to emacs/notmuch-print.el
diff --git a/notmuch-query.el b/emacs/notmuch-query.el
similarity index 100%
rename from notmuch-query.el
rename to emacs/notmuch-query.el
diff --git a/notmuch-show.el b/emacs/notmuch-show.el
similarity index 100%
rename from notmuch-show.el
rename to emacs/notmuch-show.el
diff --git a/notmuch-tag.el b/emacs/notmuch-tag.el
similarity index 100%
rename from notmuch-tag.el
rename to emacs/notmuch-tag.el
diff --git a/notmuch-tree.el b/emacs/notmuch-tree.el
similarity index 100%
rename from notmuch-tree.el
rename to emacs/notmuch-tree.el
diff --git a/notmuch-wash.el b/emacs/notmuch-wash.el
similarity index 100%
rename from notmuch-wash.el
rename to emacs/notmuch-wash.el
diff --git a/notmuch.el b/emacs/notmuch.el
similarity index 100%
rename from notmuch.el
rename to emacs/notmuch.el
diff --git a/rstdoc.el b/emacs/rstdoc.el
similarity index 100%
rename from rstdoc.el
rename to emacs/rstdoc.el
diff --git a/sync.sh b/sync.sh
index 4420e84..cbc0b6a 100755
--- a/sync.sh
+++ b/sync.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 git clone https://git.notmuchmail.org/git/notmuch ./_src
-cp ./_src/emacs/*.el .
+cp ./_src/emacs/*.el ./emacs
 rm -rf ./_src