diff --git a/README.md b/README.md
index dd9a7dce6b1534fbd04577e8af437a232c3e6334..17c92d9a8f676b670c5b017cb4c5eab10062b18d 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ variable `SETTINGS_FILENAME` when running the service.
 
 ## Building the web application
 
-For instructions on building the React frontend see `webapp/README.md`.
+For instructions on building the React frontend see `<name>-webapp/README.md`.
 
 ## Running this module
 
diff --git a/webapp/.babelrc b/compendium-frontend/.babelrc
similarity index 100%
rename from webapp/.babelrc
rename to compendium-frontend/.babelrc
diff --git a/webapp/.eslintignore b/compendium-frontend/.eslintignore
similarity index 100%
rename from webapp/.eslintignore
rename to compendium-frontend/.eslintignore
diff --git a/webapp/.eslintrc.json b/compendium-frontend/.eslintrc.json
similarity index 100%
rename from webapp/.eslintrc.json
rename to compendium-frontend/.eslintrc.json
diff --git a/webapp/README.md b/compendium-frontend/README.md
similarity index 100%
rename from webapp/README.md
rename to compendium-frontend/README.md
diff --git a/webapp/package-lock.json b/compendium-frontend/package-lock.json
similarity index 100%
rename from webapp/package-lock.json
rename to compendium-frontend/package-lock.json
diff --git a/webapp/package.json b/compendium-frontend/package.json
similarity index 100%
rename from webapp/package.json
rename to compendium-frontend/package.json
diff --git a/webapp/src/App.tsx b/compendium-frontend/src/App.tsx
similarity index 100%
rename from webapp/src/App.tsx
rename to compendium-frontend/src/App.tsx
diff --git a/webapp/src/Schema.tsx b/compendium-frontend/src/Schema.tsx
similarity index 100%
rename from webapp/src/Schema.tsx
rename to compendium-frontend/src/Schema.tsx
diff --git a/webapp/src/components/CollapsibleBox.tsx b/compendium-frontend/src/components/CollapsibleBox.tsx
similarity index 100%
rename from webapp/src/components/CollapsibleBox.tsx
rename to compendium-frontend/src/components/CollapsibleBox.tsx
diff --git a/webapp/src/components/ColorBadge.tsx b/compendium-frontend/src/components/ColorBadge.tsx
similarity index 100%
rename from webapp/src/components/ColorBadge.tsx
rename to compendium-frontend/src/components/ColorBadge.tsx
diff --git a/webapp/src/components/ColorPill.tsx b/compendium-frontend/src/components/ColorPill.tsx
similarity index 100%
rename from webapp/src/components/ColorPill.tsx
rename to compendium-frontend/src/components/ColorPill.tsx
diff --git a/webapp/src/components/DataPage.tsx b/compendium-frontend/src/components/DataPage.tsx
similarity index 100%
rename from webapp/src/components/DataPage.tsx
rename to compendium-frontend/src/components/DataPage.tsx
diff --git a/webapp/src/components/OrganizationSidebar.tsx b/compendium-frontend/src/components/OrganizationSidebar.tsx
similarity index 100%
rename from webapp/src/components/OrganizationSidebar.tsx
rename to compendium-frontend/src/components/OrganizationSidebar.tsx
diff --git a/webapp/src/components/PolicySidebar.tsx b/compendium-frontend/src/components/PolicySidebar.tsx
similarity index 100%
rename from webapp/src/components/PolicySidebar.tsx
rename to compendium-frontend/src/components/PolicySidebar.tsx
diff --git a/webapp/src/components/SectionNavigation.tsx b/compendium-frontend/src/components/SectionNavigation.tsx
similarity index 100%
rename from webapp/src/components/SectionNavigation.tsx
rename to compendium-frontend/src/components/SectionNavigation.tsx
diff --git a/webapp/src/components/SideBar.tsx b/compendium-frontend/src/components/SideBar.tsx
similarity index 100%
rename from webapp/src/components/SideBar.tsx
rename to compendium-frontend/src/components/SideBar.tsx
diff --git a/webapp/src/components/WithLegend.tsx b/compendium-frontend/src/components/WithLegend.tsx
similarity index 100%
rename from webapp/src/components/WithLegend.tsx
rename to compendium-frontend/src/components/WithLegend.tsx
diff --git a/webapp/src/components/global/Banner.tsx b/compendium-frontend/src/components/global/Banner.tsx
similarity index 100%
rename from webapp/src/components/global/Banner.tsx
rename to compendium-frontend/src/components/global/Banner.tsx
diff --git a/webapp/src/components/global/ExternalPageNavBar.tsx b/compendium-frontend/src/components/global/ExternalPageNavBar.tsx
similarity index 100%
rename from webapp/src/components/global/ExternalPageNavBar.tsx
rename to compendium-frontend/src/components/global/ExternalPageNavBar.tsx
diff --git a/webapp/src/components/global/GeantFooter.tsx b/compendium-frontend/src/components/global/GeantFooter.tsx
similarity index 100%
rename from webapp/src/components/global/GeantFooter.tsx
rename to compendium-frontend/src/components/global/GeantFooter.tsx
diff --git a/webapp/src/components/global/PageHeader.tsx b/compendium-frontend/src/components/global/PageHeader.tsx
similarity index 100%
rename from webapp/src/components/global/PageHeader.tsx
rename to compendium-frontend/src/components/global/PageHeader.tsx
diff --git a/webapp/src/components/global/SectionLink.tsx b/compendium-frontend/src/components/global/SectionLink.tsx
similarity index 100%
rename from webapp/src/components/global/SectionLink.tsx
rename to compendium-frontend/src/components/global/SectionLink.tsx
diff --git a/webapp/src/components/graphing/BarGraph.tsx b/compendium-frontend/src/components/graphing/BarGraph.tsx
similarity index 100%
rename from webapp/src/components/graphing/BarGraph.tsx
rename to compendium-frontend/src/components/graphing/BarGraph.tsx
diff --git a/webapp/src/components/graphing/Filter.tsx b/compendium-frontend/src/components/graphing/Filter.tsx
similarity index 100%
rename from webapp/src/components/graphing/Filter.tsx
rename to compendium-frontend/src/components/graphing/Filter.tsx
diff --git a/webapp/src/components/graphing/LineGraph.tsx b/compendium-frontend/src/components/graphing/LineGraph.tsx
similarity index 100%
rename from webapp/src/components/graphing/LineGraph.tsx
rename to compendium-frontend/src/components/graphing/LineGraph.tsx
diff --git a/webapp/src/helpers/SidebarProvider.tsx b/compendium-frontend/src/helpers/SidebarProvider.tsx
similarity index 100%
rename from webapp/src/helpers/SidebarProvider.tsx
rename to compendium-frontend/src/helpers/SidebarProvider.tsx
diff --git a/webapp/src/helpers/constants.ts b/compendium-frontend/src/helpers/constants.ts
similarity index 100%
rename from webapp/src/helpers/constants.ts
rename to compendium-frontend/src/helpers/constants.ts
diff --git a/webapp/src/helpers/dataconversion.tsx b/compendium-frontend/src/helpers/dataconversion.tsx
similarity index 100%
rename from webapp/src/helpers/dataconversion.tsx
rename to compendium-frontend/src/helpers/dataconversion.tsx
diff --git a/webapp/src/images/compendium_header.png b/compendium-frontend/src/images/compendium_header.png
similarity index 100%
rename from webapp/src/images/compendium_header.png
rename to compendium-frontend/src/images/compendium_header.png
diff --git a/webapp/src/images/eu_flag.png b/compendium-frontend/src/images/eu_flag.png
similarity index 100%
rename from webapp/src/images/eu_flag.png
rename to compendium-frontend/src/images/eu_flag.png
diff --git a/webapp/src/images/eu_logo.png b/compendium-frontend/src/images/eu_logo.png
similarity index 100%
rename from webapp/src/images/eu_logo.png
rename to compendium-frontend/src/images/eu_logo.png
diff --git a/webapp/src/images/geant_logo_colored.svg b/compendium-frontend/src/images/geant_logo_colored.svg
similarity index 100%
rename from webapp/src/images/geant_logo_colored.svg
rename to compendium-frontend/src/images/geant_logo_colored.svg
diff --git a/webapp/src/images/geant_logo_f2020_new.svg b/compendium-frontend/src/images/geant_logo_f2020_new.svg
similarity index 100%
rename from webapp/src/images/geant_logo_f2020_new.svg
rename to compendium-frontend/src/images/geant_logo_f2020_new.svg
diff --git a/webapp/src/images/home_data_icon.svg b/compendium-frontend/src/images/home_data_icon.svg
similarity index 100%
rename from webapp/src/images/home_data_icon.svg
rename to compendium-frontend/src/images/home_data_icon.svg
diff --git a/webapp/src/images/home_reports_icon.svg b/compendium-frontend/src/images/home_reports_icon.svg
similarity index 100%
rename from webapp/src/images/home_reports_icon.svg
rename to compendium-frontend/src/images/home_reports_icon.svg
diff --git a/webapp/src/index.tsx b/compendium-frontend/src/index.tsx
similarity index 100%
rename from webapp/src/index.tsx
rename to compendium-frontend/src/index.tsx
diff --git a/webapp/src/main.scss b/compendium-frontend/src/main.scss
similarity index 100%
rename from webapp/src/main.scss
rename to compendium-frontend/src/main.scss
diff --git a/webapp/src/pages/Budget.tsx b/compendium-frontend/src/pages/Budget.tsx
similarity index 100%
rename from webapp/src/pages/Budget.tsx
rename to compendium-frontend/src/pages/Budget.tsx
diff --git a/webapp/src/pages/ChargingStructure.tsx b/compendium-frontend/src/pages/ChargingStructure.tsx
similarity index 100%
rename from webapp/src/pages/ChargingStructure.tsx
rename to compendium-frontend/src/pages/ChargingStructure.tsx
diff --git a/webapp/src/pages/CompendiumData.tsx b/compendium-frontend/src/pages/CompendiumData.tsx
similarity index 100%
rename from webapp/src/pages/CompendiumData.tsx
rename to compendium-frontend/src/pages/CompendiumData.tsx
diff --git a/webapp/src/pages/ECProjects.tsx b/compendium-frontend/src/pages/ECProjects.tsx
similarity index 100%
rename from webapp/src/pages/ECProjects.tsx
rename to compendium-frontend/src/pages/ECProjects.tsx
diff --git a/webapp/src/pages/FundingSource.tsx b/compendium-frontend/src/pages/FundingSource.tsx
similarity index 100%
rename from webapp/src/pages/FundingSource.tsx
rename to compendium-frontend/src/pages/FundingSource.tsx
diff --git a/webapp/src/pages/Landing.tsx b/compendium-frontend/src/pages/Landing.tsx
similarity index 100%
rename from webapp/src/pages/Landing.tsx
rename to compendium-frontend/src/pages/Landing.tsx
diff --git a/webapp/src/pages/ParentOrganisation.tsx b/compendium-frontend/src/pages/ParentOrganisation.tsx
similarity index 100%
rename from webapp/src/pages/ParentOrganisation.tsx
rename to compendium-frontend/src/pages/ParentOrganisation.tsx
diff --git a/webapp/src/pages/Policy.tsx b/compendium-frontend/src/pages/Policy.tsx
similarity index 100%
rename from webapp/src/pages/Policy.tsx
rename to compendium-frontend/src/pages/Policy.tsx
diff --git a/webapp/src/pages/StaffGraph.tsx b/compendium-frontend/src/pages/StaffGraph.tsx
similarity index 100%
rename from webapp/src/pages/StaffGraph.tsx
rename to compendium-frontend/src/pages/StaffGraph.tsx
diff --git a/webapp/src/pages/SubOrganisation.tsx b/compendium-frontend/src/pages/SubOrganisation.tsx
similarity index 100%
rename from webapp/src/pages/SubOrganisation.tsx
rename to compendium-frontend/src/pages/SubOrganisation.tsx
diff --git a/webapp/src/plugins/HTMLLegendPlugin.ts b/compendium-frontend/src/plugins/HTMLLegendPlugin.ts
similarity index 100%
rename from webapp/src/plugins/HTMLLegendPlugin.ts
rename to compendium-frontend/src/plugins/HTMLLegendPlugin.ts
diff --git a/webapp/src/scss/abstracts/_variables.scss b/compendium-frontend/src/scss/abstracts/_variables.scss
similarity index 100%
rename from webapp/src/scss/abstracts/_variables.scss
rename to compendium-frontend/src/scss/abstracts/_variables.scss
diff --git a/webapp/src/scss/base/_text.scss b/compendium-frontend/src/scss/base/_text.scss
similarity index 100%
rename from webapp/src/scss/base/_text.scss
rename to compendium-frontend/src/scss/base/_text.scss
diff --git a/webapp/src/scss/fonts.scss b/compendium-frontend/src/scss/fonts.scss
similarity index 100%
rename from webapp/src/scss/fonts.scss
rename to compendium-frontend/src/scss/fonts.scss
diff --git a/webapp/src/scss/layout/SectionNavigation.scss b/compendium-frontend/src/scss/layout/SectionNavigation.scss
similarity index 100%
rename from webapp/src/scss/layout/SectionNavigation.scss
rename to compendium-frontend/src/scss/layout/SectionNavigation.scss
diff --git a/webapp/src/scss/layout/Sidebar.scss b/compendium-frontend/src/scss/layout/Sidebar.scss
similarity index 100%
rename from webapp/src/scss/layout/Sidebar.scss
rename to compendium-frontend/src/scss/layout/Sidebar.scss
diff --git a/webapp/src/scss/layout/_components.scss b/compendium-frontend/src/scss/layout/_components.scss
similarity index 100%
rename from webapp/src/scss/layout/_components.scss
rename to compendium-frontend/src/scss/layout/_components.scss
diff --git a/webapp/src/types/images.d.ts b/compendium-frontend/src/types/images.d.ts
similarity index 100%
rename from webapp/src/types/images.d.ts
rename to compendium-frontend/src/types/images.d.ts
diff --git a/webapp/tsconfig.json b/compendium-frontend/tsconfig.json
similarity index 100%
rename from webapp/tsconfig.json
rename to compendium-frontend/tsconfig.json
diff --git a/webapp/webpack.config.ts b/compendium-frontend/webpack.config.ts
similarity index 100%
rename from webapp/webpack.config.ts
rename to compendium-frontend/webpack.config.ts
diff --git a/tox.ini b/tox.ini
index 8777ca2a1b15f1c6b00e53932543a55ff88126b9..8a646a50183d05f7827e09f1739a3d7dd5c82c86 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 envlist = py39
 
 [flake8]
-exclude = venv,.tox,webapp
+exclude = venv,.tox,compendium-frontend,survey-frontend
 max-line-length = 120
 
 [testenv]