diff --git a/configuration.org b/configuration.org
index cf98244..a6e44b3 100644
--- a/configuration.org
+++ b/configuration.org
@@ -31,14 +31,11 @@ I set it up early so I can use it in ~use-package~ calls immediately.
 #+END_SRC
 * Set personal information
 
-** Who am I?   Where am I?
+** Who am I?
 
 #+BEGIN_SRC emacs-lisp
 (setq user-full-name "Gergely Polonkai"
-      user-mail-address "gergely@polonkai.eu"
-      calendar-latitude 47.4
-      calendar-longitude 19.0
-      calendar-location-name "Budapest, Hungary")
+      user-mail-address "gergely@polonkai.eu")
 #+END_SRC
 
 * Add ~lisp/~ to ~load-path~
@@ -637,6 +634,63 @@ Because we can.
 (global-prettify-symbols-mode t)
 #+END_SRC
 
+* Load some built-in libraries
+
+** ~thingatpt~
+
+#+BEGIN_SRC emacs-lisp
+(use-package thingatpt
+  :ensure nil)
+#+END_SRC
+
+** Calendar
+
+#+BEGIN_SRC emacs-lisp
+(use-package calendar
+  :ensure nil
+  :init
+  (setq calendar-week-start-day 1
+        calendar-latitude 47.4
+        calendar-longitude 19.0
+        calendar-location-name "Budapest, Hungary"
+        calendar-time-zone 60
+        calendar-standard-time-zone-name "CET"
+        calendar-daylight-time-zone-name "CEST"))
+#+END_SRC
+
+** nXML
+
+#+BEGIN_SRC emacs-lisp
+(use-package nxml-mode
+  :ensure nil
+  :config
+  (setq nxml-attribute-indent 4
+        nxml-child-indent 2
+        nxml-outline-child-indent 4))
+#+END_SRC
+
+** ~recentf~
+
+#+BEGIN_SRC emacs-lisp
+(use-package recentf
+  :ensure nil
+  :config
+  (run-at-time nil (* 5 60) 'recentf-save-list)
+  (add-to-list 'recentf-exclude (concat user-emacs-directory "elpa")))
+#+END_SRC
+
+** ~files~
+
+#+BEGIN_SRC emacs-lisp
+(use-package files
+  :ensure nil
+  :config
+  (setq backup-directory-alist
+        `((".*" . ,temporary-file-directory)))
+  (setq auto-save-file-name-transforms
+        `((".*" ,temporary-file-directory t))))
+#+END_SRC
+
 * ~use-package~ packages
 
 ** Highlight the current line
diff --git a/init.el b/init.el
index f14c9a3..d81d190 100644
--- a/init.el
+++ b/init.el
@@ -38,10 +38,6 @@
    (regexp-quote "/com.termux/")
    (expand-file-name "~")))
 
-;; Load some custom libraries
-(use-package thingatpt
-  :ensure nil)
-
 (use-package helm
   :init
   (require 'helm-config)
@@ -601,17 +597,6 @@
   (:map gpolonkai/pers-map
    ("r" . org-random-todo)))
 
-(use-package calendar
-  :ensure nil
-  :init
-  (setq calendar-week-start-day 1
-        calendar-latitude 47.4
-        calendar-longitude 19.0
-        calendar-location-name "Budapest, Hungary"
-        calendar-time-zone 60
-        calendar-standard-time-zone-name "CET"
-        calendar-daylight-time-zone-name "CEST"))
-
 (use-package yasnippet
   :demand
   :config
@@ -740,13 +725,6 @@ INFO plist."
 
 (use-package cheatsheet)
 
-(use-package nxml-mode
-  :ensure nil
-  :config
-  (setq nxml-attribute-indent 4
-        nxml-child-indent 2
-        nxml-outline-child-indent 4))
-
 (use-package savehist
   :config
   (savehist-mode 1))
@@ -811,12 +789,6 @@ INFO plist."
   :config
   (global-auto-highlight-symbol-mode t))
 
-(use-package recentf
-  :ensure nil
-  :config
-  (run-at-time nil (* 5 60) 'recentf-save-list)
-  (add-to-list 'recentf-exclude (concat user-emacs-directory "elpa")))
-
 (use-package auto-package-update
   :config
   (setq auto-package-update-interval 7
@@ -856,14 +828,6 @@ INFO plist."
 
 (use-package gitlab)
 
-(use-package files
-  :ensure nil
-  :config
-  (setq backup-directory-alist
-        `((".*" . ,temporary-file-directory)))
-  (setq auto-save-file-name-transforms
-        `((".*" ,temporary-file-directory t))))
-
 (use-package helm-c-yasnippet
   :demand t
   :config