diff --git a/source/themes/opdavies/oliverdavies/Gemfile b/Gemfile
similarity index 100%
rename from source/themes/opdavies/oliverdavies/Gemfile
rename to Gemfile
diff --git a/source/themes/opdavies/oliverdavies/Gemfile.lock b/Gemfile.lock
similarity index 100%
rename from source/themes/opdavies/oliverdavies/Gemfile.lock
rename to Gemfile.lock
diff --git a/source/themes/opdavies/oliverdavies/config.rb b/config.rb
similarity index 100%
rename from source/themes/opdavies/oliverdavies/config.rb
rename to config.rb
diff --git a/source/themes/opdavies/oliverdavies/sass/base/_base.scss b/sass/base/_base.scss
similarity index 100%
rename from source/themes/opdavies/oliverdavies/sass/base/_base.scss
rename to sass/base/_base.scss
diff --git a/source/themes/opdavies/oliverdavies/sass/base/_lists.scss b/sass/base/_lists.scss
similarity index 100%
rename from source/themes/opdavies/oliverdavies/sass/base/_lists.scss
rename to sass/base/_lists.scss
diff --git a/source/themes/opdavies/oliverdavies/sass/base/_tables.scss b/sass/base/_tables.scss
similarity index 100%
rename from source/themes/opdavies/oliverdavies/sass/base/_tables.scss
rename to sass/base/_tables.scss
diff --git a/source/themes/opdavies/oliverdavies/sass/components/_about-author.scss b/sass/components/_about-author.scss
similarity index 100%
rename from source/themes/opdavies/oliverdavies/sass/components/_about-author.scss
rename to sass/components/_about-author.scss
diff --git a/source/themes/opdavies/oliverdavies/sass/components/_footer.scss b/sass/components/_footer.scss
similarity index 100%
rename from source/themes/opdavies/oliverdavies/sass/components/_footer.scss
rename to sass/components/_footer.scss
diff --git a/source/themes/opdavies/oliverdavies/sass/components/_latest-posts.scss b/sass/components/_latest-posts.scss
similarity index 100%
rename from source/themes/opdavies/oliverdavies/sass/components/_latest-posts.scss
rename to sass/components/_latest-posts.scss
diff --git a/source/themes/opdavies/oliverdavies/sass/components/_navbar.scss b/sass/components/_navbar.scss
similarity index 100%
rename from source/themes/opdavies/oliverdavies/sass/components/_navbar.scss
rename to sass/components/_navbar.scss
diff --git a/source/themes/opdavies/oliverdavies/sass/components/blocks/_drupalcon-la.scss b/sass/components/blocks/_drupalcon-la.scss
similarity index 100%
rename from source/themes/opdavies/oliverdavies/sass/components/blocks/_drupalcon-la.scss
rename to sass/components/blocks/_drupalcon-la.scss
diff --git a/source/themes/opdavies/oliverdavies/sass/components/blocks/_meetups.scss b/sass/components/blocks/_meetups.scss
similarity index 100%
rename from source/themes/opdavies/oliverdavies/sass/components/blocks/_meetups.scss
rename to sass/components/blocks/_meetups.scss
diff --git a/source/themes/opdavies/oliverdavies/sass/components/pages/_blog-listing.scss b/sass/components/pages/_blog-listing.scss
similarity index 100%
rename from source/themes/opdavies/oliverdavies/sass/components/pages/_blog-listing.scss
rename to sass/components/pages/_blog-listing.scss
diff --git a/source/themes/opdavies/oliverdavies/sass/components/pages/_testimonials.scss b/sass/components/pages/_testimonials.scss
similarity index 100%
rename from source/themes/opdavies/oliverdavies/sass/components/pages/_testimonials.scss
rename to sass/components/pages/_testimonials.scss
diff --git a/source/themes/opdavies/oliverdavies/sass/styles.scss b/sass/styles.scss
similarity index 100%
rename from source/themes/opdavies/oliverdavies/sass/styles.scss
rename to sass/styles.scss
diff --git a/source/themes/opdavies/oliverdavies/sass/variables/_colours.scss b/sass/variables/_colours.scss
similarity index 100%
rename from source/themes/opdavies/oliverdavies/sass/variables/_colours.scss
rename to sass/variables/_colours.scss
diff --git a/source/themes/opdavies/oliverdavies/sass/variables/_typography.scss b/sass/variables/_typography.scss
similarity index 100%
rename from source/themes/opdavies/oliverdavies/sass/variables/_typography.scss
rename to sass/variables/_typography.scss
diff --git a/source/themes/opdavies/oliverdavies/_layouts/default.html.twig b/source/_layouts/default.html.twig
similarity index 100%
rename from source/themes/opdavies/oliverdavies/_layouts/default.html.twig
rename to source/_layouts/default.html.twig
diff --git a/source/themes/opdavies/oliverdavies/_layouts/post.html.twig b/source/_layouts/post.html.twig
similarity index 100%
rename from source/themes/opdavies/oliverdavies/_layouts/post.html.twig
rename to source/_layouts/post.html.twig
diff --git a/source/themes/opdavies/oliverdavies/_layouts/talk.html.twig b/source/_layouts/talk.html.twig
similarity index 100%
rename from source/themes/opdavies/oliverdavies/_layouts/talk.html.twig
rename to source/_layouts/talk.html.twig
diff --git a/source/themes/opdavies/oliverdavies/_partials/availability.html.twig b/source/_partials/availability.html.twig
similarity index 100%
rename from source/themes/opdavies/oliverdavies/_partials/availability.html.twig
rename to source/_partials/availability.html.twig
diff --git a/source/themes/opdavies/oliverdavies/_partials/meetups.html.twig b/source/_partials/meetups.html.twig
similarity index 100%
rename from source/themes/opdavies/oliverdavies/_partials/meetups.html.twig
rename to source/_partials/meetups.html.twig
diff --git a/source/themes/opdavies/oliverdavies/_partials/og.html.twig b/source/_partials/og.html.twig
similarity index 100%
rename from source/themes/opdavies/oliverdavies/_partials/og.html.twig
rename to source/_partials/og.html.twig
diff --git a/source/themes/opdavies/oliverdavies/_partials/post_header.html.twig b/source/_partials/post_header.html.twig
similarity index 100%
rename from source/themes/opdavies/oliverdavies/_partials/post_header.html.twig
rename to source/_partials/post_header.html.twig
diff --git a/source/themes/opdavies/oliverdavies/_partials/speakerdeck.html.twig b/source/_partials/speakerdeck.html.twig
similarity index 100%
rename from source/themes/opdavies/oliverdavies/_partials/speakerdeck.html.twig
rename to source/_partials/speakerdeck.html.twig
diff --git a/source/themes/opdavies/oliverdavies/_partials/talk-listing-item.html.twig b/source/_partials/talk-listing-item.html.twig
similarity index 100%
rename from source/themes/opdavies/oliverdavies/_partials/talk-listing-item.html.twig
rename to source/_partials/talk-listing-item.html.twig
diff --git a/source/themes/opdavies/oliverdavies/_partials/title.twig b/source/_partials/title.twig
similarity index 100%
rename from source/themes/opdavies/oliverdavies/_partials/title.twig
rename to source/_partials/title.twig
diff --git a/source/themes/opdavies/oliverdavies/_partials/tweet.twig b/source/_partials/tweet.twig
similarity index 100%
rename from source/themes/opdavies/oliverdavies/_partials/tweet.twig
rename to source/_partials/tweet.twig
diff --git a/source/themes/opdavies/oliverdavies/css/styles.css b/source/css/styles.css
similarity index 100%
rename from source/themes/opdavies/oliverdavies/css/styles.css
rename to source/css/styles.css