diff --git a/.doom.d/+org.el b/.doom.d/+org.el
new file mode 100644
index 0000000..bf71761
--- /dev/null
+++ b/.doom.d/+org.el
@@ -0,0 +1,20 @@
+;;; ~/projects/dotfiles/.doom.d/+org.el -*- lexical-binding: t; -*-
+
+(after! org
+  (add-to-list 'org-modules 'org-habit t))
+
+(after! evil-org
+  (remove-hook 'org-tab-first-hook #'+org-cycle-only-current-subtree-h))
+
+(setq org-bullets-bullet-list '("*")
+      org-refile-allow-creating-parent-nodes 'confirm)
+
+(use-package! org-ref
+  :after org
+  :init
+  (setq org-ref-bibliography-notes "~/org/bibliography/notes.org"
+        org-ref-default-bibliography '("~/org/bibliography/refererences.bib")
+        org-ref-pdf-directory "~/org/bibliography/pdfs")
+
+  (when (featurep! :completion ivy)
+    (setq org-ref-completion-library 'org-ref-ivy-cite)))
diff --git a/.doom.d/config.el b/.doom.d/config.el
index fe91779..129e42a 100644
--- a/.doom.d/config.el
+++ b/.doom.d/config.el
@@ -67,16 +67,6 @@
                          (magit-rebase "--autosquash" "--gpg-sign=0x1C534F4138D5CCE4")
                          (magit-pull "--rebase" "--gpg-sign=0x1C534F4138D5CCE4")))
 
-;;; :lang org
-(setq org-directory "~/org/"
-      org-bullets-bullet-list '("*"))
-
-(setq-default org-hide-leading-stars nil)
-
-;; revert TAB behavior (cycle subtree visibility state recursively)
-(after! evil-org
-  (remove-hook 'org-tab-first-hook #'+org-cycle-only-current-subtree-h))
-
 ;;; :ui vc-gutter
 (setq +vc-gutter-in-remote-files nil)
 
@@ -91,4 +81,5 @@
 
 (when IS-MAC
   (setq +latex-viewers '(skim pdf-tools)))
+(load! "+org")
 (load! "+bindings")