diff --git a/config.rb b/config.rb
index 7bae7920..00ff9b0e 100644
--- a/config.rb
+++ b/config.rb
@@ -8,7 +8,7 @@
 
 # Location of the theme's resources.
 sass_dir = "sass"
-css_dir = "source/css"
+css_dir = "source/assets/css"
 images_dir = "source/assets/images"
 generated_images_dir = images_dir + "/generated"
 javascripts_dir = "source/js"
diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig
index c8945914..a6048760 100644
--- a/source/_layouts/default.html.twig
+++ b/source/_layouts/default.html.twig
@@ -18,7 +18,7 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
-        <link rel="stylesheet" href="{{ site.url }}/css/oliverdavies.css">
+        <link rel="stylesheet" href="{{ site.url }}/assets/css/oliverdavies.css">
         <link rel="stylesheet" href="{{ site.url }}/components/highlightjs/styles/{{ site.hightlightjs_style }}.css">
         <link rel="stylesheet" href="{{ site.url }}/components/font-awesome/css/font-awesome.min.css">
         {% block styles %}{% endblock %}
diff --git a/source/_layouts/project.html.twig b/source/_layouts/project.html.twig
index 69af4fd1..49ad24c1 100644
--- a/source/_layouts/project.html.twig
+++ b/source/_layouts/project.html.twig
@@ -35,7 +35,7 @@
 
     {% if page.image %}
         <div class="project--image">
-            <img src="/images/projects/{{ page.image }}" alt="The {{ page.title }} website.">
+            <img src="/assets/images/projects/{{ page.image }}" alt="The {{ page.title }} website.">
         </div>
     {% endif %}
 {% endblock %}
