diff --git a/base/configs/superset/assets/datasets/PostgreSQL/CCS_Referral_Status_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/CCS_Referral_Status_Query-dataset.yaml
similarity index 100%
rename from base/configs/superset/assets/datasets/PostgreSQL/CCS_Referral_Status_Query-dataset.yaml
rename to base/configs/superset/assets/datasets/Analytics/CCS_Referral_Status_Query-dataset.yaml
diff --git a/base/configs/superset/assets/datasets/PostgreSQL/HC_CCS_Report_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/HC_CCS_Report_Query-dataset.yaml
similarity index 100%
rename from base/configs/superset/assets/datasets/PostgreSQL/HC_CCS_Report_Query-dataset.yaml
rename to base/configs/superset/assets/datasets/Analytics/HC_CCS_Report_Query-dataset.yaml
diff --git a/base/configs/superset/assets/datasets/PostgreSQL/HC_NCD_OPD_Register_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/HC_NCD_OPD_Register_Query-dataset.yaml
similarity index 100%
rename from base/configs/superset/assets/datasets/PostgreSQL/HC_NCD_OPD_Register_Query-dataset.yaml
rename to base/configs/superset/assets/datasets/Analytics/HC_NCD_OPD_Register_Query-dataset.yaml
diff --git a/base/configs/superset/assets/datasets/PostgreSQL/NCD_HIS_Followup_Cases_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/NCD_HIS_Followup_Cases_Query-dataset.yaml
similarity index 100%
rename from base/configs/superset/assets/datasets/PostgreSQL/NCD_HIS_Followup_Cases_Query-dataset.yaml
rename to base/configs/superset/assets/datasets/Analytics/NCD_HIS_Followup_Cases_Query-dataset.yaml
diff --git a/base/configs/superset/assets/datasets/PostgreSQL/NCD_HIS_New_Cases_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/NCD_HIS_New_Cases_Query-dataset.yaml
similarity index 100%
rename from base/configs/superset/assets/datasets/PostgreSQL/NCD_HIS_New_Cases_Query-dataset.yaml
rename to base/configs/superset/assets/datasets/Analytics/NCD_HIS_New_Cases_Query-dataset.yaml
diff --git a/base/configs/superset/assets/datasets/PostgreSQL/NCD_Missed_Appointments_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/NCD_Missed_Appointments_Query-dataset.yaml
similarity index 100%
rename from base/configs/superset/assets/datasets/PostgreSQL/NCD_Missed_Appointments_Query-dataset.yaml
rename to base/configs/superset/assets/datasets/Analytics/NCD_Missed_Appointments_Query-dataset.yaml
diff --git a/base/configs/superset/assets/datasets/PostgreSQL/NCD_Referral_Status_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/NCD_Referral_Status_Query-dataset.yaml
similarity index 100%
rename from base/configs/superset/assets/datasets/PostgreSQL/NCD_Referral_Status_Query-dataset.yaml
rename to base/configs/superset/assets/datasets/Analytics/NCD_Referral_Status_Query-dataset.yaml
diff --git a/base/configs/superset/assets/datasets/PostgreSQL/Patients_Screened_For_NCD_For_The_First_Time_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/Patients_Screened_For_NCD_For_The_First_Time_Query-dataset.yaml
similarity index 100%
rename from base/configs/superset/assets/datasets/PostgreSQL/Patients_Screened_For_NCD_For_The_First_Time_Query-dataset.yaml
rename to base/configs/superset/assets/datasets/Analytics/Patients_Screened_For_NCD_For_The_First_Time_Query-dataset.yaml
diff --git a/base/configs/superset/assets/datasets/PostgreSQL/Patients_Screened_for_CVD_Risk_Diabetes_and_Hypertension.yaml b/base/configs/superset/assets/datasets/Analytics/Patients_Screened_for_CVD_Risk_Diabetes_and_Hypertension.yaml
similarity index 100%
rename from base/configs/superset/assets/datasets/PostgreSQL/Patients_Screened_for_CVD_Risk_Diabetes_and_Hypertension.yaml
rename to base/configs/superset/assets/datasets/Analytics/Patients_Screened_for_CVD_Risk_Diabetes_and_Hypertension.yaml
diff --git a/base/configs/superset/assets/datasets/PostgreSQL/RC_CCS_Report_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/RC_CCS_Report_Query-dataset.yaml
similarity index 100%
rename from base/configs/superset/assets/datasets/PostgreSQL/RC_CCS_Report_Query-dataset.yaml
rename to base/configs/superset/assets/datasets/Analytics/RC_CCS_Report_Query-dataset.yaml
diff --git a/base/configs/superset/assets/datasets/PostgreSQL/RH_NCD_OPD_Register_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/RH_NCD_OPD_Register_Query-dataset.yaml
similarity index 100%
rename from base/configs/superset/assets/datasets/PostgreSQL/RH_NCD_OPD_Register_Query-dataset.yaml
rename to base/configs/superset/assets/datasets/Analytics/RH_NCD_OPD_Register_Query-dataset.yaml
diff --git a/base/configs/superset/assets/datasets/PostgreSQL/Women_Screened_For_Cervical_Cancer_For_The_First_Time_Query-dataset.yaml b/base/configs/superset/assets/datasets/Analytics/Women_Screened_For_Cervical_Cancer_For_The_First_Time_Query-dataset.yaml
similarity index 100%
rename from base/configs/superset/assets/datasets/PostgreSQL/Women_Screened_For_Cervical_Cancer_For_The_First_Time_Query-dataset.yaml
rename to base/configs/superset/assets/datasets/Analytics/Women_Screened_For_Cervical_Cancer_For_The_First_Time_Query-dataset.yaml