diff --git a/.gitignore b/.gitignore
index b0e6896dbe..7a14244929 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,5 +33,8 @@ _output
/site/static/svelte-app.json
/site/static/contributors.jpg
/site/static/workers
+/site/static/organisations
/site/scripts/svelte-app
+/site/scripts/community
/site/src/routes/_contributors.js
+/site/src/routes/_components/WhosUsingSvelte.svelte
diff --git a/site/package.json b/site/package.json
index d841808a2a..a94d264217 100644
--- a/site/package.json
+++ b/site/package.json
@@ -7,7 +7,7 @@
"copy-workers": "rm -rf static/workers && cp -r node_modules/@sveltejs/svelte-repl/workers static",
"migrate": "node-pg-migrate -r dotenv/config",
"sapper": "npm run copy-workers && sapper build --legacy",
- "update": "node scripts/update_template.js && node scripts/get-contributors.js",
+ "update": "node scripts/update_template.js && node scripts/get-contributors.js && node scripts/update_whos_using.js",
"start": "node __sapper__/build",
"test": "mocha -r esm test/**",
"deploy": "make deploy"
diff --git a/site/scripts/update_whos_using.js b/site/scripts/update_whos_using.js
new file mode 100644
index 0000000000..131a162359
--- /dev/null
+++ b/site/scripts/update_whos_using.js
@@ -0,0 +1,12 @@
+const sh = require('shelljs');
+
+sh.cd(__dirname + '/../');
+
+// fetch community repo
+sh.rm('-rf','scripts/community');
+sh.exec('npx degit sveltejs/community scripts/community');
+
+// copy over relevant files
+sh.cp('scripts/community/whos-using-svelte/WhosUsingSvelte.svelte', 'src/routes/_components/WhosUsingSvelte.svelte');
+sh.rm('-rf', 'static/organisations');
+sh.cp('-r', 'scripts/community/whos-using-svelte/organisations', 'static');
diff --git a/site/src/routes/_components/WhosUsingSvelte.svelte b/site/src/routes/_components/WhosUsingSvelte.svelte
deleted file mode 100644
index 5ae17ef7bc..0000000000
--- a/site/src/routes/_components/WhosUsingSvelte.svelte
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-
diff --git a/site/static/organisations/absoluteweb.svg b/site/static/organisations/absoluteweb.svg
deleted file mode 100644
index e2aeb9421e..0000000000
--- a/site/static/organisations/absoluteweb.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/bekchy.png b/site/static/organisations/bekchy.png
deleted file mode 100644
index 011553cb42..0000000000
Binary files a/site/static/organisations/bekchy.png and /dev/null differ
diff --git a/site/static/organisations/beyonk.svg b/site/static/organisations/beyonk.svg
deleted file mode 100644
index 57d15142a8..0000000000
--- a/site/static/organisations/beyonk.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/buydotstar.svg b/site/static/organisations/buydotstar.svg
deleted file mode 100644
index da0e5c9211..0000000000
--- a/site/static/organisations/buydotstar.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
diff --git a/site/static/organisations/cashfree.svg b/site/static/organisations/cashfree.svg
deleted file mode 100644
index d0952dd71c..0000000000
--- a/site/static/organisations/cashfree.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/chess.svg b/site/static/organisations/chess.svg
deleted file mode 100644
index 752954f6e8..0000000000
--- a/site/static/organisations/chess.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/comigo.svg b/site/static/organisations/comigo.svg
deleted file mode 100644
index 44622a5195..0000000000
--- a/site/static/organisations/comigo.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/datawrapper.svg b/site/static/organisations/datawrapper.svg
deleted file mode 100644
index f614df0eee..0000000000
--- a/site/static/organisations/datawrapper.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/dbnomics.jpg b/site/static/organisations/dbnomics.jpg
deleted file mode 100644
index 3d5991f869..0000000000
Binary files a/site/static/organisations/dbnomics.jpg and /dev/null differ
diff --git a/site/static/organisations/dbnomics.webp b/site/static/organisations/dbnomics.webp
deleted file mode 100644
index 14f3431bba..0000000000
Binary files a/site/static/organisations/dbnomics.webp and /dev/null differ
diff --git a/site/static/organisations/deck.svg b/site/static/organisations/deck.svg
deleted file mode 100644
index 21291ddfe9..0000000000
--- a/site/static/organisations/deck.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/dextra.png b/site/static/organisations/dextra.png
deleted file mode 100644
index 725f9bd511..0000000000
Binary files a/site/static/organisations/dextra.png and /dev/null differ
diff --git a/site/static/organisations/entriwise.png b/site/static/organisations/entriwise.png
deleted file mode 100644
index be305e1300..0000000000
Binary files a/site/static/organisations/entriwise.png and /dev/null differ
diff --git a/site/static/organisations/entur.svg b/site/static/organisations/entur.svg
deleted file mode 100644
index 98bb5cc937..0000000000
--- a/site/static/organisations/entur.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/from-now-on.png b/site/static/organisations/from-now-on.png
deleted file mode 100644
index 7da931dc34..0000000000
Binary files a/site/static/organisations/from-now-on.png and /dev/null differ
diff --git a/site/static/organisations/fusioncharts.svg b/site/static/organisations/fusioncharts.svg
deleted file mode 100644
index 6712115de8..0000000000
--- a/site/static/organisations/fusioncharts.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
\ No newline at end of file
diff --git a/site/static/organisations/godaddy.svg b/site/static/organisations/godaddy.svg
deleted file mode 100644
index e753ceed7b..0000000000
--- a/site/static/organisations/godaddy.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/grainger.svg b/site/static/organisations/grainger.svg
deleted file mode 100644
index af10fc52fe..0000000000
--- a/site/static/organisations/grainger.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/site/static/organisations/healthtree.png b/site/static/organisations/healthtree.png
deleted file mode 100644
index ec3f219d1c..0000000000
Binary files a/site/static/organisations/healthtree.png and /dev/null differ
diff --git a/site/static/organisations/iota.svg b/site/static/organisations/iota.svg
deleted file mode 100644
index 1ab864a958..0000000000
--- a/site/static/organisations/iota.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/itslearning.svg b/site/static/organisations/itslearning.svg
deleted file mode 100644
index 1d5fe6fcf4..0000000000
--- a/site/static/organisations/itslearning.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/jacoux.png b/site/static/organisations/jacoux.png
deleted file mode 100644
index 6d3f52017c..0000000000
Binary files a/site/static/organisations/jacoux.png and /dev/null differ
diff --git a/site/static/organisations/jingmnt.png b/site/static/organisations/jingmnt.png
deleted file mode 100644
index 326f5f0bbf..0000000000
Binary files a/site/static/organisations/jingmnt.png and /dev/null differ
diff --git a/site/static/organisations/mentorcv.png b/site/static/organisations/mentorcv.png
deleted file mode 100644
index 17cf95a9ac..0000000000
Binary files a/site/static/organisations/mentorcv.png and /dev/null differ
diff --git a/site/static/organisations/metrovias.svg b/site/static/organisations/metrovias.svg
deleted file mode 100644
index a81394de59..0000000000
--- a/site/static/organisations/metrovias.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/mustlab.png b/site/static/organisations/mustlab.png
deleted file mode 100644
index 4f3a29488b..0000000000
Binary files a/site/static/organisations/mustlab.png and /dev/null differ
diff --git a/site/static/organisations/nesta.svg b/site/static/organisations/nesta.svg
deleted file mode 100644
index 72f53e07b0..0000000000
--- a/site/static/organisations/nesta.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/nonkosi.svg b/site/static/organisations/nonkosi.svg
deleted file mode 100644
index 8639c0ce38..0000000000
--- a/site/static/organisations/nonkosi.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/nyt.svg b/site/static/organisations/nyt.svg
deleted file mode 100644
index 8735e53059..0000000000
--- a/site/static/organisations/nyt.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/nzz.svg b/site/static/organisations/nzz.svg
deleted file mode 100644
index 70f9486263..0000000000
--- a/site/static/organisations/nzz.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/oberonspace.svg b/site/static/organisations/oberonspace.svg
deleted file mode 100644
index 73fd68f8b5..0000000000
--- a/site/static/organisations/oberonspace.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/ofof.png b/site/static/organisations/ofof.png
deleted file mode 100644
index 5ecde9b0fd..0000000000
Binary files a/site/static/organisations/ofof.png and /dev/null differ
diff --git a/site/static/organisations/open-state-foundation.svg b/site/static/organisations/open-state-foundation.svg
deleted file mode 100644
index f8c010e7e2..0000000000
--- a/site/static/organisations/open-state-foundation.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/panascais.svg b/site/static/organisations/panascais.svg
deleted file mode 100644
index cb9e4f3afe..0000000000
--- a/site/static/organisations/panascais.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/site/static/organisations/pankod.svg b/site/static/organisations/pankod.svg
deleted file mode 100644
index 34578a7739..0000000000
--- a/site/static/organisations/pankod.svg
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
\ No newline at end of file
diff --git a/site/static/organisations/paperform.svg b/site/static/organisations/paperform.svg
deleted file mode 100644
index 3ee2540112..0000000000
--- a/site/static/organisations/paperform.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
\ No newline at end of file
diff --git a/site/static/organisations/razorpay.svg b/site/static/organisations/razorpay.svg
deleted file mode 100644
index 829adb319e..0000000000
--- a/site/static/organisations/razorpay.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/socialist-party.svg b/site/static/organisations/socialist-party.svg
deleted file mode 100644
index 9dde31a5c0..0000000000
--- a/site/static/organisations/socialist-party.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/softmus.png b/site/static/organisations/softmus.png
deleted file mode 100644
index 6d0c8af60a..0000000000
Binary files a/site/static/organisations/softmus.png and /dev/null differ
diff --git a/site/static/organisations/sqltribe.svg b/site/static/organisations/sqltribe.svg
deleted file mode 100644
index 2a51dfc0a7..0000000000
--- a/site/static/organisations/sqltribe.svg
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
\ No newline at end of file
diff --git a/site/static/organisations/stone.svg b/site/static/organisations/stone.svg
deleted file mode 100644
index 0401dbb292..0000000000
--- a/site/static/organisations/stone.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/strixcloud.svg b/site/static/organisations/strixcloud.svg
deleted file mode 100644
index 49fe96b061..0000000000
--- a/site/static/organisations/strixcloud.svg
+++ /dev/null
@@ -1,244 +0,0 @@
-
-
diff --git a/site/static/organisations/sucuri.png b/site/static/organisations/sucuri.png
deleted file mode 100644
index a30b161139..0000000000
Binary files a/site/static/organisations/sucuri.png and /dev/null differ
diff --git a/site/static/organisations/thunderdome.svg b/site/static/organisations/thunderdome.svg
deleted file mode 100644
index 0a5d8ee055..0000000000
--- a/site/static/organisations/thunderdome.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/tokopedia.svg b/site/static/organisations/tokopedia.svg
deleted file mode 100644
index d284f05d7b..0000000000
--- a/site/static/organisations/tokopedia.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
diff --git a/site/static/organisations/tsh.svg b/site/static/organisations/tsh.svg
deleted file mode 100644
index 0b0388b500..0000000000
--- a/site/static/organisations/tsh.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/site/static/organisations/webdesq.svg b/site/static/organisations/webdesq.svg
deleted file mode 100644
index c9f0012de0..0000000000
--- a/site/static/organisations/webdesq.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/site/static/organisations/zevvle.svg b/site/static/organisations/zevvle.svg
deleted file mode 100644
index 45a26c7a7c..0000000000
--- a/site/static/organisations/zevvle.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file