diff --git a/.gitignore b/.gitignore
index 6612d23..f66e219 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-book
-blog/*
+blog/
+src
 content/*
-content-minimal/*
+example/*
diff --git a/book.toml b/book.toml
index 3c710aa..2dc9c92 100644
--- a/book.toml
+++ b/book.toml
@@ -2,7 +2,6 @@
 authors = ["Matthew Binning"]
 language = "en"
 multilingual = false
-src = "content"
 title = "The Bin"
 
 [build]
diff --git a/deploy.sh b/deploy.sh
index b024f8e..b2d4dc7 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -4,11 +4,9 @@ set -e
 
 # Build the blog with mdbook before deploying
 printf "Building blog with mdbook...\n"
+[ -s src ] || ln -s /var/lib/www src
 mdbook build
 
-# Common files to deploy (shared between staging and prod)
-DEPLOY_FILES="blog includes index.html menu.html resume.html style.css 404.html cover.jpg"
-
 # Usage information
 usage() {
     printf "Usage: %s [staging|prod]\n\n  staging - Deploy to local staging environment (/srv/www/stage.binning.net)\n  prod    - Deploy to production server via SSH (www.binning.net)\n\nExample:\n  %s staging\n  %s prod\n" "$0" "$0" "$0"
@@ -34,7 +32,8 @@ case $ENV in
         
         # Deploy website files via rsync
         printf "Deploying website files...\n"
-        sudo rsync -av --delete ${DEPLOY_FILES} ${STAGING_PATH}/
+        sudo rsync -av --delete main/* ${STAGING_PATH}/
+        sudo rsync -av --delete blog ${STAGING_PATH}/
         
         # Set proper ownership
         sudo chown -R nginx:nginx ${STAGING_PATH}/
diff --git a/404.html b/main/404.html
similarity index 100%
rename from 404.html
rename to main/404.html
diff --git a/blog.html b/main/blog.html
similarity index 100%
rename from blog.html
rename to main/blog.html
diff --git a/main/cover.jpg b/main/cover.jpg
new file mode 100644
index 0000000..02fb43b
Binary files /dev/null and b/main/cover.jpg differ
diff --git a/includes/footer.html b/main/includes/footer.html
similarity index 100%
rename from includes/footer.html
rename to main/includes/footer.html
diff --git a/includes/navbar.html b/main/includes/navbar.html
similarity index 100%
rename from includes/navbar.html
rename to main/includes/navbar.html
diff --git a/index.html b/main/index.html
similarity index 100%
rename from index.html
rename to main/index.html
diff --git a/menu.html b/main/menu.html
similarity index 100%
rename from menu.html
rename to main/menu.html
diff --git a/resume.html b/main/resume.html
similarity index 100%
rename from resume.html
rename to main/resume.html
diff --git a/style.css b/main/style.css
similarity index 100%
rename from style.css
rename to main/style.css
diff --git a/todo.txt b/todo.txt
index 7ef6e02..111ee5c 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,5 +1,7 @@
-(A) Move the resume to the private section and add the lock symbol. @Cline
-(B) Change deploy.sh into a Makefile with operations for build, deploy [staging|production] @Cline
+(C) Add a folder to hold the nginx/nix files and deploy it properly.
+(B) Add a Forgejo pipeline to supersede deploy.sh. @Cline
+(C) Move the resume to the private section and add the lock symbol. @Cline
+Remove the one line descriptions from the menu. @Cline
 Reduce the CSS where possible. Match my website's theme to align with mdbook's theme. @Cline
 Theme Forgejo where possible to match the theme. @Cline
 
@@ -14,6 +16,8 @@ Fill out the DefCon article
 Fill out the Oktoberfest article
 Fill out the health journey
 Fill out the faith journey
+x Add a build step to fetch/symlink "content" to this repo before mdbook build.
+x Add a folder to hold the main html files and deploy it properly.
 x Create a simple webpage with HTML and CSS
 x Serve it from nginx
 x Add a navbar at the top with the index page as link in the top-left.