diff --git a/init.el b/init.el
index a3117c6..72a27c9 100644
--- a/init.el
+++ b/init.el
@@ -201,7 +201,7 @@
   :custom
   (khalel-default-alarm "30")
   (khalel-default-calendar nil)
-  (khalel-import-org-file (expand-file-name "calendar.org" org-directory))
+  (khalel-import-org-file (expand-file-name "agenda/calendar.org" org-directory))
   (khalel-import-org-file-read-only nil)
   (khalel-import-org-file-confirm-overwrite nil)
   (khalel-import-start-date "-14d")
@@ -672,7 +672,7 @@
   :defines (org-journal-dir)
   :bind ("C-c n d" . org-journal-new-entry)
   :custom
-  (org-journal-dir org-directory)
+  (org-journal-dir "agenda" org-directory)
   (org-journal-file-header "#+category: Journal")
   (org-journal-file-type 'yearly)
   (org-journal-file-format "journal-%Y.org")
@@ -711,7 +711,7 @@
   (org-agenda-window-setup 'current-window)
   (org-agenda-inhibit-startup t)
   (org-agenda-tags-column 0)
-  (org-agenda-diary-file (expand-file-name "diary.org" org-directory))
+  (org-agenda-diary-file (expand-file-name "agenda/diary.org" org-directory))
   (org-agenda-include-diary nil)
   (org-agenda-include-deadlines t)
   (org-agenda-todo-ignore-scheduled 'future)
@@ -733,6 +733,7 @@
                               (search . " %-12:c")))
   (org-agenda-file-regexp "\\`[^.].*\\.org\\\(\\.gpg\\\)?\\'")
   (org-agenda-files (list (expand-file-name org-directory)
+                          (expand-file-name "agenda" org-directory)
                           (expand-file-name "project" org-directory)
                           (expand-file-name "area" org-directory)))
   :config