diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml
deleted file mode 100644
index a346d3a..0000000
--- a/app/config/sculpin_kernel.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-sculpin_content_types:
- # speakers:
- # permalink: /speakers/:basename/
- # talks:
- # permalink: /talks/:basename/
- posts:
- enabled: false
diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml
deleted file mode 100644
index dd35d11..0000000
--- a/app/config/sculpin_site.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-name: 'My New Sculpin Site'
-locale: en
diff --git a/.envrc b/building-static-websites-sculpin/demo/.envrc
similarity index 100%
rename from .envrc
rename to building-static-websites-sculpin/demo/.envrc
diff --git a/.gitignore b/building-static-websites-sculpin/demo/.gitignore
similarity index 100%
rename from .gitignore
rename to building-static-websites-sculpin/demo/.gitignore
diff --git a/.tmux-sessionizer b/building-static-websites-sculpin/demo/.tmux-sessionizer
similarity index 100%
rename from .tmux-sessionizer
rename to building-static-websites-sculpin/demo/.tmux-sessionizer
diff --git a/building-static-websites-sculpin/demo/app/config/sculpin_kernel.yml b/building-static-websites-sculpin/demo/app/config/sculpin_kernel.yml
new file mode 100644
index 0000000..9d0bcef
--- /dev/null
+++ b/building-static-websites-sculpin/demo/app/config/sculpin_kernel.yml
@@ -0,0 +1,7 @@
+sculpin_content_types:
+ speakers:
+ permalink: /speakers/:basename/
+ talks:
+ permalink: /talks/:basename/
+ posts:
+ enabled: false
diff --git a/building-static-websites-sculpin/demo/app/config/sculpin_site.yml b/building-static-websites-sculpin/demo/app/config/sculpin_site.yml
new file mode 100644
index 0000000..e5fd0ff
--- /dev/null
+++ b/building-static-websites-sculpin/demo/app/config/sculpin_site.yml
@@ -0,0 +1,2 @@
+name: 'PHP Thames Valley'
+locale: en
diff --git a/app/config/sculpin_site_prod.yml b/building-static-websites-sculpin/demo/app/config/sculpin_site_prod.yml
similarity index 100%
rename from app/config/sculpin_site_prod.yml
rename to building-static-websites-sculpin/demo/app/config/sculpin_site_prod.yml
diff --git a/composer.json b/building-static-websites-sculpin/demo/composer.json
similarity index 100%
rename from composer.json
rename to building-static-websites-sculpin/demo/composer.json
diff --git a/composer.lock b/building-static-websites-sculpin/demo/composer.lock
similarity index 100%
rename from composer.lock
rename to building-static-websites-sculpin/demo/composer.lock
diff --git a/flake.lock b/building-static-websites-sculpin/demo/flake.lock
similarity index 100%
rename from flake.lock
rename to building-static-websites-sculpin/demo/flake.lock
diff --git a/flake.nix b/building-static-websites-sculpin/demo/flake.nix
similarity index 100%
rename from flake.nix
rename to building-static-websites-sculpin/demo/flake.nix
diff --git a/source/_includes/.keep b/building-static-websites-sculpin/demo/source/_includes/.keep
similarity index 100%
rename from source/_includes/.keep
rename to building-static-websites-sculpin/demo/source/_includes/.keep
diff --git a/source/_layouts/base.html.twig b/building-static-websites-sculpin/demo/source/_layouts/base.html.twig
similarity index 100%
rename from source/_layouts/base.html.twig
rename to building-static-websites-sculpin/demo/source/_layouts/base.html.twig
diff --git a/building-static-websites-sculpin/demo/source/_layouts/speaker.html.twig b/building-static-websites-sculpin/demo/source/_layouts/speaker.html.twig
new file mode 100644
index 0000000..326369f
--- /dev/null
+++ b/building-static-websites-sculpin/demo/source/_layouts/speaker.html.twig
@@ -0,0 +1,19 @@
+{% extends 'base' %}
+
+{% block content_wrapper %}
+
{{ page.name }}
+
+
+
+ {% block content %}{% endblock %}
+
+
+
+ {% for talk in data.talks if talk.speakers.0 == page.name %}
+
+
+ {{ talk.title }}
+
+
+ {% endfor %}
+{% endblock %}
diff --git a/building-static-websites-sculpin/demo/source/_layouts/talk.html.twig b/building-static-websites-sculpin/demo/source/_layouts/talk.html.twig
new file mode 100644
index 0000000..7660faf
--- /dev/null
+++ b/building-static-websites-sculpin/demo/source/_layouts/talk.html.twig
@@ -0,0 +1,11 @@
+{% extends 'base' %}
+
+{% block content_wrapper %}
+ {{ page.title }}
+
+ {{ page.date|date('jS F Y') }}
+
+ {% for speaker in page.speakers %}
+ {{ speaker }}
+ {% endfor %}
+{% endblock %}
diff --git a/source/_speakers/ciaran-mcnulty.md b/building-static-websites-sculpin/demo/source/_speakers/ciaran-mcnulty.md
similarity index 100%
rename from source/_speakers/ciaran-mcnulty.md
rename to building-static-websites-sculpin/demo/source/_speakers/ciaran-mcnulty.md
diff --git a/source/_speakers/dan-leech.md b/building-static-websites-sculpin/demo/source/_speakers/dan-leech.md
similarity index 69%
rename from source/_speakers/dan-leech.md
rename to building-static-websites-sculpin/demo/source/_speakers/dan-leech.md
index c9a969f..cf05ffa 100644
--- a/source/_speakers/dan-leech.md
+++ b/building-static-websites-sculpin/demo/source/_speakers/dan-leech.md
@@ -1,4 +1,6 @@
---
name: Dan Leech
imageUrl: /images/highres_257208698.jpeg
+layout: speaker
+use: [talks]
---
diff --git a/source/_speakers/dave-liddament.md b/building-static-websites-sculpin/demo/source/_speakers/dave-liddament.md
similarity index 100%
rename from source/_speakers/dave-liddament.md
rename to building-static-websites-sculpin/demo/source/_speakers/dave-liddament.md
diff --git a/source/_speakers/derick-rethans.md b/building-static-websites-sculpin/demo/source/_speakers/derick-rethans.md
similarity index 100%
rename from source/_speakers/derick-rethans.md
rename to building-static-websites-sculpin/demo/source/_speakers/derick-rethans.md
diff --git a/source/_speakers/james-titcumb.md b/building-static-websites-sculpin/demo/source/_speakers/james-titcumb.md
similarity index 100%
rename from source/_speakers/james-titcumb.md
rename to building-static-websites-sculpin/demo/source/_speakers/james-titcumb.md
diff --git a/source/_speakers/mike-karthauser.md b/building-static-websites-sculpin/demo/source/_speakers/mike-karthauser.md
similarity index 100%
rename from source/_speakers/mike-karthauser.md
rename to building-static-websites-sculpin/demo/source/_speakers/mike-karthauser.md
diff --git a/source/_speakers/naomi-gotts.md b/building-static-websites-sculpin/demo/source/_speakers/naomi-gotts.md
similarity index 100%
rename from source/_speakers/naomi-gotts.md
rename to building-static-websites-sculpin/demo/source/_speakers/naomi-gotts.md
diff --git a/source/_speakers/nigel-dunn.md b/building-static-websites-sculpin/demo/source/_speakers/nigel-dunn.md
similarity index 100%
rename from source/_speakers/nigel-dunn.md
rename to building-static-websites-sculpin/demo/source/_speakers/nigel-dunn.md
diff --git a/source/_speakers/oliver-davies.md b/building-static-websites-sculpin/demo/source/_speakers/oliver-davies.md
similarity index 100%
rename from source/_speakers/oliver-davies.md
rename to building-static-websites-sculpin/demo/source/_speakers/oliver-davies.md
diff --git a/source/_speakers/rob-allen.md b/building-static-websites-sculpin/demo/source/_speakers/rob-allen.md
similarity index 100%
rename from source/_speakers/rob-allen.md
rename to building-static-websites-sculpin/demo/source/_speakers/rob-allen.md
diff --git a/source/_speakers/robin-hodson.md b/building-static-websites-sculpin/demo/source/_speakers/robin-hodson.md
similarity index 100%
rename from source/_speakers/robin-hodson.md
rename to building-static-websites-sculpin/demo/source/_speakers/robin-hodson.md
diff --git a/source/_speakers/ryan-lee.md b/building-static-websites-sculpin/demo/source/_speakers/ryan-lee.md
similarity index 100%
rename from source/_speakers/ryan-lee.md
rename to building-static-websites-sculpin/demo/source/_speakers/ryan-lee.md
diff --git a/source/_talks/bdd.md b/building-static-websites-sculpin/demo/source/_talks/bdd.md
similarity index 100%
rename from source/_talks/bdd.md
rename to building-static-websites-sculpin/demo/source/_talks/bdd.md
diff --git a/source/_talks/build-configs.md b/building-static-websites-sculpin/demo/source/_talks/build-configs.md
similarity index 100%
rename from source/_talks/build-configs.md
rename to building-static-websites-sculpin/demo/source/_talks/build-configs.md
diff --git a/source/_talks/ddd.md b/building-static-websites-sculpin/demo/source/_talks/ddd.md
similarity index 100%
rename from source/_talks/ddd.md
rename to building-static-websites-sculpin/demo/source/_talks/ddd.md
diff --git a/source/_talks/fpga.md b/building-static-websites-sculpin/demo/source/_talks/fpga.md
similarity index 100%
rename from source/_talks/fpga.md
rename to building-static-websites-sculpin/demo/source/_talks/fpga.md
diff --git a/source/_talks/go.md b/building-static-websites-sculpin/demo/source/_talks/go.md
similarity index 100%
rename from source/_talks/go.md
rename to building-static-websites-sculpin/demo/source/_talks/go.md
diff --git a/source/_talks/php-8.md b/building-static-websites-sculpin/demo/source/_talks/php-8.md
similarity index 100%
rename from source/_talks/php-8.md
rename to building-static-websites-sculpin/demo/source/_talks/php-8.md
diff --git a/source/_talks/sculpin.md b/building-static-websites-sculpin/demo/source/_talks/sculpin.md
similarity index 100%
rename from source/_talks/sculpin.md
rename to building-static-websites-sculpin/demo/source/_talks/sculpin.md
diff --git a/source/_talks/tdd.md b/building-static-websites-sculpin/demo/source/_talks/tdd.md
similarity index 100%
rename from source/_talks/tdd.md
rename to building-static-websites-sculpin/demo/source/_talks/tdd.md
diff --git a/source/_talks/terraform.md b/building-static-websites-sculpin/demo/source/_talks/terraform.md
similarity index 100%
rename from source/_talks/terraform.md
rename to building-static-websites-sculpin/demo/source/_talks/terraform.md
diff --git a/source/_talks/testing-legacy.md b/building-static-websites-sculpin/demo/source/_talks/testing-legacy.md
similarity index 100%
rename from source/_talks/testing-legacy.md
rename to building-static-websites-sculpin/demo/source/_talks/testing-legacy.md
diff --git a/source/_talks/tuis.md b/building-static-websites-sculpin/demo/source/_talks/tuis.md
similarity index 100%
rename from source/_talks/tuis.md
rename to building-static-websites-sculpin/demo/source/_talks/tuis.md
diff --git a/source/_talks/ubiquitous-language.md b/building-static-websites-sculpin/demo/source/_talks/ubiquitous-language.md
similarity index 100%
rename from source/_talks/ubiquitous-language.md
rename to building-static-websites-sculpin/demo/source/_talks/ubiquitous-language.md
diff --git a/source/css/styles.css b/building-static-websites-sculpin/demo/source/css/styles.css
similarity index 100%
rename from source/css/styles.css
rename to building-static-websites-sculpin/demo/source/css/styles.css
diff --git a/source/images/ciaran.jpg b/building-static-websites-sculpin/demo/source/images/ciaran.jpg
similarity index 100%
rename from source/images/ciaran.jpg
rename to building-static-websites-sculpin/demo/source/images/ciaran.jpg
diff --git a/source/images/highres_131268052.jpeg b/building-static-websites-sculpin/demo/source/images/highres_131268052.jpeg
similarity index 100%
rename from source/images/highres_131268052.jpeg
rename to building-static-websites-sculpin/demo/source/images/highres_131268052.jpeg
diff --git a/source/images/highres_134740252.jpeg b/building-static-websites-sculpin/demo/source/images/highres_134740252.jpeg
similarity index 100%
rename from source/images/highres_134740252.jpeg
rename to building-static-websites-sculpin/demo/source/images/highres_134740252.jpeg
diff --git a/source/images/highres_203797572.jpeg b/building-static-websites-sculpin/demo/source/images/highres_203797572.jpeg
similarity index 100%
rename from source/images/highres_203797572.jpeg
rename to building-static-websites-sculpin/demo/source/images/highres_203797572.jpeg
diff --git a/source/images/highres_243972257.jpeg b/building-static-websites-sculpin/demo/source/images/highres_243972257.jpeg
similarity index 100%
rename from source/images/highres_243972257.jpeg
rename to building-static-websites-sculpin/demo/source/images/highres_243972257.jpeg
diff --git a/source/images/highres_257208698.jpeg b/building-static-websites-sculpin/demo/source/images/highres_257208698.jpeg
similarity index 100%
rename from source/images/highres_257208698.jpeg
rename to building-static-websites-sculpin/demo/source/images/highres_257208698.jpeg
diff --git a/source/images/highres_273691940.jpeg b/building-static-websites-sculpin/demo/source/images/highres_273691940.jpeg
similarity index 100%
rename from source/images/highres_273691940.jpeg
rename to building-static-websites-sculpin/demo/source/images/highres_273691940.jpeg
diff --git a/source/images/highres_276685584.jpeg b/building-static-websites-sculpin/demo/source/images/highres_276685584.jpeg
similarity index 100%
rename from source/images/highres_276685584.jpeg
rename to building-static-websites-sculpin/demo/source/images/highres_276685584.jpeg
diff --git a/source/images/highres_311941362.jpeg b/building-static-websites-sculpin/demo/source/images/highres_311941362.jpeg
similarity index 100%
rename from source/images/highres_311941362.jpeg
rename to building-static-websites-sculpin/demo/source/images/highres_311941362.jpeg
diff --git a/source/images/highres_312615346.jpeg b/building-static-websites-sculpin/demo/source/images/highres_312615346.jpeg
similarity index 100%
rename from source/images/highres_312615346.jpeg
rename to building-static-websites-sculpin/demo/source/images/highres_312615346.jpeg
diff --git a/source/images/highres_317091329.jpeg b/building-static-websites-sculpin/demo/source/images/highres_317091329.jpeg
similarity index 100%
rename from source/images/highres_317091329.jpeg
rename to building-static-websites-sculpin/demo/source/images/highres_317091329.jpeg
diff --git a/source/images/highres_80709042.jpeg b/building-static-websites-sculpin/demo/source/images/highres_80709042.jpeg
similarity index 100%
rename from source/images/highres_80709042.jpeg
rename to building-static-websites-sculpin/demo/source/images/highres_80709042.jpeg
diff --git a/building-static-websites-sculpin/demo/source/index.md b/building-static-websites-sculpin/demo/source/index.md
new file mode 100644
index 0000000..202ae67
--- /dev/null
+++ b/building-static-websites-sculpin/demo/source/index.md
@@ -0,0 +1,15 @@
+---
+layout: base
+title: Hello, PHP Thames Valley!
+use: [talks]
+---
+
+
diff --git a/source/_layouts/speaker.html.twig b/source/_layouts/speaker.html.twig
deleted file mode 100644
index e7056e8..0000000
--- a/source/_layouts/speaker.html.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends 'base' %}
-
-{% block content_wrapper %}
- {{ page.name }}
-{% endblock %}
diff --git a/source/_layouts/talk.html.twig b/source/_layouts/talk.html.twig
deleted file mode 100644
index 0a7f6d0..0000000
--- a/source/_layouts/talk.html.twig
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends 'base' %}
-
-{% block content_wrapper %}
- {{ page.title }}
-{% endblock %}
diff --git a/source/index.md b/source/index.md
deleted file mode 100644
index 2b6b521..0000000
--- a/source/index.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-layout: base
-title: Hello, World!
----