diff --git a/docs/source/products/data_products.rst b/docs/source/products/data_products.rst
index 74f252a0e7cca77efa03b65c50184a072287f90d..7210268e2feef815c0ef52a710b191865f10af27 100644
--- a/docs/source/products/data_products.rst
+++ b/docs/source/products/data_products.rst
@@ -1,8 +1,96 @@
-Data Products
+Atmosphere
+----------
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   filerst_ATMO/*
+
+Earth image/map
+---------------
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   filerst_Earth/*
+
+Geomagnetosphere
+----------------
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   filerst_GEOMAG/*
+
+Ground
+------
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   filerst_GROUND/*
+
+Ionosphere
+----------
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   filerst_IONO/*
+
+Data Acquired in the interplanetary space
+-----------------------------------------
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   filerst_IP/*
+
+Data Acquired at Lagrange 1 position
+------------------------------------
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   filerst_L1/*
+
+Mercury image/map
+-----------------
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   filerst_Mercury/*
+
+Sun image/map
 -------------
 
 .. toctree::
    :titlesonly:
    :glob:
 
-   data/*
+   filerst_SUN/*
+
+Venus image/map
+---------------
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   filerst_Venus/*
+
+
+
+
+
+
+
diff --git a/docs/source/products/data/inaf_s1sep_tableset.rst b/docs/source/products/filerst_Earth/inaf_s1sep_tableset.rst
similarity index 100%
rename from docs/source/products/data/inaf_s1sep_tableset.rst
rename to docs/source/products/filerst_Earth/inaf_s1sep_tableset.rst
diff --git a/docs/source/products/data/inaf_s2sep_tableset.rst b/docs/source/products/filerst_Earth/inaf_s2sep_tableset.rst
similarity index 100%
rename from docs/source/products/data/inaf_s2sep_tableset.rst
rename to docs/source/products/filerst_Earth/inaf_s2sep_tableset.rst
diff --git a/docs/source/products/data/infn_cses_hepd_spectrum.rst b/docs/source/products/filerst_GEOMAG/infn_cses_hepd_spectrum.rst
similarity index 100%
rename from docs/source/products/data/infn_cses_hepd_spectrum.rst
rename to docs/source/products/filerst_GEOMAG/infn_cses_hepd_spectrum.rst
diff --git a/docs/source/products/data/infn_iss_ams_flux_timeseries.rst b/docs/source/products/filerst_GEOMAG/infn_iss_ams_flux_timeseries.rst
similarity index 100%
rename from docs/source/products/data/infn_iss_ams_flux_timeseries.rst
rename to docs/source/products/filerst_GEOMAG/infn_iss_ams_flux_timeseries.rst
diff --git a/docs/source/products/data/infn_pamela_flux_timeseries.rst b/docs/source/products/filerst_GEOMAG/infn_pamela_flux_timeseries.rst
similarity index 100%
rename from docs/source/products/data/infn_pamela_flux_timeseries.rst
rename to docs/source/products/filerst_GEOMAG/infn_pamela_flux_timeseries.rst
diff --git a/docs/source/products/data/uniaq_curr_maigic_tableset.rst b/docs/source/products/filerst_GEOMAG/uniaq_curr_maigic_tableset.rst
similarity index 100%
rename from docs/source/products/data/uniaq_curr_maigic_tableset.rst
rename to docs/source/products/filerst_GEOMAG/uniaq_curr_maigic_tableset.rst
diff --git a/docs/source/products/data/uniaq_epmde_emma_timeseries.rst b/docs/source/products/filerst_GEOMAG/uniaq_epmde_emma_timeseries.rst
similarity index 100%
rename from docs/source/products/data/uniaq_epmde_emma_timeseries.rst
rename to docs/source/products/filerst_GEOMAG/uniaq_epmde_emma_timeseries.rst
diff --git a/docs/source/products/data/uniaq_field_maigic_tableset.rst b/docs/source/products/filerst_GEOMAG/uniaq_field_maigic_tableset.rst
similarity index 100%
rename from docs/source/products/data/uniaq_field_maigic_tableset.rst
rename to docs/source/products/filerst_GEOMAG/uniaq_field_maigic_tableset.rst
diff --git a/docs/source/products/data/unitov_iss_lidal_timeseries.rst b/docs/source/products/filerst_GEOMAG/unitov_iss_lidal_timeseries.rst
similarity index 100%
rename from docs/source/products/data/unitov_iss_lidal_timeseries.rst
rename to docs/source/products/filerst_GEOMAG/unitov_iss_lidal_timeseries.rst
diff --git a/docs/source/products/data/inaf_flux1h_svirco_timeseries.rst b/docs/source/products/filerst_GROUND/inaf_flux1h_svirco_timeseries.rst
similarity index 100%
rename from docs/source/products/data/inaf_flux1h_svirco_timeseries.rst
rename to docs/source/products/filerst_GROUND/inaf_flux1h_svirco_timeseries.rst
diff --git a/docs/source/products/data/inaf_flux5m_svirco_timeseries.rst b/docs/source/products/filerst_GROUND/inaf_flux5m_svirco_timeseries.rst
similarity index 100%
rename from docs/source/products/data/inaf_flux5m_svirco_timeseries.rst
rename to docs/source/products/filerst_GROUND/inaf_flux5m_svirco_timeseries.rst
diff --git a/docs/source/products/data/infn_saandose_samadha_timeseries.rst b/docs/source/products/filerst_GROUND/infn_saandose_samadha_timeseries.rst
similarity index 98%
rename from docs/source/products/data/infn_saandose_samadha_timeseries.rst
rename to docs/source/products/filerst_GROUND/infn_saandose_samadha_timeseries.rst
index 036958f43eed827a5cc00a41e2364e2cf94d1200..da89444acfcfc8c2fc8c41c1d602291d88a4cbad 100644
--- a/docs/source/products/data/infn_saandose_samadha_timeseries.rst
+++ b/docs/source/products/filerst_GROUND/infn_saandose_samadha_timeseries.rst
@@ -43,7 +43,7 @@ Dataset summary
   * - **time_stop:**
     - 2023-12-31
   * - **spatial:**
-    - Earth's Ground
+    - GROUND
   * - **messenger:**
     - neutrons
   * - **spectral_min:**
diff --git a/docs/source/products/data/infn_tgndose_samadha_timeseries.rst b/docs/source/products/filerst_GROUND/infn_tgndose_samadha_timeseries.rst
similarity index 98%
rename from docs/source/products/data/infn_tgndose_samadha_timeseries.rst
rename to docs/source/products/filerst_GROUND/infn_tgndose_samadha_timeseries.rst
index e1a2431261658845ab4a16e89966adf91040310f..a392c0e899d5a65ebfaeb3b9bf0b22236491f5cc 100644
--- a/docs/source/products/data/infn_tgndose_samadha_timeseries.rst
+++ b/docs/source/products/filerst_GROUND/infn_tgndose_samadha_timeseries.rst
@@ -43,7 +43,7 @@ Dataset summary
   * - **time_stop:**
     - 2023-12-31
   * - **spatial:**
-    - Earth's Ground
+    - GROUND
   * - **messenger:**
     - neutrons
   * - **spectral_min:**
diff --git a/docs/source/products/data/ingv_alert_aqu_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_alert_aqu_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_alert_aqu_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_alert_aqu_timeseries.rst
diff --git a/docs/source/products/data/ingv_alert_cts_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_alert_cts_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_alert_cts_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_alert_cts_timeseries.rst
diff --git a/docs/source/products/data/ingv_alert_dur_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_alert_dur_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_alert_dur_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_alert_dur_timeseries.rst
diff --git a/docs/source/products/data/ingv_alert_int_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_alert_int_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_alert_int_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_alert_int_timeseries.rst
diff --git a/docs/source/products/data/ingv_alert_lmp_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_alert_lmp_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_alert_lmp_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_alert_lmp_timeseries.rst
diff --git a/docs/source/products/data/ingv_alert_wdc_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_alert_wdc_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_alert_wdc_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_alert_wdc_timeseries.rst
diff --git a/docs/source/products/data/ingv_gic_aqu_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_gic_aqu_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_gic_aqu_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_gic_aqu_timeseries.rst
diff --git a/docs/source/products/data/ingv_gic_cts_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_gic_cts_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_gic_cts_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_gic_cts_timeseries.rst
diff --git a/docs/source/products/data/ingv_gic_dur_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_gic_dur_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_gic_dur_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_gic_dur_timeseries.rst
diff --git a/docs/source/products/data/ingv_gic_int_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_gic_int_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_gic_int_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_gic_int_timeseries.rst
diff --git a/docs/source/products/data/ingv_gic_lmp_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_gic_lmp_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_gic_lmp_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_gic_lmp_timeseries.rst
diff --git a/docs/source/products/data/ingv_gic_wdc_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_gic_wdc_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_gic_wdc_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_gic_wdc_timeseries.rst
diff --git a/docs/source/products/data/ingv_mag_aqu_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_mag_aqu_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_mag_aqu_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_mag_aqu_timeseries.rst
diff --git a/docs/source/products/data/ingv_mag_cts_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_mag_cts_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_mag_cts_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_mag_cts_timeseries.rst
diff --git a/docs/source/products/data/ingv_mag_dmc_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_mag_dmc_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_mag_dmc_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_mag_dmc_timeseries.rst
diff --git a/docs/source/products/data/ingv_mag_dur_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_mag_dur_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_mag_dur_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_mag_dur_timeseries.rst
diff --git a/docs/source/products/data/ingv_mag_int_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_mag_int_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_mag_int_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_mag_int_timeseries.rst
diff --git a/docs/source/products/data/ingv_mag_lmp_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_mag_lmp_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_mag_lmp_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_mag_lmp_timeseries.rst
diff --git a/docs/source/products/data/ingv_mag_tnb_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_mag_tnb_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_mag_tnb_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_mag_tnb_timeseries.rst
diff --git a/docs/source/products/data/ingv_mag_wdc_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_mag_wdc_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_mag_wdc_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_mag_wdc_timeseries.rst
diff --git a/docs/source/products/data/ingv_magdef_cts_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_magdef_cts_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_magdef_cts_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_magdef_cts_timeseries.rst
diff --git a/docs/source/products/data/ingv_magdef_dur_timeseries.rst b/docs/source/products/filerst_GROUND/ingv_magdef_dur_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_magdef_dur_timeseries.rst
rename to docs/source/products/filerst_GROUND/ingv_magdef_dur_timeseries.rst
diff --git a/docs/source/products/data/uniaq_mag_emma_timeseries.rst b/docs/source/products/filerst_GROUND/uniaq_mag_emma_timeseries.rst
similarity index 100%
rename from docs/source/products/data/uniaq_mag_emma_timeseries.rst
rename to docs/source/products/filerst_GROUND/uniaq_mag_emma_timeseries.rst
diff --git a/docs/source/products/data/inaf_cpcp_superdarn_datacube.rst b/docs/source/products/filerst_IONO/inaf_cpcp_superdarn_datacube.rst
similarity index 100%
rename from docs/source/products/data/inaf_cpcp_superdarn_datacube.rst
rename to docs/source/products/filerst_IONO/inaf_cpcp_superdarn_datacube.rst
diff --git a/docs/source/products/data/ingv_autoiono_bbla_timeseries.rst b/docs/source/products/filerst_IONO/ingv_autoiono_bbla_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_autoiono_bbla_timeseries.rst
rename to docs/source/products/filerst_IONO/ingv_autoiono_bbla_timeseries.rst
diff --git a/docs/source/products/data/ingv_autoiono_gibi_timeseries.rst b/docs/source/products/filerst_IONO/ingv_autoiono_gibi_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_autoiono_gibi_timeseries.rst
rename to docs/source/products/filerst_IONO/ingv_autoiono_gibi_timeseries.rst
diff --git a/docs/source/products/data/ingv_autoiono_rome_timeseries.rst b/docs/source/products/filerst_IONO/ingv_autoiono_rome_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_autoiono_rome_timeseries.rst
rename to docs/source/products/filerst_IONO/ingv_autoiono_rome_timeseries.rst
diff --git a/docs/source/products/data/ingv_autoiono_tucu_timeseries.rst b/docs/source/products/filerst_IONO/ingv_autoiono_tucu_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_autoiono_tucu_timeseries.rst
rename to docs/source/products/filerst_IONO/ingv_autoiono_tucu_timeseries.rst
diff --git a/docs/source/products/data/ingv_b_swarm_image.rst b/docs/source/products/filerst_IONO/ingv_b_swarm_image.rst
similarity index 98%
rename from docs/source/products/data/ingv_b_swarm_image.rst
rename to docs/source/products/filerst_IONO/ingv_b_swarm_image.rst
index 3dbf61d258b3e75d97ff6497f8e29948cc9acb2d..e3a22754d2a67c9b3993f40bb9d27413f6b59aad 100644
--- a/docs/source/products/data/ingv_b_swarm_image.rst
+++ b/docs/source/products/filerst_IONO/ingv_b_swarm_image.rst
@@ -43,7 +43,7 @@ Dataset summary
   * - **time_stop:**
     - 2020-12-31
   * - **spatial:**
-    - Earth's Ionosphere
+    - IONO
   * - **messenger:**
     - 
   * - **spectral_min:**
diff --git a/docs/source/products/data/ingv_b_swarm_timeseries.rst b/docs/source/products/filerst_IONO/ingv_b_swarm_timeseries.rst
similarity index 99%
rename from docs/source/products/data/ingv_b_swarm_timeseries.rst
rename to docs/source/products/filerst_IONO/ingv_b_swarm_timeseries.rst
index 4a8ca4566d72cd42f5aac67279558d910722022d..4206a1a3e4d7694e8884cc96517327c698da1503 100644
--- a/docs/source/products/data/ingv_b_swarm_timeseries.rst
+++ b/docs/source/products/filerst_IONO/ingv_b_swarm_timeseries.rst
@@ -43,7 +43,7 @@ Dataset summary
   * - **time_stop:**
     - 2022-12-31
   * - **spatial:**
-    - Earth's Ionosphere
+    - IONO
   * - **messenger:**
     - 
   * - **spectral_min:**
diff --git a/docs/source/products/data/ingv_bvect_cses_tableset.rst b/docs/source/products/filerst_IONO/ingv_bvect_cses_tableset.rst
similarity index 98%
rename from docs/source/products/data/ingv_bvect_cses_tableset.rst
rename to docs/source/products/filerst_IONO/ingv_bvect_cses_tableset.rst
index f2f2a564ea8017ca3c14cf0b529341ff7bde1ae8..789cab15733844adff2111ba6f4c05562c9dbd5a 100644
--- a/docs/source/products/data/ingv_bvect_cses_tableset.rst
+++ b/docs/source/products/filerst_IONO/ingv_bvect_cses_tableset.rst
@@ -43,7 +43,7 @@ Dataset summary
   * - **time_stop:**
     - 2021-09-30
   * - **spatial:**
-    - Earth's Ionosphere
+    - IONO
   * - **messenger:**
     - 
   * - **spectral_min:**
diff --git a/docs/source/products/data/ingv_evect_cses_tableset.rst b/docs/source/products/filerst_IONO/ingv_evect_cses_tableset.rst
similarity index 98%
rename from docs/source/products/data/ingv_evect_cses_tableset.rst
rename to docs/source/products/filerst_IONO/ingv_evect_cses_tableset.rst
index ed8d81ba3137c165ce9ddd586865ea1a04fa7609..edb29a04cb6cc74c38e4702f0ee407639155b1ca 100644
--- a/docs/source/products/data/ingv_evect_cses_tableset.rst
+++ b/docs/source/products/filerst_IONO/ingv_evect_cses_tableset.rst
@@ -43,7 +43,7 @@ Dataset summary
   * - **time_stop:**
     - 2021-09-30
   * - **spatial:**
-    - Earth's Ionosphere
+    - IONO
   * - **messenger:**
     - 
   * - **spectral_min:**
diff --git a/docs/source/products/data/ingv_ltmuf_cagliari_tableset.rst b/docs/source/products/filerst_IONO/ingv_ltmuf_cagliari_tableset.rst
similarity index 100%
rename from docs/source/products/data/ingv_ltmuf_cagliari_tableset.rst
rename to docs/source/products/filerst_IONO/ingv_ltmuf_cagliari_tableset.rst
diff --git a/docs/source/products/data/ingv_ltmuf_catania_tableset.rst b/docs/source/products/filerst_IONO/ingv_ltmuf_catania_tableset.rst
similarity index 100%
rename from docs/source/products/data/ingv_ltmuf_catania_tableset.rst
rename to docs/source/products/filerst_IONO/ingv_ltmuf_catania_tableset.rst
diff --git a/docs/source/products/data/ingv_ltmuf_milan_tableset.rst b/docs/source/products/filerst_IONO/ingv_ltmuf_milan_tableset.rst
similarity index 100%
rename from docs/source/products/data/ingv_ltmuf_milan_tableset.rst
rename to docs/source/products/filerst_IONO/ingv_ltmuf_milan_tableset.rst
diff --git a/docs/source/products/data/ingv_ltmuf_rome_tableset.rst b/docs/source/products/filerst_IONO/ingv_ltmuf_rome_tableset.rst
similarity index 100%
rename from docs/source/products/data/ingv_ltmuf_rome_tableset.rst
rename to docs/source/products/filerst_IONO/ingv_ltmuf_rome_tableset.rst
diff --git a/docs/source/products/data/ingv_ncmuf_cagliari_tableset.rst b/docs/source/products/filerst_IONO/ingv_ncmuf_cagliari_tableset.rst
similarity index 100%
rename from docs/source/products/data/ingv_ncmuf_cagliari_tableset.rst
rename to docs/source/products/filerst_IONO/ingv_ncmuf_cagliari_tableset.rst
diff --git a/docs/source/products/data/ingv_ncmuf_catania_tableset.rst b/docs/source/products/filerst_IONO/ingv_ncmuf_catania_tableset.rst
similarity index 100%
rename from docs/source/products/data/ingv_ncmuf_catania_tableset.rst
rename to docs/source/products/filerst_IONO/ingv_ncmuf_catania_tableset.rst
diff --git a/docs/source/products/data/ingv_ncmuf_milan_tableset.rst b/docs/source/products/filerst_IONO/ingv_ncmuf_milan_tableset.rst
similarity index 100%
rename from docs/source/products/data/ingv_ncmuf_milan_tableset.rst
rename to docs/source/products/filerst_IONO/ingv_ncmuf_milan_tableset.rst
diff --git a/docs/source/products/data/ingv_ncmuf_rome_tableset.rst b/docs/source/products/filerst_IONO/ingv_ncmuf_rome_tableset.rst
similarity index 100%
rename from docs/source/products/data/ingv_ncmuf_rome_tableset.rst
rename to docs/source/products/filerst_IONO/ingv_ncmuf_rome_tableset.rst
diff --git a/docs/source/products/data/ingv_valiiono_gibi_timeseries.rst b/docs/source/products/filerst_IONO/ingv_valiiono_gibi_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_valiiono_gibi_timeseries.rst
rename to docs/source/products/filerst_IONO/ingv_valiiono_gibi_timeseries.rst
diff --git a/docs/source/products/data/ingv_valiiono_rome_timeseries.rst b/docs/source/products/filerst_IONO/ingv_valiiono_rome_timeseries.rst
similarity index 100%
rename from docs/source/products/data/ingv_valiiono_rome_timeseries.rst
rename to docs/source/products/filerst_IONO/ingv_valiiono_rome_timeseries.rst
diff --git a/docs/source/products/data/unitn_flux_cses_timeseries.rst b/docs/source/products/filerst_IONO/unitn_flux_cses_timeseries.rst
similarity index 100%
rename from docs/source/products/data/unitn_flux_cses_timeseries.rst
rename to docs/source/products/filerst_IONO/unitn_flux_cses_timeseries.rst
diff --git a/docs/source/products/data/inaf_data_solopas_timeseries.rst b/docs/source/products/filerst_IP/inaf_data_solopas_timeseries.rst
similarity index 100%
rename from docs/source/products/data/inaf_data_solopas_timeseries.rst
rename to docs/source/products/filerst_IP/inaf_data_solopas_timeseries.rst
diff --git a/docs/source/products/data/inaf_gsmaps_datacube.rst b/docs/source/products/filerst_IP/inaf_gsmaps_datacube.rst
similarity index 100%
rename from docs/source/products/data/inaf_gsmaps_datacube.rst
rename to docs/source/products/filerst_IP/inaf_gsmaps_datacube.rst
diff --git a/docs/source/products/data/inaf_tps_datacube.rst b/docs/source/products/filerst_IP/inaf_tps_datacube.rst
similarity index 96%
rename from docs/source/products/data/inaf_tps_datacube.rst
rename to docs/source/products/filerst_IP/inaf_tps_datacube.rst
index 7777305761bda3574b940fc062193e693f907ec0..35ccb1a86bffdbfd2111130fc07117ee646eb5e8 100644
--- a/docs/source/products/data/inaf_tps_datacube.rst
+++ b/docs/source/products/filerst_IP/inaf_tps_datacube.rst
@@ -43,7 +43,7 @@ Dataset summary
   * - **time_stop:**
     - 2022-01-01
   * - **spatial:**
-    - Interplanetary Space (not L1 and Planets),Sun-Earth L1
+    - IP
   * - **messenger:**
     - Particle intensity variation
   * - **spectral_min:**
diff --git a/docs/source/products/data/unical_espseptransport_tableset.rst b/docs/source/products/filerst_IP/unical_espseptransport_tableset.rst
similarity index 100%
rename from docs/source/products/data/unical_espseptransport_tableset.rst
rename to docs/source/products/filerst_IP/unical_espseptransport_tableset.rst
diff --git a/docs/source/products/data/unical_sep_psp_spectrum.rst b/docs/source/products/filerst_IP/unical_sep_psp_spectrum.rst
similarity index 100%
rename from docs/source/products/data/unical_sep_psp_spectrum.rst
rename to docs/source/products/filerst_IP/unical_sep_psp_spectrum.rst
diff --git a/docs/source/products/data/unical_sep_solo_spectrum.rst b/docs/source/products/filerst_IP/unical_sep_solo_spectrum.rst
similarity index 100%
rename from docs/source/products/data/unical_sep_solo_spectrum.rst
rename to docs/source/products/filerst_IP/unical_sep_solo_spectrum.rst
diff --git a/docs/source/products/data/unical_sep_stra_spectrum.rst b/docs/source/products/filerst_IP/unical_sep_stra_spectrum.rst
similarity index 100%
rename from docs/source/products/data/unical_sep_stra_spectrum.rst
rename to docs/source/products/filerst_IP/unical_sep_stra_spectrum.rst
diff --git a/docs/source/products/data/unical_shockpar_tableset.rst b/docs/source/products/filerst_IP/unical_shockpar_tableset.rst
similarity index 100%
rename from docs/source/products/data/unical_shockpar_tableset.rst
rename to docs/source/products/filerst_IP/unical_shockpar_tableset.rst
diff --git a/docs/source/products/data/unitov_icme_tableset.rst b/docs/source/products/filerst_IP/unitov_icme_tableset.rst
similarity index 100%
rename from docs/source/products/data/unitov_icme_tableset.rst
rename to docs/source/products/filerst_IP/unitov_icme_tableset.rst
diff --git a/docs/source/products/data/external_ace_swepam_timeseries.rst b/docs/source/products/filerst_L1/external_ace_swepam_timeseries.rst
similarity index 100%
rename from docs/source/products/data/external_ace_swepam_timeseries.rst
rename to docs/source/products/filerst_L1/external_ace_swepam_timeseries.rst
diff --git a/docs/source/products/data/external_flux_goes_timeseries.rst b/docs/source/products/filerst_L1/external_flux_goes_timeseries.rst
similarity index 100%
rename from docs/source/products/data/external_flux_goes_timeseries.rst
rename to docs/source/products/filerst_L1/external_flux_goes_timeseries.rst
diff --git a/docs/source/products/data/external_part_goes_timeseries.rst b/docs/source/products/filerst_L1/external_part_goes_timeseries.rst
similarity index 100%
rename from docs/source/products/data/external_part_goes_timeseries.rst
rename to docs/source/products/filerst_L1/external_part_goes_timeseries.rst
diff --git a/docs/source/products/data/inaf_vbcorr_wind_tableset.rst b/docs/source/products/filerst_L1/inaf_vbcorr_wind_tableset.rst
similarity index 100%
rename from docs/source/products/data/inaf_vbcorr_wind_tableset.rst
rename to docs/source/products/filerst_L1/inaf_vbcorr_wind_tableset.rst
diff --git a/docs/source/products/data/unical_sep_ace_spectrum.rst b/docs/source/products/filerst_L1/unical_sep_ace_spectrum.rst
similarity index 100%
rename from docs/source/products/data/unical_sep_ace_spectrum.rst
rename to docs/source/products/filerst_L1/unical_sep_ace_spectrum.rst
diff --git a/docs/source/products/data/unical_sep_soho_spectrum.rst b/docs/source/products/filerst_L1/unical_sep_soho_spectrum.rst
similarity index 100%
rename from docs/source/products/data/unical_sep_soho_spectrum.rst
rename to docs/source/products/filerst_L1/unical_sep_soho_spectrum.rst
diff --git a/docs/source/products/data/unical_sep_wind_spectrum.rst b/docs/source/products/filerst_L1/unical_sep_wind_spectrum.rst
similarity index 100%
rename from docs/source/products/data/unical_sep_wind_spectrum.rst
rename to docs/source/products/filerst_L1/unical_sep_wind_spectrum.rst
diff --git a/docs/source/products/data/inaf_na_mercexo_image.rst b/docs/source/products/filerst_Mercury/inaf_na_mercexo_image.rst
similarity index 100%
rename from docs/source/products/data/inaf_na_mercexo_image.rst
rename to docs/source/products/filerst_Mercury/inaf_na_mercexo_image.rst
diff --git a/docs/source/products/data/inaf_m2flare_tableset.rst b/docs/source/products/filerst_SUN/inaf_m2flare_tableset.rst
similarity index 100%
rename from docs/source/products/data/inaf_m2flare_tableset.rst
rename to docs/source/products/filerst_SUN/inaf_m2flare_tableset.rst
diff --git a/docs/source/products/data/unict_facula_image.rst b/docs/source/products/filerst_SUN/unict_facula_image.rst
similarity index 100%
rename from docs/source/products/data/unict_facula_image.rst
rename to docs/source/products/filerst_SUN/unict_facula_image.rst
diff --git a/docs/source/products/data/unict_filament_image.rst b/docs/source/products/filerst_SUN/unict_filament_image.rst
similarity index 100%
rename from docs/source/products/data/unict_filament_image.rst
rename to docs/source/products/filerst_SUN/unict_filament_image.rst
diff --git a/docs/source/products/data/unict_offlimb_image.rst b/docs/source/products/filerst_SUN/unict_offlimb_image.rst
similarity index 100%
rename from docs/source/products/data/unict_offlimb_image.rst
rename to docs/source/products/filerst_SUN/unict_offlimb_image.rst
diff --git a/docs/source/products/data/unict_sunspot_image.rst b/docs/source/products/filerst_SUN/unict_sunspot_image.rst
similarity index 100%
rename from docs/source/products/data/unict_sunspot_image.rst
rename to docs/source/products/filerst_SUN/unict_sunspot_image.rst
diff --git a/docs/source/products/data/unitov_halpha_tsst_image.rst b/docs/source/products/filerst_SUN/unitov_halpha_tsst_image.rst
similarity index 100%
rename from docs/source/products/data/unitov_halpha_tsst_image.rst
rename to docs/source/products/filerst_SUN/unitov_halpha_tsst_image.rst
diff --git a/docs/source/products/data/unitov_mag_tsst_image.rst b/docs/source/products/filerst_SUN/unitov_mag_tsst_image.rst
similarity index 100%
rename from docs/source/products/data/unitov_mag_tsst_image.rst
rename to docs/source/products/filerst_SUN/unitov_mag_tsst_image.rst
diff --git a/docs/source/products/data/unitov_rdparameter_tableset.rst b/docs/source/products/filerst_SUN/unitov_rdparameter_tableset.rst
similarity index 100%
rename from docs/source/products/data/unitov_rdparameter_tableset.rst
rename to docs/source/products/filerst_SUN/unitov_rdparameter_tableset.rst
diff --git a/docs/source/products/data/unitov_vel_tsst_image.rst b/docs/source/products/filerst_SUN/unitov_vel_tsst_image.rst
similarity index 100%
rename from docs/source/products/data/unitov_vel_tsst_image.rst
rename to docs/source/products/filerst_SUN/unitov_vel_tsst_image.rst
diff --git a/docs/source/products/main.rst b/docs/source/products/main.rst
index eafa591c60d1a96f2d1742a1f8b1d38b331239f5..e7d14ece25d00cd43c87f627bc83f1e3460259d5 100644
--- a/docs/source/products/main.rst
+++ b/docs/source/products/main.rst
@@ -1,4 +1,4 @@
-Product Catalogue
+Products Catalogue
 ==================
 
 .. include:: intro.rst