diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index f04431d..e088887 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -27,6 +27,14 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y emacs-nox elpa-htmlize
 
+      - name: Tangle Org files
+        run: |
+          emacs --batch \
+            --eval "(require 'org)" \
+            --eval "(setq org-confirm-babel-evaluate nil)" \
+            --visit=SwarselSystems.org \
+            --funcall org-babel-tangle
+
       - name: Export Org to HTML
         run: |
           emacs --batch \
@@ -43,7 +51,7 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
-          path: '.'
+          path: 'site'
 
   deploy:
     environment:
diff --git a/.gitignore b/.gitignore
index 32c7e13..9a92b39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,4 @@ result
 *.bak
 .pre-commit-config.yaml
 .direnv
-/index.html
-/style.css
+/site/
diff --git a/SwarselSystems.org b/SwarselSystems.org
index 6deaa55..7dffe5b 100644
--- a/SwarselSystems.org
+++ b/SwarselSystems.org
@@ -3,7 +3,7 @@
 #+PROPERTY: header-args:nix :mkdirp yes
 #+PROPERTY: header-args:nix-ts :mkdirp yes
 #+PROPERTY: header-args:shell :mkdirp yes
-#+EXPORT_FILE_NAME: index.html
+#+EXPORT_FILE_NAME: site/index.html
 #+OPTIONS: toc:6 author:nil creator:nil timestamp:nil validate:nil html-postamble:nil html-preamble:nil broken-links:mark
 #+HTML_HEAD: <link rel="stylesheet" href="style.css">
 #+macro: revision-date (eval (format-time-string "%F %T %z"))
@@ -30949,7 +30949,7 @@ This is the stylesheet used by waybar.
 
 This is the stylesheet used by waybar.
 
-#+begin_src css :tangle style.css
+#+begin_src css :tangle site/style.css :mkdirp yes
   html, body {
     margin: 0;
     padding: 0;