diff --git a/README.org b/README.org
index 2e0d07fa..8c5fdd19 100644
--- a/README.org
+++ b/README.org
@@ -1068,10 +1068,10 @@ Part of this config includes some special capture templates for my work as a you
 
   (setq org-capture-templates
         '(("t" "Personal todo" entry
-           (file+headline "todo.org" "Inbox")
+           (file+headline "todo/todo.org" "Inbox")
            (file ".templates/tasks.org") :prepend t)
           ("n" "Personal notes" entry
-           (file+headline "notes.org" "Inbox")
+           (file+headline "todo/notes.org" "Inbox")
            "* %u %?\n%i\n%a" :prepend t)
           ("j" "Journal" entry
            (file+olp+datetree +org-capture-journal-file)
@@ -1083,7 +1083,7 @@ Part of this config includes some special capture templates for my work as a you
            :jump-to-captured t
            :empty-lines 1)
           ("P" "TFC Posts" entry
-           (file+headline "/home/chris/org/nvtfc_social_media.org" "Posts")
+           (file+headline "nvtfc_social_media.org" "Posts")
            (file ".templates/posts.org")
            :prepend t
            :jump-to-captured t)
@@ -1115,13 +1115,13 @@ Part of this config includes some special capture templates for my work as a you
         '((sequence "TODO(t)" "PROJ(p)" "STRT(s)" "WAIT(w)" "HOLD(h)" "|" "DONE(d)" "CNCL(c)")
           (sequence "[ ](T)" "[-](S)" "[?](W)" "|" "[X](D)"))
         org-agenda-files
-        '("/home/chris/org/inbox.org"
-          "/home/chris/org/notes.org"
+        '("/home/chris/org/todo/inbox.org"
+          "/home/chris/org/todo/notes.org"
           "/home/chris/org/repetition.org"
           "/home/chris/org/tasks.org"
           "/home/chris/org/tfc_plans.org"
           "/home/chris/org/ministry_team.org"
-          "/home/chris/org/todo.org"
+          "/home/chris/org/todo/todo.org"
           "/home/chris/org/newsletter.org"
           "/home/chris/org/nvtfc_social_media.org"
           "/home/chris/org/lessons/")
diff --git a/init.el b/init.el
index 5bbedff6..2f7efa18 100644
--- a/init.el
+++ b/init.el
@@ -671,10 +671,10 @@ vertically."
 
   (setq org-capture-templates
         '(("t" "Personal todo" entry
-           (file+headline "todo.org" "Inbox")
+           (file+headline "todo/todo.org" "Inbox")
            (file ".templates/tasks.org") :prepend t)
           ("n" "Personal notes" entry
-           (file+headline "notes.org" "Inbox")
+           (file+headline "todo/notes.org" "Inbox")
            "* %u %?\n%i\n%a" :prepend t)
           ("j" "Journal" entry
            (file+olp+datetree +org-capture-journal-file)
@@ -686,7 +686,7 @@ vertically."
            :jump-to-captured t
            :empty-lines 1)
           ("P" "TFC Posts" entry
-           (file+headline "/home/chris/org/nvtfc_social_media.org" "Posts")
+           (file+headline "nvtfc_social_media.org" "Posts")
            (file ".templates/posts.org")
            :prepend t
            :jump-to-captured t)
@@ -718,13 +718,13 @@ vertically."
         '((sequence "TODO(t)" "PROJ(p)" "STRT(s)" "WAIT(w)" "HOLD(h)" "|" "DONE(d)" "CNCL(c)")
           (sequence "[ ](T)" "[-](S)" "[?](W)" "|" "[X](D)"))
         org-agenda-files
-        '("/home/chris/org/inbox.org"
-          "/home/chris/org/notes.org"
+        '("/home/chris/org/todo/inbox.org"
+          "/home/chris/org/todo/notes.org"
           "/home/chris/org/repetition.org"
           "/home/chris/org/tasks.org"
           "/home/chris/org/tfc_plans.org"
           "/home/chris/org/ministry_team.org"
-          "/home/chris/org/todo.org"
+          "/home/chris/org/todo/todo.org"
           "/home/chris/org/newsletter.org"
           "/home/chris/org/nvtfc_social_media.org"
           "/home/chris/org/lessons/")