diff --git a/.gitignore b/.gitignore
index eb4d9a4..a004a64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
-/gitea/backups-*.key
-/gitea/report.html
-/gitea/result
-/result
+/machines/gitea/backups-*.key
+/machines/gitea/report.html
 /terraform/.terraform/
 /terraform/terraform.tfvars
+result
diff --git a/gitea/2020.elm-conf.com/about/content.json b/machines/gitea/2020.elm-conf.com/about/content.json
similarity index 100%
rename from gitea/2020.elm-conf.com/about/content.json
rename to machines/gitea/2020.elm-conf.com/about/content.json
diff --git a/gitea/2020.elm-conf.com/about/index.html b/machines/gitea/2020.elm-conf.com/about/index.html
similarity index 100%
rename from gitea/2020.elm-conf.com/about/index.html
rename to machines/gitea/2020.elm-conf.com/about/index.html
diff --git a/gitea/2020.elm-conf.com/accessibility/content.json b/machines/gitea/2020.elm-conf.com/accessibility/content.json
similarity index 100%
rename from gitea/2020.elm-conf.com/accessibility/content.json
rename to machines/gitea/2020.elm-conf.com/accessibility/content.json
diff --git a/gitea/2020.elm-conf.com/accessibility/index.html b/machines/gitea/2020.elm-conf.com/accessibility/index.html
similarity index 100%
rename from gitea/2020.elm-conf.com/accessibility/index.html
rename to machines/gitea/2020.elm-conf.com/accessibility/index.html
diff --git a/gitea/2020.elm-conf.com/assets/android-chrome-144x144.png b/machines/gitea/2020.elm-conf.com/assets/android-chrome-144x144.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/android-chrome-144x144.png
rename to machines/gitea/2020.elm-conf.com/assets/android-chrome-144x144.png
diff --git a/gitea/2020.elm-conf.com/assets/android-chrome-192x192.png b/machines/gitea/2020.elm-conf.com/assets/android-chrome-192x192.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/android-chrome-192x192.png
rename to machines/gitea/2020.elm-conf.com/assets/android-chrome-192x192.png
diff --git a/gitea/2020.elm-conf.com/assets/android-chrome-256x256.png b/machines/gitea/2020.elm-conf.com/assets/android-chrome-256x256.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/android-chrome-256x256.png
rename to machines/gitea/2020.elm-conf.com/assets/android-chrome-256x256.png
diff --git a/gitea/2020.elm-conf.com/assets/android-chrome-36x36.png b/machines/gitea/2020.elm-conf.com/assets/android-chrome-36x36.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/android-chrome-36x36.png
rename to machines/gitea/2020.elm-conf.com/assets/android-chrome-36x36.png
diff --git a/gitea/2020.elm-conf.com/assets/android-chrome-384x384.png b/machines/gitea/2020.elm-conf.com/assets/android-chrome-384x384.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/android-chrome-384x384.png
rename to machines/gitea/2020.elm-conf.com/assets/android-chrome-384x384.png
diff --git a/gitea/2020.elm-conf.com/assets/android-chrome-48x48.png b/machines/gitea/2020.elm-conf.com/assets/android-chrome-48x48.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/android-chrome-48x48.png
rename to machines/gitea/2020.elm-conf.com/assets/android-chrome-48x48.png
diff --git a/gitea/2020.elm-conf.com/assets/android-chrome-512x512.png b/machines/gitea/2020.elm-conf.com/assets/android-chrome-512x512.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/android-chrome-512x512.png
rename to machines/gitea/2020.elm-conf.com/assets/android-chrome-512x512.png
diff --git a/gitea/2020.elm-conf.com/assets/android-chrome-72x72.png b/machines/gitea/2020.elm-conf.com/assets/android-chrome-72x72.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/android-chrome-72x72.png
rename to machines/gitea/2020.elm-conf.com/assets/android-chrome-72x72.png
diff --git a/gitea/2020.elm-conf.com/assets/android-chrome-96x96.png b/machines/gitea/2020.elm-conf.com/assets/android-chrome-96x96.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/android-chrome-96x96.png
rename to machines/gitea/2020.elm-conf.com/assets/android-chrome-96x96.png
diff --git a/gitea/2020.elm-conf.com/assets/apple-touch-icon-1024x1024.png b/machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-1024x1024.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/apple-touch-icon-1024x1024.png
rename to machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-1024x1024.png
diff --git a/gitea/2020.elm-conf.com/assets/apple-touch-icon-114x114.png b/machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-114x114.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/apple-touch-icon-114x114.png
rename to machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-114x114.png
diff --git a/gitea/2020.elm-conf.com/assets/apple-touch-icon-120x120.png b/machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-120x120.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/apple-touch-icon-120x120.png
rename to machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-120x120.png
diff --git a/gitea/2020.elm-conf.com/assets/apple-touch-icon-144x144.png b/machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-144x144.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/apple-touch-icon-144x144.png
rename to machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-144x144.png
diff --git a/gitea/2020.elm-conf.com/assets/apple-touch-icon-152x152.png b/machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-152x152.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/apple-touch-icon-152x152.png
rename to machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-152x152.png
diff --git a/gitea/2020.elm-conf.com/assets/apple-touch-icon-167x167.png b/machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-167x167.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/apple-touch-icon-167x167.png
rename to machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-167x167.png
diff --git a/gitea/2020.elm-conf.com/assets/apple-touch-icon-180x180.png b/machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-180x180.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/apple-touch-icon-180x180.png
rename to machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-180x180.png
diff --git a/gitea/2020.elm-conf.com/assets/apple-touch-icon-57x57.png b/machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-57x57.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/apple-touch-icon-57x57.png
rename to machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-57x57.png
diff --git a/gitea/2020.elm-conf.com/assets/apple-touch-icon-60x60.png b/machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-60x60.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/apple-touch-icon-60x60.png
rename to machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-60x60.png
diff --git a/gitea/2020.elm-conf.com/assets/apple-touch-icon-72x72.png b/machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-72x72.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/apple-touch-icon-72x72.png
rename to machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-72x72.png
diff --git a/gitea/2020.elm-conf.com/assets/apple-touch-icon-76x76.png b/machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-76x76.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/apple-touch-icon-76x76.png
rename to machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-76x76.png
diff --git a/gitea/2020.elm-conf.com/assets/apple-touch-icon-precomposed.png b/machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-precomposed.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/apple-touch-icon-precomposed.png
rename to machines/gitea/2020.elm-conf.com/assets/apple-touch-icon-precomposed.png
diff --git a/gitea/2020.elm-conf.com/assets/apple-touch-icon.png b/machines/gitea/2020.elm-conf.com/assets/apple-touch-icon.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/apple-touch-icon.png
rename to machines/gitea/2020.elm-conf.com/assets/apple-touch-icon.png
diff --git a/gitea/2020.elm-conf.com/assets/favicon-16x16.png b/machines/gitea/2020.elm-conf.com/assets/favicon-16x16.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/favicon-16x16.png
rename to machines/gitea/2020.elm-conf.com/assets/favicon-16x16.png
diff --git a/gitea/2020.elm-conf.com/assets/favicon-32x32.png b/machines/gitea/2020.elm-conf.com/assets/favicon-32x32.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/favicon-32x32.png
rename to machines/gitea/2020.elm-conf.com/assets/favicon-32x32.png
diff --git a/gitea/2020.elm-conf.com/assets/favicon-48x48.png b/machines/gitea/2020.elm-conf.com/assets/favicon-48x48.png
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/favicon-48x48.png
rename to machines/gitea/2020.elm-conf.com/assets/favicon-48x48.png
diff --git a/gitea/2020.elm-conf.com/assets/favicon.ico b/machines/gitea/2020.elm-conf.com/assets/favicon.ico
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/favicon.ico
rename to machines/gitea/2020.elm-conf.com/assets/favicon.ico
diff --git a/gitea/2020.elm-conf.com/assets/manifest.json b/machines/gitea/2020.elm-conf.com/assets/manifest.json
similarity index 100%
rename from gitea/2020.elm-conf.com/assets/manifest.json
rename to machines/gitea/2020.elm-conf.com/assets/manifest.json
diff --git a/gitea/2020.elm-conf.com/code-of-conduct/content.json b/machines/gitea/2020.elm-conf.com/code-of-conduct/content.json
similarity index 100%
rename from gitea/2020.elm-conf.com/code-of-conduct/content.json
rename to machines/gitea/2020.elm-conf.com/code-of-conduct/content.json
diff --git a/gitea/2020.elm-conf.com/code-of-conduct/index.html b/machines/gitea/2020.elm-conf.com/code-of-conduct/index.html
similarity index 100%
rename from gitea/2020.elm-conf.com/code-of-conduct/index.html
rename to machines/gitea/2020.elm-conf.com/code-of-conduct/index.html
diff --git a/gitea/2020.elm-conf.com/content.json b/machines/gitea/2020.elm-conf.com/content.json
similarity index 100%
rename from gitea/2020.elm-conf.com/content.json
rename to machines/gitea/2020.elm-conf.com/content.json
diff --git a/gitea/2020.elm-conf.com/fonts/OpenSans-Bold.woff2 b/machines/gitea/2020.elm-conf.com/fonts/OpenSans-Bold.woff2
similarity index 100%
rename from gitea/2020.elm-conf.com/fonts/OpenSans-Bold.woff2
rename to machines/gitea/2020.elm-conf.com/fonts/OpenSans-Bold.woff2
diff --git a/gitea/2020.elm-conf.com/fonts/OpenSans-BoldItalic.woff2 b/machines/gitea/2020.elm-conf.com/fonts/OpenSans-BoldItalic.woff2
similarity index 100%
rename from gitea/2020.elm-conf.com/fonts/OpenSans-BoldItalic.woff2
rename to machines/gitea/2020.elm-conf.com/fonts/OpenSans-BoldItalic.woff2
diff --git a/gitea/2020.elm-conf.com/fonts/OpenSans-Italic.woff2 b/machines/gitea/2020.elm-conf.com/fonts/OpenSans-Italic.woff2
similarity index 100%
rename from gitea/2020.elm-conf.com/fonts/OpenSans-Italic.woff2
rename to machines/gitea/2020.elm-conf.com/fonts/OpenSans-Italic.woff2
diff --git a/gitea/2020.elm-conf.com/fonts/OpenSans.woff2 b/machines/gitea/2020.elm-conf.com/fonts/OpenSans.woff2
similarity index 100%
rename from gitea/2020.elm-conf.com/fonts/OpenSans.woff2
rename to machines/gitea/2020.elm-conf.com/fonts/OpenSans.woff2
diff --git a/gitea/2020.elm-conf.com/fonts/Oswald-Light.woff2 b/machines/gitea/2020.elm-conf.com/fonts/Oswald-Light.woff2
similarity index 100%
rename from gitea/2020.elm-conf.com/fonts/Oswald-Light.woff2
rename to machines/gitea/2020.elm-conf.com/fonts/Oswald-Light.woff2
diff --git a/gitea/2020.elm-conf.com/fonts/Oswald-Regular.woff2 b/machines/gitea/2020.elm-conf.com/fonts/Oswald-Regular.woff2
similarity index 100%
rename from gitea/2020.elm-conf.com/fonts/Oswald-Regular.woff2
rename to machines/gitea/2020.elm-conf.com/fonts/Oswald-Regular.woff2
diff --git a/gitea/2020.elm-conf.com/images/icon.png b/machines/gitea/2020.elm-conf.com/images/icon.png
similarity index 100%
rename from gitea/2020.elm-conf.com/images/icon.png
rename to machines/gitea/2020.elm-conf.com/images/icon.png
diff --git a/gitea/2020.elm-conf.com/images/light/background.svg b/machines/gitea/2020.elm-conf.com/images/light/background.svg
similarity index 100%
rename from gitea/2020.elm-conf.com/images/light/background.svg
rename to machines/gitea/2020.elm-conf.com/images/light/background.svg
diff --git a/gitea/2020.elm-conf.com/images/light/homepage-background.svg b/machines/gitea/2020.elm-conf.com/images/light/homepage-background.svg
similarity index 100%
rename from gitea/2020.elm-conf.com/images/light/homepage-background.svg
rename to machines/gitea/2020.elm-conf.com/images/light/homepage-background.svg
diff --git a/gitea/2020.elm-conf.com/images/light/logo.svg b/machines/gitea/2020.elm-conf.com/images/light/logo.svg
similarity index 100%
rename from gitea/2020.elm-conf.com/images/light/logo.svg
rename to machines/gitea/2020.elm-conf.com/images/light/logo.svg
diff --git a/gitea/2020.elm-conf.com/images/sponsors/brilliant.svg b/machines/gitea/2020.elm-conf.com/images/sponsors/brilliant.svg
similarity index 100%
rename from gitea/2020.elm-conf.com/images/sponsors/brilliant.svg
rename to machines/gitea/2020.elm-conf.com/images/sponsors/brilliant.svg
diff --git a/gitea/2020.elm-conf.com/images/sponsors/manning.png b/machines/gitea/2020.elm-conf.com/images/sponsors/manning.png
similarity index 100%
rename from gitea/2020.elm-conf.com/images/sponsors/manning.png
rename to machines/gitea/2020.elm-conf.com/images/sponsors/manning.png
diff --git a/gitea/2020.elm-conf.com/index.html b/machines/gitea/2020.elm-conf.com/index.html
similarity index 100%
rename from gitea/2020.elm-conf.com/index.html
rename to machines/gitea/2020.elm-conf.com/index.html
diff --git a/gitea/2020.elm-conf.com/main.js b/machines/gitea/2020.elm-conf.com/main.js
similarity index 100%
rename from gitea/2020.elm-conf.com/main.js
rename to machines/gitea/2020.elm-conf.com/main.js
diff --git a/gitea/2020.elm-conf.com/precache-manifest.870d42406272213b6d5be017dabe759a.js b/machines/gitea/2020.elm-conf.com/precache-manifest.870d42406272213b6d5be017dabe759a.js
similarity index 100%
rename from gitea/2020.elm-conf.com/precache-manifest.870d42406272213b6d5be017dabe759a.js
rename to machines/gitea/2020.elm-conf.com/precache-manifest.870d42406272213b6d5be017dabe759a.js
diff --git a/gitea/2020.elm-conf.com/register/content.json b/machines/gitea/2020.elm-conf.com/register/content.json
similarity index 100%
rename from gitea/2020.elm-conf.com/register/content.json
rename to machines/gitea/2020.elm-conf.com/register/content.json
diff --git a/gitea/2020.elm-conf.com/register/index.html b/machines/gitea/2020.elm-conf.com/register/index.html
similarity index 100%
rename from gitea/2020.elm-conf.com/register/index.html
rename to machines/gitea/2020.elm-conf.com/register/index.html
diff --git a/gitea/2020.elm-conf.com/service-worker.js b/machines/gitea/2020.elm-conf.com/service-worker.js
similarity index 100%
rename from gitea/2020.elm-conf.com/service-worker.js
rename to machines/gitea/2020.elm-conf.com/service-worker.js
diff --git a/gitea/2020.elm-conf.com/sponsors/content.json b/machines/gitea/2020.elm-conf.com/sponsors/content.json
similarity index 100%
rename from gitea/2020.elm-conf.com/sponsors/content.json
rename to machines/gitea/2020.elm-conf.com/sponsors/content.json
diff --git a/gitea/2020.elm-conf.com/sponsors/index.html b/machines/gitea/2020.elm-conf.com/sponsors/index.html
similarity index 100%
rename from gitea/2020.elm-conf.com/sponsors/index.html
rename to machines/gitea/2020.elm-conf.com/sponsors/index.html
diff --git a/gitea/2020.elm-conf.com/sponsors/prospectus/content.json b/machines/gitea/2020.elm-conf.com/sponsors/prospectus/content.json
similarity index 100%
rename from gitea/2020.elm-conf.com/sponsors/prospectus/content.json
rename to machines/gitea/2020.elm-conf.com/sponsors/prospectus/content.json
diff --git a/gitea/2020.elm-conf.com/sponsors/prospectus/index.html b/machines/gitea/2020.elm-conf.com/sponsors/prospectus/index.html
similarity index 100%
rename from gitea/2020.elm-conf.com/sponsors/prospectus/index.html
rename to machines/gitea/2020.elm-conf.com/sponsors/prospectus/index.html
diff --git a/gitea/2020.elm-conf.com/submit/open-space/content.json b/machines/gitea/2020.elm-conf.com/submit/open-space/content.json
similarity index 100%
rename from gitea/2020.elm-conf.com/submit/open-space/content.json
rename to machines/gitea/2020.elm-conf.com/submit/open-space/content.json
diff --git a/gitea/2020.elm-conf.com/submit/open-space/index.html b/machines/gitea/2020.elm-conf.com/submit/open-space/index.html
similarity index 100%
rename from gitea/2020.elm-conf.com/submit/open-space/index.html
rename to machines/gitea/2020.elm-conf.com/submit/open-space/index.html
diff --git a/gitea/2020.elm-conf.com/submit/talk/content.json b/machines/gitea/2020.elm-conf.com/submit/talk/content.json
similarity index 100%
rename from gitea/2020.elm-conf.com/submit/talk/content.json
rename to machines/gitea/2020.elm-conf.com/submit/talk/content.json
diff --git a/gitea/2020.elm-conf.com/submit/talk/index.html b/machines/gitea/2020.elm-conf.com/submit/talk/index.html
similarity index 100%
rename from gitea/2020.elm-conf.com/submit/talk/index.html
rename to machines/gitea/2020.elm-conf.com/submit/talk/index.html
diff --git a/gitea/2020.elm-conf.com/submit/workshop/content.json b/machines/gitea/2020.elm-conf.com/submit/workshop/content.json
similarity index 100%
rename from gitea/2020.elm-conf.com/submit/workshop/content.json
rename to machines/gitea/2020.elm-conf.com/submit/workshop/content.json
diff --git a/gitea/2020.elm-conf.com/submit/workshop/index.html b/machines/gitea/2020.elm-conf.com/submit/workshop/index.html
similarity index 100%
rename from gitea/2020.elm-conf.com/submit/workshop/index.html
rename to machines/gitea/2020.elm-conf.com/submit/workshop/index.html
diff --git a/gitea/README.md b/machines/gitea/README.md
similarity index 100%
rename from gitea/README.md
rename to machines/gitea/README.md
diff --git a/gitea/backups.key b/machines/gitea/backups.key
similarity index 100%
rename from gitea/backups.key
rename to machines/gitea/backups.key
diff --git a/gitea/collect-garbage.sh b/machines/gitea/collect-garbage.sh
similarity index 100%
rename from gitea/collect-garbage.sh
rename to machines/gitea/collect-garbage.sh
diff --git a/gitea/configuration.nix b/machines/gitea/configuration.nix
similarity index 100%
rename from gitea/configuration.nix
rename to machines/gitea/configuration.nix
diff --git a/gitea/default.nix b/machines/gitea/default.nix
similarity index 100%
rename from gitea/default.nix
rename to machines/gitea/default.nix
diff --git a/gitea/deploy.sh b/machines/gitea/deploy.sh
similarity index 100%
rename from gitea/deploy.sh
rename to machines/gitea/deploy.sh
diff --git a/gitea/hardware-configuration.nix b/machines/gitea/hardware-configuration.nix
similarity index 100%
rename from gitea/hardware-configuration.nix
rename to machines/gitea/hardware-configuration.nix
diff --git a/gitea/networking.nix b/machines/gitea/networking.nix
similarity index 100%
rename from gitea/networking.nix
rename to machines/gitea/networking.nix
diff --git a/gitea/traffic.sh b/machines/gitea/traffic.sh
similarity index 100%
rename from gitea/traffic.sh
rename to machines/gitea/traffic.sh