diff --git a/documentation/operations-guide/Makefile b/documentation/operator-guide/Makefile
similarity index 100%
rename from documentation/operations-guide/Makefile
rename to documentation/operator-guide/Makefile
diff --git a/documentation/operations-guide/conf.py b/documentation/operator-guide/conf.py
similarity index 100%
rename from documentation/operations-guide/conf.py
rename to documentation/operator-guide/conf.py
diff --git a/documentation/operations-guide/index.rst b/documentation/operator-guide/index.rst
similarity index 100%
rename from documentation/operations-guide/index.rst
rename to documentation/operator-guide/index.rst
diff --git a/documentation/operations-guide/intro.md b/documentation/operator-guide/intro.md
similarity index 100%
rename from documentation/operations-guide/intro.md
rename to documentation/operator-guide/intro.md
diff --git a/documentation/operations-guide/make.bat b/documentation/operator-guide/make.bat
similarity index 100%
rename from documentation/operations-guide/make.bat
rename to documentation/operator-guide/make.bat
diff --git a/documentation/operations-guide/operations-guide.md b/documentation/operator-guide/operator-guide.rst
similarity index 100%
rename from documentation/operations-guide/operations-guide.md
rename to documentation/operator-guide/operator-guide.rst
diff --git a/documentation/users-guide/Makefile b/documentation/user-guide/Makefile
similarity index 100%
rename from documentation/users-guide/Makefile
rename to documentation/user-guide/Makefile
diff --git a/documentation/users-guide/conf.py b/documentation/user-guide/conf.py
similarity index 100%
rename from documentation/users-guide/conf.py
rename to documentation/user-guide/conf.py
diff --git a/documentation/users-guide/downloading.rst b/documentation/user-guide/downloading.rst
similarity index 100%
rename from documentation/users-guide/downloading.rst
rename to documentation/user-guide/downloading.rst
diff --git a/documentation/users-guide/images/favicon.ico b/documentation/user-guide/images/favicon.ico
similarity index 100%
rename from documentation/users-guide/images/favicon.ico
rename to documentation/user-guide/images/favicon.ico
diff --git a/documentation/users-guide/images/webclient_add-to-basket.png b/documentation/user-guide/images/webclient_add-to-basket.png
similarity index 100%
rename from documentation/users-guide/images/webclient_add-to-basket.png
rename to documentation/user-guide/images/webclient_add-to-basket.png
diff --git a/documentation/users-guide/images/webclient_basket1.png b/documentation/user-guide/images/webclient_basket1.png
similarity index 100%
rename from documentation/users-guide/images/webclient_basket1.png
rename to documentation/user-guide/images/webclient_basket1.png
diff --git a/documentation/users-guide/images/webclient_basket2.png b/documentation/user-guide/images/webclient_basket2.png
similarity index 100%
rename from documentation/users-guide/images/webclient_basket2.png
rename to documentation/user-guide/images/webclient_basket2.png
diff --git a/documentation/users-guide/images/webclient_coordinates.png b/documentation/user-guide/images/webclient_coordinates.png
similarity index 100%
rename from documentation/users-guide/images/webclient_coordinates.png
rename to documentation/user-guide/images/webclient_coordinates.png
diff --git a/documentation/users-guide/images/webclient_current-view.png b/documentation/user-guide/images/webclient_current-view.png
similarity index 100%
rename from documentation/users-guide/images/webclient_current-view.png
rename to documentation/user-guide/images/webclient_current-view.png
diff --git a/documentation/users-guide/images/webclient_details_display.png b/documentation/user-guide/images/webclient_details_display.png
similarity index 100%
rename from documentation/users-guide/images/webclient_details_display.png
rename to documentation/user-guide/images/webclient_details_display.png
diff --git a/documentation/users-guide/images/webclient_download-buttons.png b/documentation/user-guide/images/webclient_download-buttons.png
similarity index 100%
rename from documentation/users-guide/images/webclient_download-buttons.png
rename to documentation/user-guide/images/webclient_download-buttons.png
diff --git a/documentation/users-guide/images/webclient_download_multiple.png b/documentation/user-guide/images/webclient_download_multiple.png
similarity index 100%
rename from documentation/users-guide/images/webclient_download_multiple.png
rename to documentation/user-guide/images/webclient_download_multiple.png
diff --git a/documentation/users-guide/images/webclient_highlighting.png b/documentation/user-guide/images/webclient_highlighting.png
similarity index 100%
rename from documentation/users-guide/images/webclient_highlighting.png
rename to documentation/user-guide/images/webclient_highlighting.png
diff --git a/documentation/users-guide/images/webclient_info1.png b/documentation/user-guide/images/webclient_info1.png
similarity index 100%
rename from documentation/users-guide/images/webclient_info1.png
rename to documentation/user-guide/images/webclient_info1.png
diff --git a/documentation/users-guide/images/webclient_info2.png b/documentation/user-guide/images/webclient_info2.png
similarity index 100%
rename from documentation/users-guide/images/webclient_info2.png
rename to documentation/user-guide/images/webclient_info2.png
diff --git a/documentation/users-guide/images/webclient_layer-configuration.png b/documentation/user-guide/images/webclient_layer-configuration.png
similarity index 100%
rename from documentation/users-guide/images/webclient_layer-configuration.png
rename to documentation/user-guide/images/webclient_layer-configuration.png
diff --git a/documentation/users-guide/images/webclient_loading-indicator.png b/documentation/user-guide/images/webclient_loading-indicator.png
similarity index 100%
rename from documentation/users-guide/images/webclient_loading-indicator.png
rename to documentation/user-guide/images/webclient_loading-indicator.png
diff --git a/documentation/users-guide/images/webclient_search-buttons.png b/documentation/user-guide/images/webclient_search-buttons.png
similarity index 100%
rename from documentation/users-guide/images/webclient_search-buttons.png
rename to documentation/user-guide/images/webclient_search-buttons.png
diff --git a/documentation/users-guide/images/webclient_select-on-map.png b/documentation/user-guide/images/webclient_select-on-map.png
similarity index 100%
rename from documentation/users-guide/images/webclient_select-on-map.png
rename to documentation/user-guide/images/webclient_select-on-map.png
diff --git a/documentation/users-guide/images/webclient_start.png b/documentation/user-guide/images/webclient_start.png
similarity index 100%
rename from documentation/users-guide/images/webclient_start.png
rename to documentation/user-guide/images/webclient_start.png
diff --git a/documentation/users-guide/images/webclient_timeslider-dots.png b/documentation/user-guide/images/webclient_timeslider-dots.png
similarity index 100%
rename from documentation/users-guide/images/webclient_timeslider-dots.png
rename to documentation/user-guide/images/webclient_timeslider-dots.png
diff --git a/documentation/users-guide/images/webclient_toggle-search-single.png b/documentation/user-guide/images/webclient_toggle-search-single.png
similarity index 100%
rename from documentation/users-guide/images/webclient_toggle-search-single.png
rename to documentation/user-guide/images/webclient_toggle-search-single.png
diff --git a/documentation/users-guide/images/webclient_toggle-search.png b/documentation/user-guide/images/webclient_toggle-search.png
similarity index 100%
rename from documentation/users-guide/images/webclient_toggle-search.png
rename to documentation/user-guide/images/webclient_toggle-search.png
diff --git a/documentation/users-guide/images/webclient_tutorial-button.png b/documentation/user-guide/images/webclient_tutorial-button.png
similarity index 100%
rename from documentation/users-guide/images/webclient_tutorial-button.png
rename to documentation/user-guide/images/webclient_tutorial-button.png
diff --git a/documentation/users-guide/images/webclient_tutorial_01_start.png b/documentation/user-guide/images/webclient_tutorial_01_start.png
similarity index 100%
rename from documentation/users-guide/images/webclient_tutorial_01_start.png
rename to documentation/user-guide/images/webclient_tutorial_01_start.png
diff --git a/documentation/users-guide/images/webclient_tutorial_02_map.png b/documentation/user-guide/images/webclient_tutorial_02_map.png
similarity index 100%
rename from documentation/users-guide/images/webclient_tutorial_02_map.png
rename to documentation/user-guide/images/webclient_tutorial_02_map.png
diff --git a/documentation/users-guide/images/webclient_tutorial_03_timeslider.png b/documentation/user-guide/images/webclient_tutorial_03_timeslider.png
similarity index 100%
rename from documentation/users-guide/images/webclient_tutorial_03_timeslider.png
rename to documentation/user-guide/images/webclient_tutorial_03_timeslider.png
diff --git a/documentation/users-guide/images/webclient_tutorial_04_search-results.png b/documentation/user-guide/images/webclient_tutorial_04_search-results.png
similarity index 100%
rename from documentation/users-guide/images/webclient_tutorial_04_search-results.png
rename to documentation/user-guide/images/webclient_tutorial_04_search-results.png
diff --git a/documentation/users-guide/images/webclient_tutorial_05_filters.png b/documentation/user-guide/images/webclient_tutorial_05_filters.png
similarity index 100%
rename from documentation/users-guide/images/webclient_tutorial_05_filters.png
rename to documentation/user-guide/images/webclient_tutorial_05_filters.png
diff --git a/documentation/users-guide/images/webclient_tutorial_06_map-layers.png b/documentation/user-guide/images/webclient_tutorial_06_map-layers.png
similarity index 100%
rename from documentation/users-guide/images/webclient_tutorial_06_map-layers.png
rename to documentation/user-guide/images/webclient_tutorial_06_map-layers.png
diff --git a/documentation/users-guide/images/wms_cloud-mask.png b/documentation/user-guide/images/wms_cloud-mask.png
similarity index 100%
rename from documentation/users-guide/images/wms_cloud-mask.png
rename to documentation/user-guide/images/wms_cloud-mask.png
diff --git a/documentation/users-guide/images/wms_cql-filtering.png b/documentation/user-guide/images/wms_cql-filtering.png
similarity index 100%
rename from documentation/users-guide/images/wms_cql-filtering.png
rename to documentation/user-guide/images/wms_cql-filtering.png
diff --git a/documentation/users-guide/images/wms_custom-stretch.png b/documentation/user-guide/images/wms_custom-stretch.png
similarity index 100%
rename from documentation/users-guide/images/wms_custom-stretch.png
rename to documentation/user-guide/images/wms_custom-stretch.png
diff --git a/documentation/users-guide/images/wms_false-color.png b/documentation/user-guide/images/wms_false-color.png
similarity index 100%
rename from documentation/users-guide/images/wms_false-color.png
rename to documentation/user-guide/images/wms_false-color.png
diff --git a/documentation/users-guide/images/wms_full.png b/documentation/user-guide/images/wms_full.png
similarity index 100%
rename from documentation/users-guide/images/wms_full.png
rename to documentation/user-guide/images/wms_full.png
diff --git a/documentation/users-guide/images/wms_masked-clouds.png b/documentation/user-guide/images/wms_masked-clouds.png
similarity index 100%
rename from documentation/users-guide/images/wms_masked-clouds.png
rename to documentation/user-guide/images/wms_masked-clouds.png
diff --git a/documentation/users-guide/images/wms_ndvi-style.png b/documentation/user-guide/images/wms_ndvi-style.png
similarity index 100%
rename from documentation/users-guide/images/wms_ndvi-style.png
rename to documentation/user-guide/images/wms_ndvi-style.png
diff --git a/documentation/users-guide/images/wms_qgis1.png b/documentation/user-guide/images/wms_qgis1.png
similarity index 100%
rename from documentation/users-guide/images/wms_qgis1.png
rename to documentation/user-guide/images/wms_qgis1.png
diff --git a/documentation/users-guide/images/wms_qgis2.png b/documentation/user-guide/images/wms_qgis2.png
similarity index 100%
rename from documentation/users-guide/images/wms_qgis2.png
rename to documentation/user-guide/images/wms_qgis2.png
diff --git a/documentation/users-guide/images/wms_qgis3.png b/documentation/user-guide/images/wms_qgis3.png
similarity index 100%
rename from documentation/users-guide/images/wms_qgis3.png
rename to documentation/user-guide/images/wms_qgis3.png
diff --git a/documentation/users-guide/images/wms_quicklook.png b/documentation/user-guide/images/wms_quicklook.png
similarity index 100%
rename from documentation/users-guide/images/wms_quicklook.png
rename to documentation/user-guide/images/wms_quicklook.png
diff --git a/documentation/users-guide/images/wmts_animation.gif b/documentation/user-guide/images/wmts_animation.gif
similarity index 100%
rename from documentation/users-guide/images/wmts_animation.gif
rename to documentation/user-guide/images/wmts_animation.gif
diff --git a/documentation/users-guide/images/wmts_full.png b/documentation/user-guide/images/wmts_full.png
similarity index 100%
rename from documentation/users-guide/images/wmts_full.png
rename to documentation/user-guide/images/wmts_full.png
diff --git a/documentation/users-guide/images/wmts_masked.png b/documentation/user-guide/images/wmts_masked.png
similarity index 100%
rename from documentation/users-guide/images/wmts_masked.png
rename to documentation/user-guide/images/wmts_masked.png
diff --git a/documentation/users-guide/images/wmts_tiles.png b/documentation/user-guide/images/wmts_tiles.png
similarity index 100%
rename from documentation/users-guide/images/wmts_tiles.png
rename to documentation/user-guide/images/wmts_tiles.png
diff --git a/documentation/users-guide/index.rst b/documentation/user-guide/index.rst
similarity index 100%
rename from documentation/users-guide/index.rst
rename to documentation/user-guide/index.rst
diff --git a/documentation/users-guide/intro.rst b/documentation/user-guide/intro.rst
similarity index 100%
rename from documentation/users-guide/intro.rst
rename to documentation/user-guide/intro.rst
diff --git a/documentation/users-guide/make.bat b/documentation/user-guide/make.bat
similarity index 100%
rename from documentation/users-guide/make.bat
rename to documentation/user-guide/make.bat
diff --git a/documentation/users-guide/sample-requests.rst b/documentation/user-guide/sample-requests.rst
similarity index 100%
rename from documentation/users-guide/sample-requests.rst
rename to documentation/user-guide/sample-requests.rst
diff --git a/documentation/users-guide/searching.rst b/documentation/user-guide/searching.rst
similarity index 100%
rename from documentation/users-guide/searching.rst
rename to documentation/user-guide/searching.rst
diff --git a/documentation/users-guide/viewing.rst b/documentation/user-guide/viewing.rst
similarity index 100%
rename from documentation/users-guide/viewing.rst
rename to documentation/user-guide/viewing.rst
diff --git a/documentation/users-guide/web-client.rst b/documentation/user-guide/web-client.rst
similarity index 100%
rename from documentation/users-guide/web-client.rst
rename to documentation/user-guide/web-client.rst