diff --git a/config/tileset/individual/imagery/auckland-2015-2016-0.075m.json b/config/tileset/auckland/imagery/auckland-2015-2016-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/auckland-2015-2016-0.075m.json
rename to config/tileset/auckland/imagery/auckland-2015-2016-0.075m.json
diff --git a/config/tileset/individual/imagery/auckland-coast-2022-2023-0.05m.json b/config/tileset/auckland/imagery/auckland-coast-2022-2023-0.05m.json
similarity index 100%
rename from config/tileset/individual/imagery/auckland-coast-2022-2023-0.05m.json
rename to config/tileset/auckland/imagery/auckland-coast-2022-2023-0.05m.json
diff --git a/config/tileset/individual/imagery/bay-of-plenty-rural-2011-2012-0.25m.json b/config/tileset/bay-of-plenty/imagery/bay-of-plenty-rural-2011-2012-0.25m.json
similarity index 100%
rename from config/tileset/individual/imagery/bay-of-plenty-rural-2011-2012-0.25m.json
rename to config/tileset/bay-of-plenty/imagery/bay-of-plenty-rural-2011-2012-0.25m.json
diff --git a/config/tileset/individual/imagery/bay-of-plenty-rural-2015-2017-0.25m.json b/config/tileset/bay-of-plenty/imagery/bay-of-plenty-rural-2015-2017-0.25m.json
similarity index 100%
rename from config/tileset/individual/imagery/bay-of-plenty-rural-2015-2017-0.25m.json
rename to config/tileset/bay-of-plenty/imagery/bay-of-plenty-rural-2015-2017-0.25m.json
diff --git a/config/tileset/individual/imagery/bay-of-plenty-rural-2016-2017-0.3m.json b/config/tileset/bay-of-plenty/imagery/bay-of-plenty-rural-2016-2017-0.3m.json
similarity index 100%
rename from config/tileset/individual/imagery/bay-of-plenty-rural-2016-2017-0.3m.json
rename to config/tileset/bay-of-plenty/imagery/bay-of-plenty-rural-2016-2017-0.3m.json
diff --git a/config/tileset/individual/imagery/bay-of-plenty-rural-2019-0.3m.json b/config/tileset/bay-of-plenty/imagery/bay-of-plenty-rural-2019-0.3m.json
similarity index 100%
rename from config/tileset/individual/imagery/bay-of-plenty-rural-2019-0.3m.json
rename to config/tileset/bay-of-plenty/imagery/bay-of-plenty-rural-2019-0.3m.json
diff --git a/config/tileset/individual/imagery/bay-of-plenty-urban-2014-2015-0.125m.json b/config/tileset/bay-of-plenty/imagery/bay-of-plenty-urban-2014-2015-0.125m.json
similarity index 100%
rename from config/tileset/individual/imagery/bay-of-plenty-urban-2014-2015-0.125m.json
rename to config/tileset/bay-of-plenty/imagery/bay-of-plenty-urban-2014-2015-0.125m.json
diff --git a/config/tileset/individual/imagery/bay-of-plenty-urban-2015-2016-0.125m.json b/config/tileset/bay-of-plenty/imagery/bay-of-plenty-urban-2015-2016-0.125m.json
similarity index 100%
rename from config/tileset/individual/imagery/bay-of-plenty-urban-2015-2016-0.125m.json
rename to config/tileset/bay-of-plenty/imagery/bay-of-plenty-urban-2015-2016-0.125m.json
diff --git a/config/tileset/individual/imagery/bay-of-plenty-urban-2015-2016-0.1m.json b/config/tileset/bay-of-plenty/imagery/bay-of-plenty-urban-2015-2016-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/bay-of-plenty-urban-2015-2016-0.1m.json
rename to config/tileset/bay-of-plenty/imagery/bay-of-plenty-urban-2015-2016-0.1m.json
diff --git a/config/tileset/individual/imagery/bay-of-plenty-urban-2018-2019-0.1m.json b/config/tileset/bay-of-plenty/imagery/bay-of-plenty-urban-2018-2019-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/bay-of-plenty-urban-2018-2019-0.1m.json
rename to config/tileset/bay-of-plenty/imagery/bay-of-plenty-urban-2018-2019-0.1m.json
diff --git a/config/tileset/individual/imagery/tauranga-city-urban-2022-0.1m.json b/config/tileset/bay-of-plenty/imagery/tauranga-city-urban-2022-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/tauranga-city-urban-2022-0.1m.json
rename to config/tileset/bay-of-plenty/imagery/tauranga-city-urban-2022-0.1m.json
diff --git a/config/tileset/individual/imagery/tauranga-urban-2017-0.1m.json b/config/tileset/bay-of-plenty/imagery/tauranga-urban-2017-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/tauranga-urban-2017-0.1m.json
rename to config/tileset/bay-of-plenty/imagery/tauranga-urban-2017-0.1m.json
diff --git a/config/tileset/individual/imagery/tauranga-winter-2022-0.1m.json b/config/tileset/bay-of-plenty/imagery/tauranga-winter-2022-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/tauranga-winter-2022-0.1m.json
rename to config/tileset/bay-of-plenty/imagery/tauranga-winter-2022-0.1m.json
diff --git a/config/tileset/individual/imagery/ashburton-urban-2020-0.075m.json b/config/tileset/canterbury/imagery/ashburton-urban-2020-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/ashburton-urban-2020-0.075m.json
rename to config/tileset/canterbury/imagery/ashburton-urban-2020-0.075m.json
diff --git a/config/tileset/individual/imagery/banks-peninsula-urban-2019-2020-0.075m.json b/config/tileset/canterbury/imagery/banks-peninsula-urban-2019-2020-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/banks-peninsula-urban-2019-2020-0.075m.json
rename to config/tileset/canterbury/imagery/banks-peninsula-urban-2019-2020-0.075m.json
diff --git a/config/tileset/individual/imagery/christchurch-urban-2015-2016-0.075m.json b/config/tileset/canterbury/imagery/christchurch-urban-2015-2016-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/christchurch-urban-2015-2016-0.075m.json
rename to config/tileset/canterbury/imagery/christchurch-urban-2015-2016-0.075m.json
diff --git a/config/tileset/individual/imagery/christchurch-urban-2018-0.075m.json b/config/tileset/canterbury/imagery/christchurch-urban-2018-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/christchurch-urban-2018-0.075m.json
rename to config/tileset/canterbury/imagery/christchurch-urban-2018-0.075m.json
diff --git a/config/tileset/individual/imagery/christchurch-urban-2018-2019-0.075m.json b/config/tileset/canterbury/imagery/christchurch-urban-2018-2019-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/christchurch-urban-2018-2019-0.075m.json
rename to config/tileset/canterbury/imagery/christchurch-urban-2018-2019-0.075m.json
diff --git a/config/tileset/individual/imagery/christchurch-urban-2020-2021-0.075m.json b/config/tileset/canterbury/imagery/christchurch-urban-2020-2021-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/christchurch-urban-2020-2021-0.075m.json
rename to config/tileset/canterbury/imagery/christchurch-urban-2020-2021-0.075m.json
diff --git a/config/tileset/individual/imagery/christchurch-urban-2021-0.05m.json b/config/tileset/canterbury/imagery/christchurch-urban-2021-0.05m.json
similarity index 100%
rename from config/tileset/individual/imagery/christchurch-urban-2021-0.05m.json
rename to config/tileset/canterbury/imagery/christchurch-urban-2021-0.05m.json
diff --git a/config/tileset/individual/imagery/hurunui-urban-2013-0.125m.json b/config/tileset/canterbury/imagery/hurunui-urban-2013-0.125m.json
similarity index 100%
rename from config/tileset/individual/imagery/hurunui-urban-2013-0.125m.json
rename to config/tileset/canterbury/imagery/hurunui-urban-2013-0.125m.json
diff --git a/config/tileset/individual/imagery/mackenzie-urban-2020-0.075m.json b/config/tileset/canterbury/imagery/mackenzie-urban-2020-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/mackenzie-urban-2020-0.075m.json
rename to config/tileset/canterbury/imagery/mackenzie-urban-2020-0.075m.json
diff --git a/config/tileset/individual/imagery/manawatu-urban-2019-0.125m.json b/config/tileset/canterbury/imagery/manawatu-urban-2019-0.125m.json
similarity index 100%
rename from config/tileset/individual/imagery/manawatu-urban-2019-0.125m.json
rename to config/tileset/canterbury/imagery/manawatu-urban-2019-0.125m.json
diff --git a/config/tileset/individual/imagery/selwyn-urban-2012-2013-0.125m.json b/config/tileset/canterbury/imagery/selwyn-urban-2012-2013-0.125m.json
similarity index 100%
rename from config/tileset/individual/imagery/selwyn-urban-2012-2013-0.125m.json
rename to config/tileset/canterbury/imagery/selwyn-urban-2012-2013-0.125m.json
diff --git a/config/tileset/individual/imagery/selwyn-urban-2018-2019-0.075m.json b/config/tileset/canterbury/imagery/selwyn-urban-2018-2019-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/selwyn-urban-2018-2019-0.075m.json
rename to config/tileset/canterbury/imagery/selwyn-urban-2018-2019-0.075m.json
diff --git a/config/tileset/individual/imagery/selwyn-urban-2019-0.075m.json b/config/tileset/canterbury/imagery/selwyn-urban-2019-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/selwyn-urban-2019-0.075m.json
rename to config/tileset/canterbury/imagery/selwyn-urban-2019-0.075m.json
diff --git a/config/tileset/individual/imagery/selwyn-urban-2020-2021-0.075m.json b/config/tileset/canterbury/imagery/selwyn-urban-2020-2021-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/selwyn-urban-2020-2021-0.075m.json
rename to config/tileset/canterbury/imagery/selwyn-urban-2020-2021-0.075m.json
diff --git a/config/tileset/individual/imagery/timaru-urban-2012-2013-0.075m.json b/config/tileset/canterbury/imagery/timaru-urban-2012-2013-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/timaru-urban-2012-2013-0.075m.json
rename to config/tileset/canterbury/imagery/timaru-urban-2012-2013-0.075m.json
diff --git a/config/tileset/individual/imagery/timaru-urban-2020-0.075m.json b/config/tileset/canterbury/imagery/timaru-urban-2020-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/timaru-urban-2020-0.075m.json
rename to config/tileset/canterbury/imagery/timaru-urban-2020-0.075m.json
diff --git a/config/tileset/individual/imagery/waimakariri-urban-2013-2014-0.075m.json b/config/tileset/canterbury/imagery/waimakariri-urban-2013-2014-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/waimakariri-urban-2013-2014-0.075m.json
rename to config/tileset/canterbury/imagery/waimakariri-urban-2013-2014-0.075m.json
diff --git a/config/tileset/individual/imagery/waimakariri-urban-2015-2016-0.075m.json b/config/tileset/canterbury/imagery/waimakariri-urban-2015-2016-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/waimakariri-urban-2015-2016-0.075m.json
rename to config/tileset/canterbury/imagery/waimakariri-urban-2015-2016-0.075m.json
diff --git a/config/tileset/individual/imagery/waimakariri-urban-2021-0.05m.json b/config/tileset/canterbury/imagery/waimakariri-urban-2021-0.05m.json
similarity index 100%
rename from config/tileset/individual/imagery/waimakariri-urban-2021-0.05m.json
rename to config/tileset/canterbury/imagery/waimakariri-urban-2021-0.05m.json
diff --git a/config/tileset/individual/imagery/waimate-urban-2018-0.075m.json b/config/tileset/canterbury/imagery/waimate-urban-2018-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/waimate-urban-2018-0.075m.json
rename to config/tileset/canterbury/imagery/waimate-urban-2018-0.075m.json
diff --git a/config/tileset/individual/imagery/waimate-urban-2020-0.075m.json b/config/tileset/canterbury/imagery/waimate-urban-2020-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/waimate-urban-2020-0.075m.json
rename to config/tileset/canterbury/imagery/waimate-urban-2020-0.075m.json
diff --git a/config/tileset/individual/imagery/gisborne-rural-2012-2013-0.4m.json b/config/tileset/gisborne/imagery/gisborne-rural-2012-2013-0.4m.json
similarity index 100%
rename from config/tileset/individual/imagery/gisborne-rural-2012-2013-0.4m.json
rename to config/tileset/gisborne/imagery/gisborne-rural-2012-2013-0.4m.json
diff --git a/config/tileset/individual/imagery/gisborne-urban-2017-2018-0.1m.json b/config/tileset/gisborne/imagery/gisborne-urban-2017-2018-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/gisborne-urban-2017-2018-0.1m.json
rename to config/tileset/gisborne/imagery/gisborne-urban-2017-2018-0.1m.json
diff --git a/config/tileset/individual/imagery/central-hawkes-bay-urban-2017-2018-0.1m.json b/config/tileset/hawkes-bay/imagery/central-hawkes-bay-urban-2017-2018-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/central-hawkes-bay-urban-2017-2018-0.1m.json
rename to config/tileset/hawkes-bay/imagery/central-hawkes-bay-urban-2017-2018-0.1m.json
diff --git a/config/tileset/individual/imagery/hastings-district-urban-2014-2015-0.1m.json b/config/tileset/hawkes-bay/imagery/hastings-district-urban-2014-2015-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/hastings-district-urban-2014-2015-0.1m.json
rename to config/tileset/hawkes-bay/imagery/hastings-district-urban-2014-2015-0.1m.json
diff --git a/config/tileset/individual/imagery/hastings-district-urban-2017-2018-0.1m.json b/config/tileset/hawkes-bay/imagery/hastings-district-urban-2017-2018-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/hastings-district-urban-2017-2018-0.1m.json
rename to config/tileset/hawkes-bay/imagery/hastings-district-urban-2017-2018-0.1m.json
diff --git a/config/tileset/individual/imagery/hawkes-bay-cyclone-gabrielle-2023-0.1m.json b/config/tileset/hawkes-bay/imagery/hawkes-bay-cyclone-gabrielle-2023-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/hawkes-bay-cyclone-gabrielle-2023-0.1m.json
rename to config/tileset/hawkes-bay/imagery/hawkes-bay-cyclone-gabrielle-2023-0.1m.json
diff --git a/config/tileset/individual/imagery/hawkes-bay-rural-2014-2015-0.3m.json b/config/tileset/hawkes-bay/imagery/hawkes-bay-rural-2014-2015-0.3m.json
similarity index 100%
rename from config/tileset/individual/imagery/hawkes-bay-rural-2014-2015-0.3m.json
rename to config/tileset/hawkes-bay/imagery/hawkes-bay-rural-2014-2015-0.3m.json
diff --git a/config/tileset/individual/imagery/hawkes-bay-rural-2019-2020-0.3m.json b/config/tileset/hawkes-bay/imagery/hawkes-bay-rural-2019-2020-0.3m.json
similarity index 100%
rename from config/tileset/individual/imagery/hawkes-bay-rural-2019-2020-0.3m.json
rename to config/tileset/hawkes-bay/imagery/hawkes-bay-rural-2019-2020-0.3m.json
diff --git a/config/tileset/individual/imagery/napier-city-urban-2017-2018-0.05m.json b/config/tileset/hawkes-bay/imagery/napier-city-urban-2017-2018-0.05m.json
similarity index 100%
rename from config/tileset/individual/imagery/napier-city-urban-2017-2018-0.05m.json
rename to config/tileset/hawkes-bay/imagery/napier-city-urban-2017-2018-0.05m.json
diff --git a/config/tileset/individual/imagery/napier-city-urban-2017-2018-0.1m.json b/config/tileset/hawkes-bay/imagery/napier-city-urban-2017-2018-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/napier-city-urban-2017-2018-0.1m.json
rename to config/tileset/hawkes-bay/imagery/napier-city-urban-2017-2018-0.1m.json
diff --git a/config/tileset/individual/imagery/wairoa-urban-2014-2015-0.1m.json b/config/tileset/hawkes-bay/imagery/wairoa-urban-2014-2015-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/wairoa-urban-2014-2015-0.1m.json
rename to config/tileset/hawkes-bay/imagery/wairoa-urban-2014-2015-0.1m.json
diff --git a/config/tileset/individual/imagery/manawatu-whanganui-rural-2015-2016-0.3m.json b/config/tileset/manawatu-whanganui/imagery/manawatu-whanganui-rural-2015-2016-0.3m.json
similarity index 100%
rename from config/tileset/individual/imagery/manawatu-whanganui-rural-2015-2016-0.3m.json
rename to config/tileset/manawatu-whanganui/imagery/manawatu-whanganui-rural-2015-2016-0.3m.json
diff --git a/config/tileset/individual/imagery/manawatu-whanganui-rural-2016-2017-0.3m.json b/config/tileset/manawatu-whanganui/imagery/manawatu-whanganui-rural-2016-2017-0.3m.json
similarity index 100%
rename from config/tileset/individual/imagery/manawatu-whanganui-rural-2016-2017-0.3m.json
rename to config/tileset/manawatu-whanganui/imagery/manawatu-whanganui-rural-2016-2017-0.3m.json
diff --git a/config/tileset/individual/imagery/palmerston-north-city-urban-2014-2015-0.125m.json b/config/tileset/manawatu-whanganui/imagery/palmerston-north-city-urban-2014-2015-0.125m.json
similarity index 100%
rename from config/tileset/individual/imagery/palmerston-north-city-urban-2014-2015-0.125m.json
rename to config/tileset/manawatu-whanganui/imagery/palmerston-north-city-urban-2014-2015-0.125m.json
diff --git a/config/tileset/individual/imagery/palmerston-north-urban-2016-2017-1.125m.json b/config/tileset/manawatu-whanganui/imagery/palmerston-north-urban-2016-2017-1.125m.json
similarity index 100%
rename from config/tileset/individual/imagery/palmerston-north-urban-2016-2017-1.125m.json
rename to config/tileset/manawatu-whanganui/imagery/palmerston-north-urban-2016-2017-1.125m.json
diff --git a/config/tileset/individual/imagery/palmerston-north-urban-2018-2019-0.125m.json b/config/tileset/manawatu-whanganui/imagery/palmerston-north-urban-2018-2019-0.125m.json
similarity index 100%
rename from config/tileset/individual/imagery/palmerston-north-urban-2018-2019-0.125m.json
rename to config/tileset/manawatu-whanganui/imagery/palmerston-north-urban-2018-2019-0.125m.json
diff --git a/config/tileset/individual/imagery/whanganui-urban-2015-2016-0.1m.json b/config/tileset/manawatu-whanganui/imagery/whanganui-urban-2015-2016-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/whanganui-urban-2015-2016-0.1m.json
rename to config/tileset/manawatu-whanganui/imagery/whanganui-urban-2015-2016-0.1m.json
diff --git a/config/tileset/individual/imagery/whanganui-urban-2017-2018-0.075m.json b/config/tileset/manawatu-whanganui/imagery/whanganui-urban-2017-2018-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/whanganui-urban-2017-2018-0.075m.json
rename to config/tileset/manawatu-whanganui/imagery/whanganui-urban-2017-2018-0.075m.json
diff --git a/config/tileset/individual/imagery/marlborough-rural-2011-2012-0.4m.json b/config/tileset/marlborough/imagery/marlborough-rural-2011-2012-0.4m.json
similarity index 100%
rename from config/tileset/individual/imagery/marlborough-rural-2011-2012-0.4m.json
rename to config/tileset/marlborough/imagery/marlborough-rural-2011-2012-0.4m.json
diff --git a/config/tileset/individual/imagery/marlborough-rural-2015-2016-0.2m.json b/config/tileset/marlborough/imagery/marlborough-rural-2015-2016-0.2m.json
similarity index 100%
rename from config/tileset/individual/imagery/marlborough-rural-2015-2016-0.2m.json
rename to config/tileset/marlborough/imagery/marlborough-rural-2015-2016-0.2m.json
diff --git a/config/tileset/individual/imagery/marlborough-urban-2017-2018-0.1m.json b/config/tileset/marlborough/imagery/marlborough-urban-2017-2018-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/marlborough-urban-2017-2018-0.1m.json
rename to config/tileset/marlborough/imagery/marlborough-urban-2017-2018-0.1m.json
diff --git a/config/tileset/individual/imagery/marlborough-urban-2020-2021-0.1m.json b/config/tileset/marlborough/imagery/marlborough-urban-2020-2021-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/marlborough-urban-2020-2021-0.1m.json
rename to config/tileset/marlborough/imagery/marlborough-urban-2020-2021-0.1m.json
diff --git a/config/tileset/individual/imagery/top-of-the-south-flood-2022-0.15m.json b/config/tileset/nelson/imagery/top-of-the-south-flood-2022-0.15m.json
similarity index 100%
rename from config/tileset/individual/imagery/top-of-the-south-flood-2022-0.15m.json
rename to config/tileset/nelson/imagery/top-of-the-south-flood-2022-0.15m.json
diff --git a/config/tileset/individual/imagery/north-island-2023-0.5m.json b/config/tileset/new-zealand/imagery/north-island-2023-0.5m.json
similarity index 100%
rename from config/tileset/individual/imagery/north-island-2023-0.5m.json
rename to config/tileset/new-zealand/imagery/north-island-2023-0.5m.json
diff --git a/config/tileset/individual/imagery/north-island-2023-10m.json b/config/tileset/new-zealand/imagery/north-island-2023-10m.json
similarity index 100%
rename from config/tileset/individual/imagery/north-island-2023-10m.json
rename to config/tileset/new-zealand/imagery/north-island-2023-10m.json
diff --git a/config/tileset/individual/imagery/north-island-pre-cyclone-gabrielle-2022-10m.json b/config/tileset/new-zealand/imagery/north-island-pre-cyclone-gabrielle-2022-10m.json
similarity index 100%
rename from config/tileset/individual/imagery/north-island-pre-cyclone-gabrielle-2022-10m.json
rename to config/tileset/new-zealand/imagery/north-island-pre-cyclone-gabrielle-2022-10m.json
diff --git a/config/tileset/individual/imagery/nz-satellite-2019-2020-10m.json b/config/tileset/new-zealand/imagery/nz-satellite-2019-2020-10m.json
similarity index 100%
rename from config/tileset/individual/imagery/nz-satellite-2019-2020-10m.json
rename to config/tileset/new-zealand/imagery/nz-satellite-2019-2020-10m.json
diff --git a/config/tileset/individual/imagery/nz-satellite-2020-2021-10m.json b/config/tileset/new-zealand/imagery/nz-satellite-2020-2021-10m.json
similarity index 100%
rename from config/tileset/individual/imagery/nz-satellite-2020-2021-10m.json
rename to config/tileset/new-zealand/imagery/nz-satellite-2020-2021-10m.json
diff --git a/config/tileset/individual/imagery/dunedin-rural-2013-0.4m.json b/config/tileset/otago/imagery/dunedin-rural-2013-0.4m.json
similarity index 100%
rename from config/tileset/individual/imagery/dunedin-rural-2013-0.4m.json
rename to config/tileset/otago/imagery/dunedin-rural-2013-0.4m.json
diff --git a/config/tileset/individual/imagery/otago-rural-2013-2014-0.4m.json b/config/tileset/otago/imagery/otago-rural-2013-2014-0.4m.json
similarity index 100%
rename from config/tileset/individual/imagery/otago-rural-2013-2014-0.4m.json
rename to config/tileset/otago/imagery/otago-rural-2013-2014-0.4m.json
diff --git a/config/tileset/individual/imagery/invercargill-urban-2016-0.05m.json b/config/tileset/southland/imagery/invercargill-urban-2016-0.05m.json
similarity index 100%
rename from config/tileset/individual/imagery/invercargill-urban-2016-0.05m.json
rename to config/tileset/southland/imagery/invercargill-urban-2016-0.05m.json
diff --git a/config/tileset/individual/imagery/invercargill-urban-2016-0.1m.json b/config/tileset/southland/imagery/invercargill-urban-2016-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/invercargill-urban-2016-0.1m.json
rename to config/tileset/southland/imagery/invercargill-urban-2016-0.1m.json
diff --git a/config/tileset/individual/imagery/new-plymouth-urban-2017-0.1m.json b/config/tileset/taranaki/imagery/new-plymouth-urban-2017-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/new-plymouth-urban-2017-0.1m.json
rename to config/tileset/taranaki/imagery/new-plymouth-urban-2017-0.1m.json
diff --git a/config/tileset/individual/imagery/taranaki-rural-2016-2017-0.3m.json b/config/tileset/taranaki/imagery/taranaki-rural-2016-2017-0.3m.json
similarity index 100%
rename from config/tileset/individual/imagery/taranaki-rural-2016-2017-0.3m.json
rename to config/tileset/taranaki/imagery/taranaki-rural-2016-2017-0.3m.json
diff --git a/config/tileset/individual/imagery/tasman-rural-2001-2002-1m.json b/config/tileset/tasman/imagery/tasman-rural-2001-2002-1m.json
similarity index 100%
rename from config/tileset/individual/imagery/tasman-rural-2001-2002-1m.json
rename to config/tileset/tasman/imagery/tasman-rural-2001-2002-1m.json
diff --git a/config/tileset/individual/imagery/tasman-rural-2009-2010-0.5m.json b/config/tileset/tasman/imagery/tasman-rural-2009-2010-0.5m.json
similarity index 100%
rename from config/tileset/individual/imagery/tasman-rural-2009-2010-0.5m.json
rename to config/tileset/tasman/imagery/tasman-rural-2009-2010-0.5m.json
diff --git a/config/tileset/individual/imagery/tasman-rural-2015-2016-0.3m.json b/config/tileset/tasman/imagery/tasman-rural-2015-2016-0.3m.json
similarity index 100%
rename from config/tileset/individual/imagery/tasman-rural-2015-2016-0.3m.json
rename to config/tileset/tasman/imagery/tasman-rural-2015-2016-0.3m.json
diff --git a/config/tileset/individual/imagery/tasman-rural-2016-2017-0.3m.json b/config/tileset/tasman/imagery/tasman-rural-2016-2017-0.3m.json
similarity index 100%
rename from config/tileset/individual/imagery/tasman-rural-2016-2017-0.3m.json
rename to config/tileset/tasman/imagery/tasman-rural-2016-2017-0.3m.json
diff --git a/config/tileset/individual/imagery/tasman-urban-2017-0.075m.json b/config/tileset/tasman/imagery/tasman-urban-2017-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/tasman-urban-2017-0.075m.json
rename to config/tileset/tasman/imagery/tasman-urban-2017-0.075m.json
diff --git a/config/tileset/individual/imagery/tasman-urban-2017-0.1m.json b/config/tileset/tasman/imagery/tasman-urban-2017-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/tasman-urban-2017-0.1m.json
rename to config/tileset/tasman/imagery/tasman-urban-2017-0.1m.json
diff --git a/config/tileset/individual/imagery/hamilton-urban-2016-2017-0.1m.json b/config/tileset/waikato/imagery/hamilton-urban-2016-2017-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/hamilton-urban-2016-2017-0.1m.json
rename to config/tileset/waikato/imagery/hamilton-urban-2016-2017-0.1m.json
diff --git a/config/tileset/individual/imagery/hamilton-urban-2019-0.1m.json b/config/tileset/waikato/imagery/hamilton-urban-2019-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/hamilton-urban-2019-0.1m.json
rename to config/tileset/waikato/imagery/hamilton-urban-2019-0.1m.json
diff --git a/config/tileset/individual/imagery/hamilton-urban-2020-2021-0.05m.json b/config/tileset/waikato/imagery/hamilton-urban-2020-2021-0.05m.json
similarity index 100%
rename from config/tileset/individual/imagery/hamilton-urban-2020-2021-0.05m.json
rename to config/tileset/waikato/imagery/hamilton-urban-2020-2021-0.05m.json
diff --git a/config/tileset/individual/imagery/waikato-2021-2022-0.05m.json b/config/tileset/waikato/imagery/waikato-2021-2022-0.05m.json
similarity index 100%
rename from config/tileset/individual/imagery/waikato-2021-2022-0.05m.json
rename to config/tileset/waikato/imagery/waikato-2021-2022-0.05m.json
diff --git a/config/tileset/individual/imagery/waikato-rural-2012-2013-0.5m.json b/config/tileset/waikato/imagery/waikato-rural-2012-2013-0.5m.json
similarity index 100%
rename from config/tileset/individual/imagery/waikato-rural-2012-2013-0.5m.json
rename to config/tileset/waikato/imagery/waikato-rural-2012-2013-0.5m.json
diff --git a/config/tileset/individual/imagery/waikato-urban-2014-0.1m.json b/config/tileset/waikato/imagery/waikato-urban-2014-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/waikato-urban-2014-0.1m.json
rename to config/tileset/waikato/imagery/waikato-urban-2014-0.1m.json
diff --git a/config/tileset/individual/imagery/hutt-city-urban-2017-0.1m.json b/config/tileset/wellington/imagery/hutt-city-urban-2017-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/hutt-city-urban-2017-0.1m.json
rename to config/tileset/wellington/imagery/hutt-city-urban-2017-0.1m.json
diff --git a/config/tileset/individual/imagery/kapiti-coast-2017-0.10m.json b/config/tileset/wellington/imagery/kapiti-coast-2017-0.10m.json
similarity index 100%
rename from config/tileset/individual/imagery/kapiti-coast-2017-0.10m.json
rename to config/tileset/wellington/imagery/kapiti-coast-2017-0.10m.json
diff --git a/config/tileset/individual/imagery/porirua-urban-2016-0.075m.json b/config/tileset/wellington/imagery/porirua-urban-2016-0.075m.json
similarity index 100%
rename from config/tileset/individual/imagery/porirua-urban-2016-0.075m.json
rename to config/tileset/wellington/imagery/porirua-urban-2016-0.075m.json
diff --git a/config/tileset/individual/imagery/upper-hutt-urban-2017-0.1m.json b/config/tileset/wellington/imagery/upper-hutt-urban-2017-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/upper-hutt-urban-2017-0.1m.json
rename to config/tileset/wellington/imagery/upper-hutt-urban-2017-0.1m.json
diff --git a/config/tileset/individual/imagery/wellington-2016-2017-0.3m.json b/config/tileset/wellington/imagery/wellington-2016-2017-0.3m.json
similarity index 100%
rename from config/tileset/individual/imagery/wellington-2016-2017-0.3m.json
rename to config/tileset/wellington/imagery/wellington-2016-2017-0.3m.json
diff --git a/config/tileset/individual/imagery/wellington-urban-2017-0.1m.json b/config/tileset/wellington/imagery/wellington-urban-2017-0.1m.json
similarity index 100%
rename from config/tileset/individual/imagery/wellington-urban-2017-0.1m.json
rename to config/tileset/wellington/imagery/wellington-urban-2017-0.1m.json