diff --git a/.gitignore b/.gitignore
index a136337..d9b4f01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-*.pdf
+/build/*
diff --git a/Makefile b/Makefile
index 5210763..3df8b68 100644
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,11 @@ REVMARK ?= Draft
 DOCKER_RUN := docker run --rm -v ${PWD}:/build -w /build \
 riscvintl/riscv-docs-base-container-image:latest
 
-HEADER_SOURCE := header.adoc
-PDF_RESULT := spec-sample.pdf
-HTML_RESULT := spec-sample.html
+SRC_DIR := src
+BUILD_DIR := build
+HEADER_SOURCE := $(SRC_DIR)/header.adoc
+PDF_RESULT := $(BUILD_DIR)/spec-sample.pdf
+HTML_RESULT := $(BUILD_DIR)/spec-sample.html
 
 ASCIIDOCTOR_PDF := asciidoctor-pdf
 ASCIIDOCTOR_HTML := asciidoctor
@@ -65,5 +67,5 @@ build-no-container:
 
 clean:
 	@echo "Cleaning up generated files..."
-	rm -f $(PDF_RESULT) $(HTML_RESULT)
+	rm -rf $(BUILD_DIR)
 	@echo "Cleanup completed."
diff --git a/images/risc-v_logo.png b/images/risc-v_logo.png
deleted file mode 100755
index 4e826b2..0000000
Binary files a/images/risc-v_logo.png and /dev/null differ
diff --git a/readme.adoc b/readme.adoc
index 74727d8..c4af2da 100644
--- a/readme.adoc
+++ b/readme.adoc
@@ -10,7 +10,7 @@ This work is licensed under a Creative Commons Attribution 4.0 International Lic
 
 == Contributors
 
-The list of contributors to this specification is maintained in the link:contributors.adoc[contributors] file.
+The list of contributors to this specification is maintained in the link:src/contributors.adoc[contributors] file.
 
 For guidelines on how to contribute, refer to the link:CONTRIBUTING.md[CONTRIBUTING] file.
 
diff --git a/bibliography.adoc b/src/bibliography.adoc
similarity index 100%
rename from bibliography.adoc
rename to src/bibliography.adoc
diff --git a/chapter2.adoc b/src/chapter2.adoc
similarity index 100%
rename from chapter2.adoc
rename to src/chapter2.adoc
diff --git a/contributors.adoc b/src/contributors.adoc
similarity index 100%
rename from contributors.adoc
rename to src/contributors.adoc
diff --git a/header.adoc b/src/header.adoc
similarity index 87%
rename from header.adoc
rename to src/header.adoc
index 662789d..53e3e07 100644
--- a/header.adoc
+++ b/src/header.adoc
@@ -12,13 +12,14 @@ Authors: Author 1, Author 2
 :preface-title: Preamble
 :colophon:
 :appendix-caption: Appendix
-:imagesdir: docs-resources/images
-:title-logo-image: image:risc-v_logo.png[pdfwidth=3.25in,align=center]
+// https://docs.asciidoctor.org/asciidoc/latest/macros/images-directory/
+:imagesdir: ../docs-resources/images
+:title-logo-image: image:risc-v_logo.png["RISC-V International Logo",pdfwidth=3.25in,align=center]
 // Settings:
 :experimental:
 :reproducible:
 //:WaveDromEditorApp: app/wavedrom-editor.app
-:imagesoutdir: docs-resources/images
+:imagesoutdir: ../build/images
 :bibtex-file: example.bib
 :bibtex-order: alphabetical
 :bibtex-style: apa
diff --git a/index.adoc b/src/index.adoc
similarity index 100%
rename from index.adoc
rename to src/index.adoc
diff --git a/intro.adoc b/src/intro.adoc
similarity index 100%
rename from intro.adoc
rename to src/intro.adoc