diff --git a/bundle/bundle--org.el b/bundle/bundle--org.el
index 36bfc215..03967ad4 100644
--- a/bundle/bundle--org.el
+++ b/bundle/bundle--org.el
@@ -85,32 +85,32 @@
   (add-hook 'org-agenda-finalize-hook #'org-agenda-log-mode-colorize-block))
 
 ;; Notes are always in the context of a specific task.
-(add-to-list 'org-capture-templates '("pn" "Power Note" entry (file "notes.org") "* %K\n- Entered on %U\n- %F\n\n%i\n%?" :empty-lines 1))
+(add-to-list 'org-capture-templates '("pn" "Power Note" entry (file "agenda/notes.org") "* %K\n- Entered on %U\n- %F\n\n%i\n%?" :empty-lines 1))
 ;; A task can be everything to do which involves some kind of physical activity.
-(add-to-list 'org-capture-templates '("t" "Task" entry (file "tasks.org") "* TODO %? :TASK:\nEntered on %U"))
+(add-to-list 'org-capture-templates '("t" "Task" entry (file "agenda/tasks.org") "* TODO %? :TASK:\nEntered on %U"))
 ;; Remember me of an important event.
-(add-to-list 'org-capture-templates '("a" "Appointment" entry (file "appointments.org") "* %? :APPOINTMENT:\n%T\n"))
+(add-to-list 'org-capture-templates '("a" "Appointment" entry (file "agenda/appointments.org") "* %? :APPOINTMENT:\n%T\n"))
 ;; Capture a meeting
-(add-to-list 'org-capture-templates '("m" "Meeting" entry (file "meetings.org") "* %^{Topic} :MEETING:\n%T"
+(add-to-list 'org-capture-templates '("m" "Meeting" entry (file "agenda/meetings.org") "* %^{Topic} :MEETING:\n%T"
                                       :clock-in t
                                       :empty-lines 1))
 ;; Capture a training
-(add-to-list 'org-capture-templates '("w" "Training" entry (file "trainings.org") "* %^{Name} :TRAINING:\nEntered on %T"
+(add-to-list 'org-capture-templates '("w" "Training" entry (file "agenda/trainings.org") "* %^{Name} :TRAINING:\nEntered on %T"
                                       :clock-in t
                                       :empty-lines 1))
 ;; A journal is an unordered collection of thougths and ideas.
-(add-to-list 'org-capture-templates '("j" "Journal" entry (file "journal.org") "* %? :JOURNAL:\nEntered on %T\n\n"
+(add-to-list 'org-capture-templates '("j" "Journal" entry (file "agenda/journal.org") "* %? :JOURNAL:\nEntered on %T\n\n"
                                       :empty-lines 1))
 ;; Capture activities in a chronological order.
-(add-to-list 'org-capture-templates '("l" "Log" entry (file+olp+datetree "logbook.org") "* %T - %^{Activity} :LOG:\n%?"
+(add-to-list 'org-capture-templates '("l" "Log" entry (file+olp+datetree "agenda/logbook.org") "* %T - %^{Activity} :LOG:\n%?"
                                       :clock-in t
                                       :empty-lines 1))
 ;; Log my growth talks
-(add-to-list 'org-capture-templates '("g" "Growth Talk" entry (file+olp+datetree "growthtalks.org") "* %U - %^{Activity} :TALK:"))
+(add-to-list 'org-capture-templates '("g" "Growth Talk" entry (file+olp+datetree "agenda/growthtalks.org") "* %U - %^{Activity} :TALK:"))
 ;; Record general hours
-(add-to-list 'org-capture-templates '("A" "Allgemein" table-line (file+olp "hours.org") "| %u | %^{Stunden} | %? |"))
+(add-to-list 'org-capture-templates '("A" "Allgemein" table-line (file+olp "agenda/hours.org") "| %u | %^{Stunden} | %? |"))
 ;; Maintain a shopping wish list
-(add-to-list 'org-capture-templates '("S" "Shopping" checkitem (file "shopping.org") " [ ] %?\n" :prepend t :kill-buffer t))
+(add-to-list 'org-capture-templates '("S" "Shopping" checkitem (file "agenda/shopping.org") " [ ] %?\n" :prepend t :kill-buffer t))
 
 (use-package org-roam
   :after org
diff --git a/bundle/custom_gnu.el b/bundle/custom_gnu.el
index 62de2306..66e764dc 100644
--- a/bundle/custom_gnu.el
+++ b/bundle/custom_gnu.el
@@ -39,7 +39,7 @@
      ("XXX+" . "#dc752f")
      ("\\?\\?\\?+" . "#dc752f")))
  '(inferior-lisp-program "/usr/bin/sbcl --noinform" t)
- '(initial-buffer-choice "~/Documents/journal/notes.org")
+ '(initial-buffer-choice "~/Documents/org/agenda/tasks.org")
  '(initial-frame-alist '((fullscreen . maximized) (undecorated . t)))
  '(jabber-account-list '(("marcus.kammer@mailbox.org")))
  '(jabber-muc-autojoin
@@ -48,9 +48,9 @@
    '(("lisp@conference.a3.pm" . "marcus")
      ("emacs@salas.suchat.org" . "marcus")))
  '(message-user-organization "")
- '(org-agenda-files '("~/Documents/journal/"))
+ '(org-agenda-files '("agenda/"))
  '(org-babel-python-command "python3")
- '(org-directory "~/Documents/journal/")
+ '(org-directory "~/Documents/org/")
  '(org-modules
    '(ol-bbdb ol-docview ol-eww ol-gnus ol-info ol-irc ol-mhe ol-rmail org-tempo ol-w3m orgtbl-sqlinsert))
  '(org-plantuml-jar-path "~/.local/bin/plantuml.jar")