diff --git a/source/css/oliverdavies.css b/source/assets/css/oliverdavies.css
similarity index 100%
rename from source/css/oliverdavies.css
rename to source/assets/css/oliverdavies.css
diff --git a/source/images/experience/cti-digital.png b/source/assets/images/experience/cti-digital.png
similarity index 100%
rename from source/images/experience/cti-digital.png
rename to source/assets/images/experience/cti-digital.png
diff --git a/source/images/experience/drupal-association.png b/source/assets/images/experience/drupal-association.png
similarity index 100%
rename from source/images/experience/drupal-association.png
rename to source/assets/images/experience/drupal-association.png
diff --git a/source/images/experience/horse-and-country.jpg b/source/assets/images/experience/horse-and-country.jpg
similarity index 100%
rename from source/images/experience/horse-and-country.jpg
rename to source/assets/images/experience/horse-and-country.jpg
diff --git a/source/images/experience/microserve.png b/source/assets/images/experience/microserve.png
similarity index 100%
rename from source/images/experience/microserve.png
rename to source/assets/images/experience/microserve.png
diff --git a/source/images/experience/nomensa.png b/source/assets/images/experience/nomensa.png
similarity index 100%
rename from source/images/experience/nomensa.png
rename to source/assets/images/experience/nomensa.png
diff --git a/source/images/experience/precedent.jpg b/source/assets/images/experience/precedent.jpg
similarity index 100%
rename from source/images/experience/precedent.jpg
rename to source/assets/images/experience/precedent.jpg
diff --git a/source/images/experience/proctors.jpg b/source/assets/images/experience/proctors.jpg
similarity index 100%
rename from source/images/experience/proctors.jpg
rename to source/assets/images/experience/proctors.jpg
diff --git a/source/images/projects/accessible-bristol.png b/source/assets/images/projects/accessible-bristol.png
similarity index 100%
rename from source/images/projects/accessible-bristol.png
rename to source/assets/images/projects/accessible-bristol.png
diff --git a/source/images/projects/aspira.png b/source/assets/images/projects/aspira.png
similarity index 100%
rename from source/images/projects/aspira.png
rename to source/assets/images/projects/aspira.png
diff --git a/source/images/projects/avon-motorsport.png b/source/assets/images/projects/avon-motorsport.png
similarity index 100%
rename from source/images/projects/avon-motorsport.png
rename to source/assets/images/projects/avon-motorsport.png
diff --git a/source/images/projects/cattery.png b/source/assets/images/projects/cattery.png
similarity index 100%
rename from source/images/projects/cattery.png
rename to source/assets/images/projects/cattery.png
diff --git a/source/images/projects/daylight-photo-awards.png b/source/assets/images/projects/daylight-photo-awards.png
similarity index 100%
rename from source/images/projects/daylight-photo-awards.png
rename to source/assets/images/projects/daylight-photo-awards.png
diff --git a/source/images/projects/digital-theatre-plus.png b/source/assets/images/projects/digital-theatre-plus.png
similarity index 100%
rename from source/images/projects/digital-theatre-plus.png
rename to source/assets/images/projects/digital-theatre-plus.png
diff --git a/source/images/projects/door-decor-more.png b/source/assets/images/projects/door-decor-more.png
similarity index 100%
rename from source/images/projects/door-decor-more.png
rename to source/assets/images/projects/door-decor-more.png
diff --git a/source/images/projects/drupalorg.png b/source/assets/images/projects/drupalorg.png
similarity index 100%
rename from source/images/projects/drupalorg.png
rename to source/assets/images/projects/drupalorg.png
diff --git a/source/images/projects/handc.png b/source/assets/images/projects/handc.png
similarity index 100%
rename from source/images/projects/handc.png
rename to source/assets/images/projects/handc.png
diff --git a/source/images/projects/hutch-paving.png b/source/assets/images/projects/hutch-paving.png
similarity index 100%
rename from source/images/projects/hutch-paving.png
rename to source/assets/images/projects/hutch-paving.png
diff --git a/source/images/projects/ifoa.png b/source/assets/images/projects/ifoa.png
similarity index 100%
rename from source/images/projects/ifoa.png
rename to source/assets/images/projects/ifoa.png
diff --git a/source/images/projects/mfvc.png b/source/assets/images/projects/mfvc.png
similarity index 100%
rename from source/images/projects/mfvc.png
rename to source/assets/images/projects/mfvc.png
diff --git a/source/images/projects/rathbone-greenbank.png b/source/assets/images/projects/rathbone-greenbank.png
similarity index 100%
rename from source/images/projects/rathbone-greenbank.png
rename to source/assets/images/projects/rathbone-greenbank.png
diff --git a/source/images/projects/roadcc.png b/source/assets/images/projects/roadcc.png
similarity index 100%
rename from source/images/projects/roadcc.png
rename to source/assets/images/projects/roadcc.png
diff --git a/source/images/projects/source-for-searches.png b/source/assets/images/projects/source-for-searches.png
similarity index 100%
rename from source/images/projects/source-for-searches.png
rename to source/assets/images/projects/source-for-searches.png
diff --git a/source/images/projects/vikisports.png b/source/assets/images/projects/vikisports.png
similarity index 100%
rename from source/images/projects/vikisports.png
rename to source/assets/images/projects/vikisports.png
diff --git a/source/images/projects/wattstvc.png b/source/assets/images/projects/wattstvc.png
similarity index 100%
rename from source/images/projects/wattstvc.png
rename to source/assets/images/projects/wattstvc.png
diff --git a/source/images/projects/wlsquared.png b/source/assets/images/projects/wlsquared.png
similarity index 100%
rename from source/images/projects/wlsquared.png
rename to source/assets/images/projects/wlsquared.png
diff --git a/source/images/testimonials/brian-healy.png b/source/assets/images/testimonials/brian-healy.png
similarity index 100%
rename from source/images/testimonials/brian-healy.png
rename to source/assets/images/testimonials/brian-healy.png
diff --git a/source/images/testimonials/chris-jarvis.jpg b/source/assets/images/testimonials/chris-jarvis.jpg
similarity index 100%
rename from source/images/testimonials/chris-jarvis.jpg
rename to source/assets/images/testimonials/chris-jarvis.jpg
diff --git a/source/images/testimonials/ed-welsby.png b/source/assets/images/testimonials/ed-welsby.png
similarity index 100%
rename from source/images/testimonials/ed-welsby.png
rename to source/assets/images/testimonials/ed-welsby.png
diff --git a/source/images/testimonials/holly-ross.png b/source/assets/images/testimonials/holly-ross.png
similarity index 100%
rename from source/images/testimonials/holly-ross.png
rename to source/assets/images/testimonials/holly-ross.png
diff --git a/source/images/testimonials/james-chapman.png b/source/assets/images/testimonials/james-chapman.png
similarity index 100%
rename from source/images/testimonials/james-chapman.png
rename to source/assets/images/testimonials/james-chapman.png
diff --git a/source/images/testimonials/josh-mitchell.png b/source/assets/images/testimonials/josh-mitchell.png
similarity index 100%
rename from source/images/testimonials/josh-mitchell.png
rename to source/assets/images/testimonials/josh-mitchell.png
diff --git a/source/images/testimonials/leonie-watson.jpg b/source/assets/images/testimonials/leonie-watson.jpg
similarity index 100%
rename from source/images/testimonials/leonie-watson.jpg
rename to source/assets/images/testimonials/leonie-watson.jpg
diff --git a/source/experience.html.twig b/source/experience.html.twig
index 7e736d4e..52dd0ecc 100644
--- a/source/experience.html.twig
+++ b/source/experience.html.twig
@@ -5,7 +5,7 @@ nav: experience
 experiences:
     - name: CTI Digital
       webite: https://www.ctidigital.com
