diff --git a/config.org b/config.org
index d0aa1a1..f51a61e 100644
--- a/config.org
+++ b/config.org
@@ -1110,11 +1110,7 @@ Forbid closing of todos with open subtasks.
 Set org agenda files.
 
 #+begin_src emacs-lisp
-(setq org-agenda-files
-      (list
-       "~/org/"
-       "~/org/personal-computer/"
-       "~/org/projects/"))
+(setq org-agenda-files (list "~/org/tasks/"))
 
 (setq org-agenda-text-search-extra-files
       (list "~/org/archive/"
@@ -1132,15 +1128,15 @@ Define org-capture templates.
 
 #+begin_src emacs-lisp
 (setq org-capture-templates
-      '(("t" "Normal task" entry (file "~/org/inbox.org")
+      '(("t" "Normal task" entry (file "~/org/tasks/inbox.org")
          "* TODO %?\n:PROPERTIES:\n:CREATED: %U\n:END:")
-        ("e" "E-Mail needing a reply" entry (file "~/org/inbox.org")
+        ("e" "E-Mail needing a reply" entry (file "~/org/tasks/inbox.org")
          "* TODO Reply: %a\n:PROPERTIES:\n:CREATED: %U\n:END:"
          :immediate-finish t)
-        ("p" "org-protocol-capture" entry (file "~/org/inbox.org")
+        ("p" "org-protocol-capture" entry (file "~/org/tasks/inbox.org")
          "* TODO [[%:link][%:description]]\n:PROPERTIES:\n:CREATED: %U\n:END:\n\n%i"
          :immediate-finish t)
-        ("r" "Reading todo" entry (file "~/org/read-review.org")
+        ("r" "Reading todo" entry (file "~/org/tasks/read-review.org")
          "* TODO %^L %^G\n:PROPERTIES:\n:CREATED: %U\n:END:\n")))
 #+end_src
 
@@ -1930,7 +1926,7 @@ Using this function I can now define a org-capture template for my purpose.
 
 #+begin_src emacs-lisp
 (add-to-list 'org-capture-templates
-             '("a" "RSS Article" entry (file "~/org/read-review.org")
+             '("a" "RSS Article" entry (file "~/org/tasks/read-review.org")
                "* TODO %(elfeed-feed-title (mmk2410/org-capture-elfeed-entry-props 'elfeed-entry-feed)): [[%(mmk2410/org-capture-elfeed-entry-props 'elfeed-entry-link)][%(mmk2410/org-capture-elfeed-entry-props 'elfeed-entry-title)]]\n  :PROPERTIES:\n  :CREATED: %U\n  :END:\n"
                :immediate-finish t))
 #+end_src
@@ -2215,10 +2211,10 @@ I use org-mode heavily and also manage my todos within it. Since my INBOX is not
 #+begin_src emacs-lisp
 (if (mmk2410/work)
   (add-to-list 'org-capture-templates
-               '("m" "mail" entry (file "~/org/work.inbox.org")
-                 "* TODO %a%?\n  :PROPERTIES:\n  :CREATED: %U\n  :END:\n"))
+               '("m" "mail" entry (file "~/org/tasks/inbox.org")
+                 "* TODO %a%? :@work:\n:PROPERTIES:\n:CREATED:%U\n:END:\n"))
   (add-to-list 'org-capture-templates
-               '("m" "mail" entry (file "~/org/inbox.org")
+               '("m" "mail" entry (file "~/org/tasks/inbox.org")
                  "* TODO %a%?\n  :PROPERTIES:\n  :CREATED: %U\n  :END:\n")))
 #+end_src