diff --git a/build.el b/lisp/build.el
similarity index 100%
rename from build.el
rename to lisp/build.el
diff --git a/macros.el b/lisp/macros.el
similarity index 100%
rename from macros.el
rename to lisp/macros.el
diff --git a/lisp/macros.el~ b/lisp/macros.el~
new file mode 100755
index 0000000..5be6c23
--- /dev/null
+++ b/lisp/macros.el~
@@ -0,0 +1,22 @@
+;; -----------------------------
+;; Org export macros (batch-safe)
+;; -----------------------------
+
+(setq org-export-global-macros
+      '(
+        ;; --- Tufte-style sidenotes ---
+        ("sidenote"
+         . "@@html:<span class=\"sidenote\">$1</span>@@")
+
+        ;; --- Single epigraph ---
+        ("epigraph_single"
+         . "@@html:<blockquote class=\"epigraph\"><p>$1</p><footer>$2</footer></blockquote>@@")
+
+        ;; --- Multi-line epigraph (optional) ---
+        ("epigraph"
+         . "@@html:<blockquote class=\"epigraph\">$1</blockquote>@@")
+
+        ;; --- New thought / drop cap ---
+        ("newthought"
+         . "@@html:<span class=\"newthought\">$1</span>@@")
+        ))
diff --git a/tests/macros-tests.el b/tests/macros-tests.el
index 2fb4500..9d3c65d 100644
--- a/tests/macros-tests.el
+++ b/tests/macros-tests.el
@@ -1,6 +1,6 @@
 (require 'ert)
 (require 'ox-html)
-(load-file "~/master-folder/org_files/org_roam/macros.el")
+(load-file "~/master-folder/org_files/org_roam/lisp/macros.el")
 
 (defun helper/org-export-html (org-content)
   "Export ORG-CONTENT string to HTML and return the result."