-      logo: /images/experience/cti-digital.png
+      logo: cti-digital.png
       role: Lead Drupal Developer
       location: Remote
       start: November 2015
@@ -23,7 +23,7 @@ experiences:
     - name: Microserve
       website: https://microserve.io
       location: Bristol, England
-      logo: /images/experience/microserve.png
+      logo: microserve.png
       role: Senior Drupal Developer
       start: July 2015
       end: November 2015
@@ -33,7 +33,7 @@ experiences:
 
     - name: Drupal Association
       website: https://assoc.drupal.org
-      logo: /images/experience/drupal-association.png
+      logo: drupal-association.png
       role: Drupal.org Developer
       location: Remote
       start: 2014
@@ -45,7 +45,7 @@ experiences:
     - name: Precedent
       website: http://precedent.com
       location: Cardiff, Wales
-      logo: /images/experience/precedent.jpg
+      logo: precedent.jpg
       role: Senior Drupal Developer
       start: 2013
       end: 2014
@@ -55,7 +55,7 @@ experiences:
     - name: Nomensa
       website: http://www.nomensa.com
       location: Bristol, England
-      logo: /images/experience/nomensa.png
+      logo: nomensa.png
       role: 'Contract Drupal Developer / Application Developer & System Administrator'
       start: 2012
       end: 2013
@@ -66,7 +66,7 @@ experiences:
     - name: 'Proctor & Stevenson'
       website: http://www.proctors.co.uk
       location: Bristol, England
-      logo: /images/experience/proctors.jpg
+      logo: proctors.jpg
       role: 'PHP Developer'
       start: 2011
       end: 2012
@@ -76,7 +76,7 @@ experiences:
     - name: 'Horse & Country TV'
       website: http://www.horseandcountry.tv
       location: Cwmbran, Wales
-      logo: /images/experience/horse-and-country.jpg
+      logo: horse-and-country.jpg
       role: Web Developer
       start: 2010
       end: 2011
@@ -92,7 +92,7 @@ experiences:
                 <h2>{{ experience.name }}</h2>
 
                 {% if experience.logo %}
-                    <img class="experience--logo" src="{{ experience.logo }}" alt="{{ experience.name }} logo">
+                    <img class="experience--logo" src="/assets/images/experience/{{ experience.logo }}" alt="{{ experience.name }} logo">
                 {% endif %}
 
                 {% if experience.website %}
diff --git a/source/testimonials.html.twig b/source/testimonials.html.twig
index 8e99ccdf..a25d5bec 100644
--- a/source/testimonials.html.twig
+++ b/source/testimonials.html.twig
@@ -99,7 +99,7 @@ testimonials:
             <h2 class="testimonial__name">{{ testimonial.name }}</h2>
 
             {% if testimonial.image %}
-                <img class="testimonial__image" src="{{ site.url }}/images/testimonials/{{ testimonial.image }}" alt="{{ testimonial.name }}"/>
+                <img class="testimonial__image" src="{{ site.url }}/assets/images/testimonials/{{ testimonial.image }}" alt="{{ testimonial.name }}"/>
             {% endif %}
 
             {% if testimonial.role and company.name is not defined %}