diff --git a/VERSION b/VERSION
index ec037313a5..05bfe2082f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-nursix-1.1.0-devel-1795-g6719344 (2015-01-05 12:01:23)
+78717e2 (2015-01-05 12:29:30)
\ No newline at end of file
diff --git a/private/templates/ADAT/24B.xls.Layout.csv b/modules/templates/ADAT/24B.xls.Layout.csv
similarity index 100%
rename from private/templates/ADAT/24B.xls.Layout.csv
rename to modules/templates/ADAT/24B.xls.Layout.csv
diff --git a/private/templates/ADAT/24B.xls.Question.csv b/modules/templates/ADAT/24B.xls.Question.csv
similarity index 100%
rename from private/templates/ADAT/24B.xls.Question.csv
rename to modules/templates/ADAT/24B.xls.Question.csv
diff --git a/private/templates/ADAT/72B.xls.Layout.csv b/modules/templates/ADAT/72B.xls.Layout.csv
similarity index 100%
rename from private/templates/ADAT/72B.xls.Layout.csv
rename to modules/templates/ADAT/72B.xls.Layout.csv
diff --git a/private/templates/ADAT/72B.xls.Question.csv b/modules/templates/ADAT/72B.xls.Question.csv
similarity index 100%
rename from private/templates/ADAT/72B.xls.Question.csv
rename to modules/templates/ADAT/72B.xls.Question.csv
diff --git a/private/templates/ADAT/Cyclone Guba (Oro Province) single spreadsheet import.xls b/modules/templates/ADAT/Cyclone Guba (Oro Province) single spreadsheet import.xls
similarity index 100%
rename from private/templates/ADAT/Cyclone Guba (Oro Province) single spreadsheet import.xls
rename to modules/templates/ADAT/Cyclone Guba (Oro Province) single spreadsheet import.xls
diff --git a/private/templates/ADAT/DANA Template 1.xls.Layout.csv b/modules/templates/ADAT/DANA Template 1.xls.Layout.csv
similarity index 100%
rename from private/templates/ADAT/DANA Template 1.xls.Layout.csv
rename to modules/templates/ADAT/DANA Template 1.xls.Layout.csv
diff --git a/private/templates/ADAT/DANA Template 1.xls.Question.csv b/modules/templates/ADAT/DANA Template 1.xls.Question.csv
similarity index 100%
rename from private/templates/ADAT/DANA Template 1.xls.Question.csv
rename to modules/templates/ADAT/DANA Template 1.xls.Question.csv
diff --git a/private/templates/ADAT/DANA Template 2.xls.Layout.csv b/modules/templates/ADAT/DANA Template 2.xls.Layout.csv
similarity index 100%
rename from private/templates/ADAT/DANA Template 2.xls.Layout.csv
rename to modules/templates/ADAT/DANA Template 2.xls.Layout.csv
diff --git a/private/templates/ADAT/DANA Template 2.xls.Question.csv b/modules/templates/ADAT/DANA Template 2.xls.Question.csv
similarity index 100%
rename from private/templates/ADAT/DANA Template 2.xls.Question.csv
rename to modules/templates/ADAT/DANA Template 2.xls.Question.csv
diff --git a/private/templates/ADAT/DANA Template 3.xls.Layout.csv b/modules/templates/ADAT/DANA Template 3.xls.Layout.csv
similarity index 100%
rename from private/templates/ADAT/DANA Template 3.xls.Layout.csv
rename to modules/templates/ADAT/DANA Template 3.xls.Layout.csv
diff --git a/private/templates/ADAT/DANA Template 3.xls.Question.csv b/modules/templates/ADAT/DANA Template 3.xls.Question.csv
similarity index 100%
rename from private/templates/ADAT/DANA Template 3.xls.Question.csv
rename to modules/templates/ADAT/DANA Template 3.xls.Question.csv
diff --git a/private/templates/ADAT/DANA Template 4.xls.Layout.csv b/modules/templates/ADAT/DANA Template 4.xls.Layout.csv
similarity index 100%
rename from private/templates/ADAT/DANA Template 4.xls.Layout.csv
rename to modules/templates/ADAT/DANA Template 4.xls.Layout.csv
diff --git a/private/templates/ADAT/DANA Template 4.xls.Question.csv b/modules/templates/ADAT/DANA Template 4.xls.Question.csv
similarity index 100%
rename from private/templates/ADAT/DANA Template 4.xls.Question.csv
rename to modules/templates/ADAT/DANA Template 4.xls.Question.csv
diff --git a/private/templates/ADAT/DANA Template 5.xls.Layout.csv b/modules/templates/ADAT/DANA Template 5.xls.Layout.csv
similarity index 100%
rename from private/templates/ADAT/DANA Template 5.xls.Layout.csv
rename to modules/templates/ADAT/DANA Template 5.xls.Layout.csv
diff --git a/private/templates/ADAT/DANA Template 5.xls.Question.csv b/modules/templates/ADAT/DANA Template 5.xls.Question.csv
similarity index 100%
rename from private/templates/ADAT/DANA Template 5.xls.Question.csv
rename to modules/templates/ADAT/DANA Template 5.xls.Question.csv
diff --git a/private/templates/ADAT/Emergency Damage and Needs.xls.Layout.csv b/modules/templates/ADAT/Emergency Damage and Needs.xls.Layout.csv
similarity index 100%
rename from private/templates/ADAT/Emergency Damage and Needs.xls.Layout.csv
rename to modules/templates/ADAT/Emergency Damage and Needs.xls.Layout.csv
diff --git a/private/templates/ADAT/Emergency Damage and Needs.xls.Question.csv b/modules/templates/ADAT/Emergency Damage and Needs.xls.Question.csv
similarity index 100%
rename from private/templates/ADAT/Emergency Damage and Needs.xls.Question.csv
rename to modules/templates/ADAT/Emergency Damage and Needs.xls.Question.csv
diff --git a/private/templates/ADAT/KAP.xls.Layout.csv b/modules/templates/ADAT/KAP.xls.Layout.csv
similarity index 100%
rename from private/templates/ADAT/KAP.xls.Layout.csv
rename to modules/templates/ADAT/KAP.xls.Layout.csv
diff --git a/private/templates/ADAT/KAP.xls.Question.csv b/modules/templates/ADAT/KAP.xls.Question.csv
similarity index 100%
rename from private/templates/ADAT/KAP.xls.Question.csv
rename to modules/templates/ADAT/KAP.xls.Question.csv
diff --git a/private/templates/ADAT/MCRS-Annex1.xls.Layout.csv b/modules/templates/ADAT/MCRS-Annex1.xls.Layout.csv
similarity index 100%
rename from private/templates/ADAT/MCRS-Annex1.xls.Layout.csv
rename to modules/templates/ADAT/MCRS-Annex1.xls.Layout.csv
diff --git a/private/templates/ADAT/MCRS-Annex1.xls.Question.csv b/modules/templates/ADAT/MCRS-Annex1.xls.Question.csv
similarity index 100%
rename from private/templates/ADAT/MCRS-Annex1.xls.Question.csv
rename to modules/templates/ADAT/MCRS-Annex1.xls.Question.csv
diff --git a/private/templates/ADAT/PHT.xls.Layout.csv b/modules/templates/ADAT/PHT.xls.Layout.csv
similarity index 100%
rename from private/templates/ADAT/PHT.xls.Layout.csv
rename to modules/templates/ADAT/PHT.xls.Layout.csv
diff --git a/private/templates/ADAT/PHT.xls.Question.csv b/modules/templates/ADAT/PHT.xls.Question.csv
similarity index 100%
rename from private/templates/ADAT/PHT.xls.Question.csv
rename to modules/templates/ADAT/PHT.xls.Question.csv
diff --git a/private/templates/ADAT/PMI.xls.Layout.csv b/modules/templates/ADAT/PMI.xls.Layout.csv
similarity index 100%
rename from private/templates/ADAT/PMI.xls.Layout.csv
rename to modules/templates/ADAT/PMI.xls.Layout.csv
diff --git a/private/templates/ADAT/PMI.xls.Question.csv b/modules/templates/ADAT/PMI.xls.Question.csv
similarity index 100%
rename from private/templates/ADAT/PMI.xls.Question.csv
rename to modules/templates/ADAT/PMI.xls.Question.csv
diff --git a/private/templates/ADAT/Padang Earthquake 2011 (24H B).csv b/modules/templates/ADAT/Padang Earthquake 2011 (24H B).csv
similarity index 100%
rename from private/templates/ADAT/Padang Earthquake 2011 (24H B).csv
rename to modules/templates/ADAT/Padang Earthquake 2011 (24H B).csv
diff --git a/private/templates/ADAT/Padang Earthquake 2011 (72H B).csv b/modules/templates/ADAT/Padang Earthquake 2011 (72H B).csv
similarity index 100%
rename from private/templates/ADAT/Padang Earthquake 2011 (72H B).csv
rename to modules/templates/ADAT/Padang Earthquake 2011 (72H B).csv
diff --git a/private/templates/ADAT/Padang Earthquake 2011 (PMI).csv b/modules/templates/ADAT/Padang Earthquake 2011 (PMI).csv
similarity index 100%
rename from private/templates/ADAT/Padang Earthquake 2011 (PMI).csv
rename to modules/templates/ADAT/Padang Earthquake 2011 (PMI).csv
diff --git a/private/templates/ADAT/Tropical Storm Bulegila 2012(24H B)-Data.csv b/modules/templates/ADAT/Tropical Storm Bulegila 2012(24H B)-Data.csv
similarity index 100%
rename from private/templates/ADAT/Tropical Storm Bulegila 2012(24H B)-Data.csv
rename to modules/templates/ADAT/Tropical Storm Bulegila 2012(24H B)-Data.csv
diff --git a/private/templates/ADAT/questionnaireMRCS.csv b/modules/templates/ADAT/questionnaireMRCS.csv
similarity index 100%
rename from private/templates/ADAT/questionnaireMRCS.csv
rename to modules/templates/ADAT/questionnaireMRCS.csv
diff --git a/private/templates/ADAT/survey_roles.csv b/modules/templates/ADAT/survey_roles.csv
similarity index 100%
rename from private/templates/ADAT/survey_roles.csv
rename to modules/templates/ADAT/survey_roles.csv
diff --git a/private/templates/ADAT/survey_users.csv b/modules/templates/ADAT/survey_users.csv
similarity index 100%
rename from private/templates/ADAT/survey_users.csv
rename to modules/templates/ADAT/survey_users.csv
diff --git a/private/templates/ADAT/tasks.cfg b/modules/templates/ADAT/tasks.cfg
similarity index 100%
rename from private/templates/ADAT/tasks.cfg
rename to modules/templates/ADAT/tasks.cfg
diff --git a/private/templates/ARC/24B.xls.Question.csv b/modules/templates/ARC/24B.xls.Question.csv
similarity index 100%
rename from private/templates/ARC/24B.xls.Question.csv
rename to modules/templates/ARC/24B.xls.Question.csv
diff --git a/private/templates/ARC/Demo/budget_budget.csv b/modules/templates/ARC/Demo/budget_budget.csv
similarity index 100%
rename from private/templates/ARC/Demo/budget_budget.csv
rename to modules/templates/ARC/Demo/budget_budget.csv
diff --git a/private/templates/ARC/Demo/budget_location.csv b/modules/templates/ARC/Demo/budget_location.csv
similarity index 100%
rename from private/templates/ARC/Demo/budget_location.csv
rename to modules/templates/ARC/Demo/budget_location.csv
diff --git a/private/templates/ARC/Demo/budget_staff.csv b/modules/templates/ARC/Demo/budget_staff.csv
similarity index 100%
rename from private/templates/ARC/Demo/budget_staff.csv
rename to modules/templates/ARC/Demo/budget_staff.csv
diff --git a/private/templates/ARC/Demo/cms_post.csv b/modules/templates/ARC/Demo/cms_post.csv
similarity index 100%
rename from private/templates/ARC/Demo/cms_post.csv
rename to modules/templates/ARC/Demo/cms_post.csv
diff --git a/private/templates/ARC/Demo/cms_post_1.csv b/modules/templates/ARC/Demo/cms_post_1.csv
similarity index 100%
rename from private/templates/ARC/Demo/cms_post_1.csv
rename to modules/templates/ARC/Demo/cms_post_1.csv
diff --git a/private/templates/ARC/Demo/cms_post_2.csv b/modules/templates/ARC/Demo/cms_post_2.csv
similarity index 100%
rename from private/templates/ARC/Demo/cms_post_2.csv
rename to modules/templates/ARC/Demo/cms_post_2.csv
diff --git a/private/templates/ARC/Demo/cms_post_3.csv b/modules/templates/ARC/Demo/cms_post_3.csv
similarity index 100%
rename from private/templates/ARC/Demo/cms_post_3.csv
rename to modules/templates/ARC/Demo/cms_post_3.csv
diff --git a/private/templates/ARC/Demo/cms_post_x.csv b/modules/templates/ARC/Demo/cms_post_x.csv
similarity index 100%
rename from private/templates/ARC/Demo/cms_post_x.csv
rename to modules/templates/ARC/Demo/cms_post_x.csv
diff --git a/private/templates/ARC/Demo/cms_series.csv b/modules/templates/ARC/Demo/cms_series.csv
similarity index 100%
rename from private/templates/ARC/Demo/cms_series.csv
rename to modules/templates/ARC/Demo/cms_series.csv
diff --git a/private/templates/ARC/Demo/cr_shelter.csv b/modules/templates/ARC/Demo/cr_shelter.csv
similarity index 100%
rename from private/templates/ARC/Demo/cr_shelter.csv
rename to modules/templates/ARC/Demo/cr_shelter.csv
diff --git a/private/templates/ARC/Demo/deploy_mission.csv b/modules/templates/ARC/Demo/deploy_mission.csv
similarity index 100%
rename from private/templates/ARC/Demo/deploy_mission.csv
rename to modules/templates/ARC/Demo/deploy_mission.csv
diff --git a/private/templates/ARC/Demo/doc_sitrep.csv b/modules/templates/ARC/Demo/doc_sitrep.csv
similarity index 100%
rename from private/templates/ARC/Demo/doc_sitrep.csv
rename to modules/templates/ARC/Demo/doc_sitrep.csv
diff --git a/private/templates/ARC/Demo/event_asset.csv b/modules/templates/ARC/Demo/event_asset.csv
similarity index 100%
rename from private/templates/ARC/Demo/event_asset.csv
rename to modules/templates/ARC/Demo/event_asset.csv
diff --git a/private/templates/ARC/Demo/event_asset_2.csv b/modules/templates/ARC/Demo/event_asset_2.csv
similarity index 100%
rename from private/templates/ARC/Demo/event_asset_2.csv
rename to modules/templates/ARC/Demo/event_asset_2.csv
diff --git a/private/templates/ARC/Demo/event_human_resource.csv b/modules/templates/ARC/Demo/event_human_resource.csv
similarity index 100%
rename from private/templates/ARC/Demo/event_human_resource.csv
rename to modules/templates/ARC/Demo/event_human_resource.csv
diff --git a/private/templates/ARC/Demo/event_human_resource_2.csv b/modules/templates/ARC/Demo/event_human_resource_2.csv
similarity index 100%
rename from private/templates/ARC/Demo/event_human_resource_2.csv
rename to modules/templates/ARC/Demo/event_human_resource_2.csv
diff --git a/private/templates/ARC/Demo/event_incident_report.csv b/modules/templates/ARC/Demo/event_incident_report.csv
similarity index 100%
rename from private/templates/ARC/Demo/event_incident_report.csv
rename to modules/templates/ARC/Demo/event_incident_report.csv
diff --git a/private/templates/ARC/Demo/event_organisation.csv b/modules/templates/ARC/Demo/event_organisation.csv
similarity index 100%
rename from private/templates/ARC/Demo/event_organisation.csv
rename to modules/templates/ARC/Demo/event_organisation.csv
diff --git a/private/templates/ARC/Demo/event_site.csv b/modules/templates/ARC/Demo/event_site.csv
similarity index 100%
rename from private/templates/ARC/Demo/event_site.csv
rename to modules/templates/ARC/Demo/event_site.csv
diff --git a/private/templates/ARC/Demo/event_site_2.csv b/modules/templates/ARC/Demo/event_site_2.csv
similarity index 100%
rename from private/templates/ARC/Demo/event_site_2.csv
rename to modules/templates/ARC/Demo/event_site_2.csv
diff --git a/private/templates/ARC/Demo/org_facility.csv b/modules/templates/ARC/Demo/org_facility.csv
similarity index 100%
rename from private/templates/ARC/Demo/org_facility.csv
rename to modules/templates/ARC/Demo/org_facility.csv
diff --git a/private/templates/ARC/Demo/org_resource.csv b/modules/templates/ARC/Demo/org_resource.csv
similarity index 100%
rename from private/templates/ARC/Demo/org_resource.csv
rename to modules/templates/ARC/Demo/org_resource.csv
diff --git a/private/templates/ARC/Demo/org_resource_type.csv b/modules/templates/ARC/Demo/org_resource_type.csv
similarity index 100%
rename from private/templates/ARC/Demo/org_resource_type.csv
rename to modules/templates/ARC/Demo/org_resource_type.csv
diff --git a/private/templates/ARC/Demo/organisation.csv b/modules/templates/ARC/Demo/organisation.csv
similarity index 100%
rename from private/templates/ARC/Demo/organisation.csv
rename to modules/templates/ARC/Demo/organisation.csv
diff --git a/private/templates/ARC/Demo/pr_subscription.csv b/modules/templates/ARC/Demo/pr_subscription.csv
similarity index 100%
rename from private/templates/ARC/Demo/pr_subscription.csv
rename to modules/templates/ARC/Demo/pr_subscription.csv
diff --git a/private/templates/ARC/Demo/req_item.csv b/modules/templates/ARC/Demo/req_item.csv
similarity index 100%
rename from private/templates/ARC/Demo/req_item.csv
rename to modules/templates/ARC/Demo/req_item.csv
diff --git a/private/templates/ARC/Demo/req_req.csv b/modules/templates/ARC/Demo/req_req.csv
similarity index 100%
rename from private/templates/ARC/Demo/req_req.csv
rename to modules/templates/ARC/Demo/req_req.csv
diff --git a/private/templates/ARC/Demo/sitrep.csv b/modules/templates/ARC/Demo/sitrep.csv
similarity index 100%
rename from private/templates/ARC/Demo/sitrep.csv
rename to modules/templates/ARC/Demo/sitrep.csv
diff --git a/private/templates/ARC/Demo/staff.csv b/modules/templates/ARC/Demo/staff.csv
similarity index 100%
rename from private/templates/ARC/Demo/staff.csv
rename to modules/templates/ARC/Demo/staff.csv
diff --git a/private/templates/ARC/Demo/supply_catalog_item.csv b/modules/templates/ARC/Demo/supply_catalog_item.csv
similarity index 100%
rename from private/templates/ARC/Demo/supply_catalog_item.csv
rename to modules/templates/ARC/Demo/supply_catalog_item.csv
diff --git a/private/templates/ARC/Demo/survey_complete.csv b/modules/templates/ARC/Demo/survey_complete.csv
similarity index 100%
rename from private/templates/ARC/Demo/survey_complete.csv
rename to modules/templates/ARC/Demo/survey_complete.csv
diff --git a/private/templates/ARC/Demo/tasks.cfg b/modules/templates/ARC/Demo/tasks.cfg
similarity index 100%
rename from private/templates/ARC/Demo/tasks.cfg
rename to modules/templates/ARC/Demo/tasks.cfg
diff --git a/private/templates/ARC/Demo/users.csv b/modules/templates/ARC/Demo/users.csv
similarity index 100%
rename from private/templates/ARC/Demo/users.csv
rename to modules/templates/ARC/Demo/users.csv
diff --git a/private/templates/ARC/Demo/vulnerability_risk.csv b/modules/templates/ARC/Demo/vulnerability_risk.csv
similarity index 100%
rename from private/templates/ARC/Demo/vulnerability_risk.csv
rename to modules/templates/ARC/Demo/vulnerability_risk.csv
diff --git a/private/templates/ARC/SkillCompetency.csv b/modules/templates/ARC/SkillCompetency.csv
similarity index 100%
rename from private/templates/ARC/SkillCompetency.csv
rename to modules/templates/ARC/SkillCompetency.csv
diff --git a/private/templates/ARC/SkillList.csv b/modules/templates/ARC/SkillList.csv
similarity index 100%
rename from private/templates/ARC/SkillList.csv
rename to modules/templates/ARC/SkillList.csv
diff --git a/private/templates/ARC/__init__.py b/modules/templates/ARC/__init__.py
similarity index 100%
rename from private/templates/ARC/__init__.py
rename to modules/templates/ARC/__init__.py
diff --git a/private/templates/ARC/auth_roles.csv b/modules/templates/ARC/auth_roles.csv
similarity index 100%
rename from private/templates/ARC/auth_roles.csv
rename to modules/templates/ARC/auth_roles.csv
diff --git a/private/templates/ARC/config.py b/modules/templates/ARC/config.py
similarity index 100%
rename from private/templates/ARC/config.py
rename to modules/templates/ARC/config.py
diff --git a/private/templates/ARC/controllers.py b/modules/templates/ARC/controllers.py
similarity index 100%
rename from private/templates/ARC/controllers.py
rename to modules/templates/ARC/controllers.py
diff --git a/private/templates/ARC/cr_shelter.csv b/modules/templates/ARC/cr_shelter.csv
similarity index 100%
rename from private/templates/ARC/cr_shelter.csv
rename to modules/templates/ARC/cr_shelter.csv
diff --git a/private/templates/ARC/cr_shelter_service.csv b/modules/templates/ARC/cr_shelter_service.csv
similarity index 100%
rename from private/templates/ARC/cr_shelter_service.csv
rename to modules/templates/ARC/cr_shelter_service.csv
diff --git a/private/templates/ARC/cr_shelter_type.csv b/modules/templates/ARC/cr_shelter_type.csv
similarity index 100%
rename from private/templates/ARC/cr_shelter_type.csv
rename to modules/templates/ARC/cr_shelter_type.csv
diff --git a/private/templates/ARC/css.cfg b/modules/templates/ARC/css.cfg
similarity index 100%
rename from private/templates/ARC/css.cfg
rename to modules/templates/ARC/css.cfg
diff --git a/private/templates/ARC/event_event_type.csv b/modules/templates/ARC/event_event_type.csv
similarity index 100%
rename from private/templates/ARC/event_event_type.csv
rename to modules/templates/ARC/event_event_type.csv
diff --git a/private/templates/ARC/event_incident_type.csv b/modules/templates/ARC/event_incident_type.csv
similarity index 100%
rename from private/templates/ARC/event_incident_type.csv
rename to modules/templates/ARC/event_incident_type.csv
diff --git a/private/templates/ARC/gis_config.csv b/modules/templates/ARC/gis_config.csv
similarity index 100%
rename from private/templates/ARC/gis_config.csv
rename to modules/templates/ARC/gis_config.csv
diff --git a/private/templates/ARC/gis_hierarchy.csv b/modules/templates/ARC/gis_hierarchy.csv
similarity index 100%
rename from private/templates/ARC/gis_hierarchy.csv
rename to modules/templates/ARC/gis_hierarchy.csv
diff --git a/private/templates/ARC/gis_layer_feature.csv b/modules/templates/ARC/gis_layer_feature.csv
similarity index 100%
rename from private/templates/ARC/gis_layer_feature.csv
rename to modules/templates/ARC/gis_layer_feature.csv
diff --git a/private/templates/ARC/gis_marker.csv b/modules/templates/ARC/gis_marker.csv
similarity index 100%
rename from private/templates/ARC/gis_marker.csv
rename to modules/templates/ARC/gis_marker.csv
diff --git a/private/templates/ARC/gis_poi_type.csv b/modules/templates/ARC/gis_poi_type.csv
similarity index 100%
rename from private/templates/ARC/gis_poi_type.csv
rename to modules/templates/ARC/gis_poi_type.csv
diff --git a/private/templates/ARC/hrm_department.csv b/modules/templates/ARC/hrm_department.csv
similarity index 100%
rename from private/templates/ARC/hrm_department.csv
rename to modules/templates/ARC/hrm_department.csv
diff --git a/private/templates/ARC/hrm_job_title.csv b/modules/templates/ARC/hrm_job_title.csv
similarity index 100%
rename from private/templates/ARC/hrm_job_title.csv
rename to modules/templates/ARC/hrm_job_title.csv
diff --git a/private/templates/ARC/inv_warehouse.csv b/modules/templates/ARC/inv_warehouse.csv
similarity index 100%
rename from private/templates/ARC/inv_warehouse.csv
rename to modules/templates/ARC/inv_warehouse.csv
diff --git a/private/templates/ARC/layouts.py b/modules/templates/ARC/layouts.py
similarity index 100%
rename from private/templates/ARC/layouts.py
rename to modules/templates/ARC/layouts.py
diff --git a/private/templates/ARC/menus.py b/modules/templates/ARC/menus.py
similarity index 100%
rename from private/templates/ARC/menus.py
rename to modules/templates/ARC/menus.py
diff --git a/private/templates/ARC/org_facility.csv b/modules/templates/ARC/org_facility.csv
similarity index 100%
rename from private/templates/ARC/org_facility.csv
rename to modules/templates/ARC/org_facility.csv
diff --git a/private/templates/ARC/org_facility_type.csv b/modules/templates/ARC/org_facility_type.csv
similarity index 100%
rename from private/templates/ARC/org_facility_type.csv
rename to modules/templates/ARC/org_facility_type.csv
diff --git a/private/templates/ARC/org_logos.csv b/modules/templates/ARC/org_logos.csv
similarity index 100%
rename from private/templates/ARC/org_logos.csv
rename to modules/templates/ARC/org_logos.csv
diff --git a/private/templates/ARC/org_office.csv b/modules/templates/ARC/org_office.csv
similarity index 100%
rename from private/templates/ARC/org_office.csv
rename to modules/templates/ARC/org_office.csv
diff --git a/private/templates/ARC/org_office_type.csv b/modules/templates/ARC/org_office_type.csv
similarity index 100%
rename from private/templates/ARC/org_office_type.csv
rename to modules/templates/ARC/org_office_type.csv
diff --git a/private/templates/ARC/org_region.csv b/modules/templates/ARC/org_region.csv
similarity index 100%
rename from private/templates/ARC/org_region.csv
rename to modules/templates/ARC/org_region.csv
diff --git a/private/templates/ARC/organisation.csv b/modules/templates/ARC/organisation.csv
similarity index 100%
rename from private/templates/ARC/organisation.csv
rename to modules/templates/ARC/organisation.csv
diff --git a/private/templates/ARC/tasks.cfg b/modules/templates/ARC/tasks.cfg
similarity index 100%
rename from private/templates/ARC/tasks.cfg
rename to modules/templates/ARC/tasks.cfg
diff --git a/private/templates/ARC/vehicle_type.csv b/modules/templates/ARC/vehicle_type.csv
similarity index 100%
rename from private/templates/ARC/vehicle_type.csv
rename to modules/templates/ARC/vehicle_type.csv
diff --git a/private/templates/ARC/vehicle_vehicle.csv b/modules/templates/ARC/vehicle_vehicle.csv
similarity index 100%
rename from private/templates/ARC/vehicle_vehicle.csv
rename to modules/templates/ARC/vehicle_vehicle.csv
diff --git a/private/templates/ARC/views/_plain.html b/modules/templates/ARC/views/_plain.html
similarity index 100%
rename from private/templates/ARC/views/_plain.html
rename to modules/templates/ARC/views/_plain.html
diff --git a/private/templates/ARC/views/index.html b/modules/templates/ARC/views/index.html
similarity index 100%
rename from private/templates/ARC/views/index.html
rename to modules/templates/ARC/views/index.html
diff --git a/private/templates/ARC/views/layout.html b/modules/templates/ARC/views/layout.html
similarity index 100%
rename from private/templates/ARC/views/layout.html
rename to modules/templates/ARC/views/layout.html
diff --git a/private/templates/ARC/views/newsfeed2.html b/modules/templates/ARC/views/newsfeed2.html
similarity index 100%
rename from private/templates/ARC/views/newsfeed2.html
rename to modules/templates/ARC/views/newsfeed2.html
diff --git a/private/templates/ARC/views/subscriptions.html b/modules/templates/ARC/views/subscriptions.html
similarity index 100%
rename from private/templates/ARC/views/subscriptions.html
rename to modules/templates/ARC/views/subscriptions.html
diff --git a/private/templates/CAP/__init__.py b/modules/templates/CAP/__init__.py
similarity index 100%
rename from private/templates/CAP/__init__.py
rename to modules/templates/CAP/__init__.py
diff --git a/private/templates/CAP/cap_alert.csv b/modules/templates/CAP/cap_alert.csv
similarity index 100%
rename from private/templates/CAP/cap_alert.csv
rename to modules/templates/CAP/cap_alert.csv
diff --git a/private/templates/CAP/config.py b/modules/templates/CAP/config.py
similarity index 100%
rename from private/templates/CAP/config.py
rename to modules/templates/CAP/config.py
diff --git a/private/templates/CAP/controllers.py b/modules/templates/CAP/controllers.py
similarity index 100%
rename from private/templates/CAP/controllers.py
rename to modules/templates/CAP/controllers.py
diff --git a/private/templates/CAP/gis_layer_feature.csv b/modules/templates/CAP/gis_layer_feature.csv
similarity index 100%
rename from private/templates/CAP/gis_layer_feature.csv
rename to modules/templates/CAP/gis_layer_feature.csv
diff --git a/private/templates/CAP/gis_marker.csv b/modules/templates/CAP/gis_marker.csv
similarity index 100%
rename from private/templates/CAP/gis_marker.csv
rename to modules/templates/CAP/gis_marker.csv
diff --git a/private/templates/CAP/parser.py b/modules/templates/CAP/parser.py
similarity index 100%
rename from private/templates/CAP/parser.py
rename to modules/templates/CAP/parser.py
diff --git a/private/templates/CAP/tasks.cfg b/modules/templates/CAP/tasks.cfg
similarity index 100%
rename from private/templates/CAP/tasks.cfg
rename to modules/templates/CAP/tasks.cfg
diff --git a/private/templates/CAP/views/subscriptions.html b/modules/templates/CAP/views/subscriptions.html
similarity index 100%
rename from private/templates/CAP/views/subscriptions.html
rename to modules/templates/CAP/views/subscriptions.html
diff --git a/private/templates/CERT/__init__.py b/modules/templates/CERT/__init__.py
similarity index 100%
rename from private/templates/CERT/__init__.py
rename to modules/templates/CERT/__init__.py
diff --git a/private/templates/CERT/certificate.csv b/modules/templates/CERT/certificate.csv
similarity index 100%
rename from private/templates/CERT/certificate.csv
rename to modules/templates/CERT/certificate.csv
diff --git a/private/templates/CERT/certificate_skill.csv b/modules/templates/CERT/certificate_skill.csv
similarity index 100%
rename from private/templates/CERT/certificate_skill.csv
rename to modules/templates/CERT/certificate_skill.csv
diff --git a/private/templates/CERT/config.py b/modules/templates/CERT/config.py
similarity index 100%
rename from private/templates/CERT/config.py
rename to modules/templates/CERT/config.py
diff --git a/private/templates/CERT/controllers.py b/modules/templates/CERT/controllers.py
similarity index 100%
rename from private/templates/CERT/controllers.py
rename to modules/templates/CERT/controllers.py
diff --git a/private/templates/CERT/course.csv b/modules/templates/CERT/course.csv
similarity index 100%
rename from private/templates/CERT/course.csv
rename to modules/templates/CERT/course.csv
diff --git a/private/templates/CERT/css.cfg b/modules/templates/CERT/css.cfg
similarity index 100%
rename from private/templates/CERT/css.cfg
rename to modules/templates/CERT/css.cfg
diff --git a/private/templates/CERT/menus.py b/modules/templates/CERT/menus.py
similarity index 100%
rename from private/templates/CERT/menus.py
rename to modules/templates/CERT/menus.py
diff --git a/private/templates/CERT/organisation.csv b/modules/templates/CERT/organisation.csv
similarity index 100%
rename from private/templates/CERT/organisation.csv
rename to modules/templates/CERT/organisation.csv
diff --git a/private/templates/CERT/people.csv b/modules/templates/CERT/people.csv
similarity index 100%
rename from private/templates/CERT/people.csv
rename to modules/templates/CERT/people.csv
diff --git a/private/templates/CERT/tasks.cfg b/modules/templates/CERT/tasks.cfg
similarity index 100%
rename from private/templates/CERT/tasks.cfg
rename to modules/templates/CERT/tasks.cfg
diff --git a/private/templates/CERT/training.csv b/modules/templates/CERT/training.csv
similarity index 100%
rename from private/templates/CERT/training.csv
rename to modules/templates/CERT/training.csv
diff --git a/private/templates/CERT/views/footer.html b/modules/templates/CERT/views/footer.html
similarity index 100%
rename from private/templates/CERT/views/footer.html
rename to modules/templates/CERT/views/footer.html
diff --git a/private/templates/CERT/views/index.html b/modules/templates/CERT/views/index.html
similarity index 100%
rename from private/templates/CERT/views/index.html
rename to modules/templates/CERT/views/index.html
diff --git a/private/templates/CERT/views/layout.html b/modules/templates/CERT/views/layout.html
similarity index 100%
rename from private/templates/CERT/views/layout.html
rename to modules/templates/CERT/views/layout.html
diff --git a/private/templates/CRMT/Demo/LMS_sample_orgs.csv b/modules/templates/CRMT/Demo/LMS_sample_orgs.csv
similarity index 100%
rename from private/templates/CRMT/Demo/LMS_sample_orgs.csv
rename to modules/templates/CRMT/Demo/LMS_sample_orgs.csv
diff --git a/private/templates/CRMT2/Demo/activity.csv b/modules/templates/CRMT/Demo/activity.csv
similarity index 100%
rename from private/templates/CRMT2/Demo/activity.csv
rename to modules/templates/CRMT/Demo/activity.csv
diff --git a/private/templates/CRMT2/Demo/auth_roles_demo.csv b/modules/templates/CRMT/Demo/auth_roles_demo.csv
similarity index 100%
rename from private/templates/CRMT2/Demo/auth_roles_demo.csv
rename to modules/templates/CRMT/Demo/auth_roles_demo.csv
diff --git a/private/templates/CRMT2/Demo/import_lms.py b/modules/templates/CRMT/Demo/import_lms.py
similarity index 100%
rename from private/templates/CRMT2/Demo/import_lms.py
rename to modules/templates/CRMT/Demo/import_lms.py
diff --git a/private/templates/CRMT/Demo/organisation.csv b/modules/templates/CRMT/Demo/organisation.csv
similarity index 100%
rename from private/templates/CRMT/Demo/organisation.csv
rename to modules/templates/CRMT/Demo/organisation.csv
diff --git a/private/templates/CRMT2/Demo/tasks.cfg b/modules/templates/CRMT/Demo/tasks.cfg
similarity index 100%
rename from private/templates/CRMT2/Demo/tasks.cfg
rename to modules/templates/CRMT/Demo/tasks.cfg
diff --git a/private/templates/CRMT/Demo/users.csv b/modules/templates/CRMT/Demo/users.csv
similarity index 100%
rename from private/templates/CRMT/Demo/users.csv
rename to modules/templates/CRMT/Demo/users.csv
diff --git a/private/templates/CRMT/__init__.py b/modules/templates/CRMT/__init__.py
similarity index 100%
rename from private/templates/CRMT/__init__.py
rename to modules/templates/CRMT/__init__.py
diff --git a/private/templates/CRMT/activity_type.csv b/modules/templates/CRMT/activity_type.csv
similarity index 100%
rename from private/templates/CRMT/activity_type.csv
rename to modules/templates/CRMT/activity_type.csv
diff --git a/private/templates/CRMT2/auth_roles.csv b/modules/templates/CRMT/auth_roles.csv
similarity index 100%
rename from private/templates/CRMT2/auth_roles.csv
rename to modules/templates/CRMT/auth_roles.csv
diff --git a/private/templates/CRMT2/cms_post.csv b/modules/templates/CRMT/cms_post.csv
similarity index 100%
rename from private/templates/CRMT2/cms_post.csv
rename to modules/templates/CRMT/cms_post.csv
diff --git a/private/templates/CRMT2/cms_series.csv b/modules/templates/CRMT/cms_series.csv
similarity index 100%
rename from private/templates/CRMT2/cms_series.csv
rename to modules/templates/CRMT/cms_series.csv
diff --git a/private/templates/CRMT2/cms_tag.csv b/modules/templates/CRMT/cms_tag.csv
similarity index 100%
rename from private/templates/CRMT2/cms_tag.csv
rename to modules/templates/CRMT/cms_tag.csv
diff --git a/private/templates/CRMT2/config.py b/modules/templates/CRMT/config.py
similarity index 100%
rename from private/templates/CRMT2/config.py
rename to modules/templates/CRMT/config.py
diff --git a/private/templates/CRMT2/controllers.py b/modules/templates/CRMT/controllers.py
similarity index 100%
rename from private/templates/CRMT2/controllers.py
rename to modules/templates/CRMT/controllers.py
diff --git a/private/templates/CRMT2/css.cfg b/modules/templates/CRMT/css.cfg
similarity index 100%
rename from private/templates/CRMT2/css.cfg
rename to modules/templates/CRMT/css.cfg
diff --git a/private/templates/CRMT2/facility.csv b/modules/templates/CRMT/facility.csv
similarity index 100%
rename from private/templates/CRMT2/facility.csv
rename to modules/templates/CRMT/facility.csv
diff --git a/private/templates/CRMT/facility_type.csv b/modules/templates/CRMT/facility_type.csv
similarity index 100%
rename from private/templates/CRMT/facility_type.csv
rename to modules/templates/CRMT/facility_type.csv
diff --git a/private/templates/CRMT2/gis_config.csv b/modules/templates/CRMT/gis_config.csv
similarity index 100%
rename from private/templates/CRMT2/gis_config.csv
rename to modules/templates/CRMT/gis_config.csv
diff --git a/private/templates/CRMT/gis_hierarchy.csv b/modules/templates/CRMT/gis_hierarchy.csv
similarity index 100%
rename from private/templates/CRMT/gis_hierarchy.csv
rename to modules/templates/CRMT/gis_hierarchy.csv
diff --git a/private/templates/CRMT/gis_layer_coordinate.csv b/modules/templates/CRMT/gis_layer_coordinate.csv
similarity index 100%
rename from private/templates/CRMT/gis_layer_coordinate.csv
rename to modules/templates/CRMT/gis_layer_coordinate.csv
diff --git a/private/templates/CRMT2/gis_layer_feature.csv b/modules/templates/CRMT/gis_layer_feature.csv
similarity index 100%
rename from private/templates/CRMT2/gis_layer_feature.csv
rename to modules/templates/CRMT/gis_layer_feature.csv
diff --git a/private/templates/CRMT/gis_layer_feature_census.csv b/modules/templates/CRMT/gis_layer_feature_census.csv
similarity index 100%
rename from private/templates/CRMT/gis_layer_feature_census.csv
rename to modules/templates/CRMT/gis_layer_feature_census.csv
diff --git a/private/templates/CRMT2/gis_layer_feature_coalitions.csv b/modules/templates/CRMT/gis_layer_feature_coalitions.csv
similarity index 100%
rename from private/templates/CRMT2/gis_layer_feature_coalitions.csv
rename to modules/templates/CRMT/gis_layer_feature_coalitions.csv
diff --git a/private/templates/CRMT/gis_layer_feature_hazards.csv b/modules/templates/CRMT/gis_layer_feature_hazards.csv
similarity index 100%
rename from private/templates/CRMT/gis_layer_feature_hazards.csv
rename to modules/templates/CRMT/gis_layer_feature_hazards.csv
diff --git a/private/templates/CRMT/gis_layer_google.csv b/modules/templates/CRMT/gis_layer_google.csv
similarity index 100%
rename from private/templates/CRMT/gis_layer_google.csv
rename to modules/templates/CRMT/gis_layer_google.csv
diff --git a/private/templates/CRMT/gis_layer_kml.csv b/modules/templates/CRMT/gis_layer_kml.csv
similarity index 100%
rename from private/templates/CRMT/gis_layer_kml.csv
rename to modules/templates/CRMT/gis_layer_kml.csv
diff --git a/private/templates/CRMT/gis_layer_openstreetmap.csv b/modules/templates/CRMT/gis_layer_openstreetmap.csv
similarity index 100%
rename from private/templates/CRMT/gis_layer_openstreetmap.csv
rename to modules/templates/CRMT/gis_layer_openstreetmap.csv
diff --git a/private/templates/CRMT/gis_layer_wfs.csv b/modules/templates/CRMT/gis_layer_wfs.csv
similarity index 100%
rename from private/templates/CRMT/gis_layer_wfs.csv
rename to modules/templates/CRMT/gis_layer_wfs.csv
diff --git a/private/templates/CRMT2/gis_layer_wms.csv b/modules/templates/CRMT/gis_layer_wms.csv
similarity index 100%
rename from private/templates/CRMT2/gis_layer_wms.csv
rename to modules/templates/CRMT/gis_layer_wms.csv
diff --git a/private/templates/CRMT2/gis_marker.csv b/modules/templates/CRMT/gis_marker.csv
similarity index 100%
rename from private/templates/CRMT2/gis_marker.csv
rename to modules/templates/CRMT/gis_marker.csv
diff --git a/private/templates/CRMT2/gis_poi_type.csv b/modules/templates/CRMT/gis_poi_type.csv
similarity index 100%
rename from private/templates/CRMT2/gis_poi_type.csv
rename to modules/templates/CRMT/gis_poi_type.csv
diff --git a/private/templates/CRMT2/incident_report.csv b/modules/templates/CRMT/incident_report.csv
similarity index 100%
rename from private/templates/CRMT2/incident_report.csv
rename to modules/templates/CRMT/incident_report.csv
diff --git a/private/templates/CRMT/incident_type.csv b/modules/templates/CRMT/incident_type.csv
similarity index 100%
rename from private/templates/CRMT/incident_type.csv
rename to modules/templates/CRMT/incident_type.csv
diff --git a/private/templates/CRMT2/menus.py b/modules/templates/CRMT/menus.py
similarity index 100%
rename from private/templates/CRMT2/menus.py
rename to modules/templates/CRMT/menus.py
diff --git a/private/templates/CRMT2/org_group.csv b/modules/templates/CRMT/org_group.csv
similarity index 100%
rename from private/templates/CRMT2/org_group.csv
rename to modules/templates/CRMT/org_group.csv
diff --git a/private/templates/CRMT/org_group_membership_status.csv b/modules/templates/CRMT/org_group_membership_status.csv
similarity index 100%
rename from private/templates/CRMT/org_group_membership_status.csv
rename to modules/templates/CRMT/org_group_membership_status.csv
diff --git a/private/templates/CRMT2/org_group_person_status.csv b/modules/templates/CRMT/org_group_person_status.csv
similarity index 100%
rename from private/templates/CRMT2/org_group_person_status.csv
rename to modules/templates/CRMT/org_group_person_status.csv
diff --git a/private/templates/CRMT/org_sector.csv b/modules/templates/CRMT/org_sector.csv
similarity index 100%
rename from private/templates/CRMT/org_sector.csv
rename to modules/templates/CRMT/org_sector.csv
diff --git a/private/templates/CRMT/org_service.csv b/modules/templates/CRMT/org_service.csv
similarity index 100%
rename from private/templates/CRMT/org_service.csv
rename to modules/templates/CRMT/org_service.csv
diff --git a/private/templates/CRMT/stats_demographic.csv b/modules/templates/CRMT/stats_demographic.csv
similarity index 100%
rename from private/templates/CRMT/stats_demographic.csv
rename to modules/templates/CRMT/stats_demographic.csv
diff --git a/private/templates/CRMT2/tasks.cfg b/modules/templates/CRMT/tasks.cfg
similarity index 100%
rename from private/templates/CRMT2/tasks.cfg
rename to modules/templates/CRMT/tasks.cfg
diff --git a/private/templates/CRMT/tests.py b/modules/templates/CRMT/tests.py
similarity index 100%
rename from private/templates/CRMT/tests.py
rename to modules/templates/CRMT/tests.py
diff --git a/private/templates/CRMT2/views/_create.html b/modules/templates/CRMT/views/_create.html
similarity index 100%
rename from private/templates/CRMT2/views/_create.html
rename to modules/templates/CRMT/views/_create.html
diff --git a/private/templates/CRMT2/views/_display.html b/modules/templates/CRMT/views/_display.html
similarity index 100%
rename from private/templates/CRMT2/views/_display.html
rename to modules/templates/CRMT/views/_display.html
diff --git a/private/templates/CRMT2/views/_summary.html b/modules/templates/CRMT/views/_summary.html
similarity index 100%
rename from private/templates/CRMT2/views/_summary.html
rename to modules/templates/CRMT/views/_summary.html
diff --git a/private/templates/CRMT2/views/_update.html b/modules/templates/CRMT/views/_update.html
similarity index 100%
rename from private/templates/CRMT2/views/_update.html
rename to modules/templates/CRMT/views/_update.html
diff --git a/private/templates/CRMT2/views/cms_post_create.html b/modules/templates/CRMT/views/cms_post_create.html
similarity index 100%
rename from private/templates/CRMT2/views/cms_post_create.html
rename to modules/templates/CRMT/views/cms_post_create.html
diff --git a/private/templates/CRMT2/views/cms_post_display.html b/modules/templates/CRMT/views/cms_post_display.html
similarity index 100%
rename from private/templates/CRMT2/views/cms_post_display.html
rename to modules/templates/CRMT/views/cms_post_display.html
diff --git a/private/templates/CRMT2/views/cms_post_list_filter.html b/modules/templates/CRMT/views/cms_post_list_filter.html
similarity index 100%
rename from private/templates/CRMT2/views/cms_post_list_filter.html
rename to modules/templates/CRMT/views/cms_post_list_filter.html
diff --git a/private/templates/CRMT2/views/cms_post_update.html b/modules/templates/CRMT/views/cms_post_update.html
similarity index 100%
rename from private/templates/CRMT2/views/cms_post_update.html
rename to modules/templates/CRMT/views/cms_post_update.html
diff --git a/private/templates/CRMT2/views/dashboard.html b/modules/templates/CRMT/views/dashboard.html
similarity index 100%
rename from private/templates/CRMT2/views/dashboard.html
rename to modules/templates/CRMT/views/dashboard.html
diff --git a/private/templates/CRMT2/views/footer.html b/modules/templates/CRMT/views/footer.html
similarity index 100%
rename from private/templates/CRMT2/views/footer.html
rename to modules/templates/CRMT/views/footer.html
diff --git a/private/templates/CRMT2/views/gis_config_list_filter.html b/modules/templates/CRMT/views/gis_config_list_filter.html
similarity index 100%
rename from private/templates/CRMT2/views/gis_config_list_filter.html
rename to modules/templates/CRMT/views/gis_config_list_filter.html
diff --git a/private/templates/CRMT2/views/index.html b/modules/templates/CRMT/views/index.html
similarity index 100%
rename from private/templates/CRMT2/views/index.html
rename to modules/templates/CRMT/views/index.html
diff --git a/private/templates/CRMT2/views/layout.html b/modules/templates/CRMT/views/layout.html
similarity index 100%
rename from private/templates/CRMT2/views/layout.html
rename to modules/templates/CRMT/views/layout.html
diff --git a/private/templates/CRMT2/__init__.py b/modules/templates/Climate/__init__.py
similarity index 100%
rename from private/templates/CRMT2/__init__.py
rename to modules/templates/Climate/__init__.py
diff --git a/private/templates/Climate/config.py b/modules/templates/Climate/config.py
similarity index 100%
rename from private/templates/Climate/config.py
rename to modules/templates/Climate/config.py
diff --git a/private/templates/Climate/gis_config.csv b/modules/templates/Climate/gis_config.csv
similarity index 100%
rename from private/templates/Climate/gis_config.csv
rename to modules/templates/Climate/gis_config.csv
diff --git a/private/templates/Climate/gis_hierarchy.csv b/modules/templates/Climate/gis_hierarchy.csv
similarity index 100%
rename from private/templates/Climate/gis_hierarchy.csv
rename to modules/templates/Climate/gis_hierarchy.csv
diff --git a/private/templates/Climate/menus.py b/modules/templates/Climate/menus.py
similarity index 100%
rename from private/templates/Climate/menus.py
rename to modules/templates/Climate/menus.py
diff --git a/private/templates/Climate/tasks.cfg b/modules/templates/Climate/tasks.cfg
similarity index 100%
rename from private/templates/Climate/tasks.cfg
rename to modules/templates/Climate/tasks.cfg
diff --git a/private/templates/Climate/__init__.py b/modules/templates/DRMP/__init__.py
similarity index 100%
rename from private/templates/Climate/__init__.py
rename to modules/templates/DRMP/__init__.py
diff --git a/private/templates/DRMP/auth_roles.csv b/modules/templates/DRMP/auth_roles.csv
similarity index 100%
rename from private/templates/DRMP/auth_roles.csv
rename to modules/templates/DRMP/auth_roles.csv
diff --git a/private/templates/DRMP/cms_post.csv b/modules/templates/DRMP/cms_post.csv
similarity index 100%
rename from private/templates/DRMP/cms_post.csv
rename to modules/templates/DRMP/cms_post.csv
diff --git a/private/templates/DRMP/cms_series.csv b/modules/templates/DRMP/cms_series.csv
similarity index 100%
rename from private/templates/DRMP/cms_series.csv
rename to modules/templates/DRMP/cms_series.csv
diff --git a/private/templates/DRMP/config.py b/modules/templates/DRMP/config.py
similarity index 100%
rename from private/templates/DRMP/config.py
rename to modules/templates/DRMP/config.py
diff --git a/private/templates/DRMP/controllers.py b/modules/templates/DRMP/controllers.py
similarity index 100%
rename from private/templates/DRMP/controllers.py
rename to modules/templates/DRMP/controllers.py
diff --git a/private/templates/DRMP/css.cfg b/modules/templates/DRMP/css.cfg
similarity index 100%
rename from private/templates/DRMP/css.cfg
rename to modules/templates/DRMP/css.cfg
diff --git a/private/templates/DRMP/event.csv b/modules/templates/DRMP/event.csv
similarity index 100%
rename from private/templates/DRMP/event.csv
rename to modules/templates/DRMP/event.csv
diff --git a/private/templates/DRMP/gis_config.csv b/modules/templates/DRMP/gis_config.csv
similarity index 100%
rename from private/templates/DRMP/gis_config.csv
rename to modules/templates/DRMP/gis_config.csv
diff --git a/private/templates/DRMP/gis_hierarchy.csv b/modules/templates/DRMP/gis_hierarchy.csv
similarity index 100%
rename from private/templates/DRMP/gis_hierarchy.csv
rename to modules/templates/DRMP/gis_hierarchy.csv
diff --git a/private/templates/DRMP/gis_layer_feature.csv b/modules/templates/DRMP/gis_layer_feature.csv
similarity index 100%
rename from private/templates/DRMP/gis_layer_feature.csv
rename to modules/templates/DRMP/gis_layer_feature.csv
diff --git a/private/templates/DRMP/gis_layer_georss.csv b/modules/templates/DRMP/gis_layer_georss.csv
similarity index 100%
rename from private/templates/DRMP/gis_layer_georss.csv
rename to modules/templates/DRMP/gis_layer_georss.csv
diff --git a/private/templates/DRMP/gis_layer_google.csv b/modules/templates/DRMP/gis_layer_google.csv
similarity index 100%
rename from private/templates/DRMP/gis_layer_google.csv
rename to modules/templates/DRMP/gis_layer_google.csv
diff --git a/private/templates/DRMP/gis_layer_shapefile.csv b/modules/templates/DRMP/gis_layer_shapefile.csv
similarity index 100%
rename from private/templates/DRMP/gis_layer_shapefile.csv
rename to modules/templates/DRMP/gis_layer_shapefile.csv
diff --git a/private/templates/DRMP/gis_marker.csv b/modules/templates/DRMP/gis_marker.csv
similarity index 100%
rename from private/templates/DRMP/gis_marker.csv
rename to modules/templates/DRMP/gis_marker.csv
diff --git a/private/templates/DRMP/gis_projection.csv b/modules/templates/DRMP/gis_projection.csv
similarity index 100%
rename from private/templates/DRMP/gis_projection.csv
rename to modules/templates/DRMP/gis_projection.csv
diff --git a/private/templates/DRMP/office.csv b/modules/templates/DRMP/office.csv
similarity index 100%
rename from private/templates/DRMP/office.csv
rename to modules/templates/DRMP/office.csv
diff --git a/private/templates/DRMP/office_type.csv b/modules/templates/DRMP/office_type.csv
similarity index 100%
rename from private/templates/DRMP/office_type.csv
rename to modules/templates/DRMP/office_type.csv
diff --git a/private/templates/DRMP/org_resource.csv b/modules/templates/DRMP/org_resource.csv
similarity index 100%
rename from private/templates/DRMP/org_resource.csv
rename to modules/templates/DRMP/org_resource.csv
diff --git a/private/templates/DRMP/org_resource_type.csv b/modules/templates/DRMP/org_resource_type.csv
similarity index 100%
rename from private/templates/DRMP/org_resource_type.csv
rename to modules/templates/DRMP/org_resource_type.csv
diff --git a/private/templates/DRMP/organisation.csv b/modules/templates/DRMP/organisation.csv
similarity index 100%
rename from private/templates/DRMP/organisation.csv
rename to modules/templates/DRMP/organisation.csv
diff --git a/private/templates/DRMP/project_location.csv b/modules/templates/DRMP/project_location.csv
similarity index 100%
rename from private/templates/DRMP/project_location.csv
rename to modules/templates/DRMP/project_location.csv
diff --git a/private/templates/DRMP/project_organisation.csv b/modules/templates/DRMP/project_organisation.csv
similarity index 100%
rename from private/templates/DRMP/project_organisation.csv
rename to modules/templates/DRMP/project_organisation.csv
diff --git a/private/templates/DRMP/project_project.csv b/modules/templates/DRMP/project_project.csv
similarity index 100%
rename from private/templates/DRMP/project_project.csv
rename to modules/templates/DRMP/project_project.csv
diff --git a/private/templates/DRMP/tasks.cfg b/modules/templates/DRMP/tasks.cfg
similarity index 100%
rename from private/templates/DRMP/tasks.cfg
rename to modules/templates/DRMP/tasks.cfg
diff --git a/private/templates/DRMP/tests.py b/modules/templates/DRMP/tests.py
similarity index 100%
rename from private/templates/DRMP/tests.py
rename to modules/templates/DRMP/tests.py
diff --git a/private/templates/DRMP/users.csv b/modules/templates/DRMP/users.csv
similarity index 100%
rename from private/templates/DRMP/users.csv
rename to modules/templates/DRMP/users.csv
diff --git a/private/templates/DRMP/views/_create.html b/modules/templates/DRMP/views/_create.html
similarity index 100%
rename from private/templates/DRMP/views/_create.html
rename to modules/templates/DRMP/views/_create.html
diff --git a/private/templates/DRMP/views/_list_filter.html b/modules/templates/DRMP/views/_list_filter.html
similarity index 100%
rename from private/templates/DRMP/views/_list_filter.html
rename to modules/templates/DRMP/views/_list_filter.html
diff --git a/private/templates/CRMT/views/_popup.html b/modules/templates/DRMP/views/_popup.html
similarity index 100%
rename from private/templates/CRMT/views/_popup.html
rename to modules/templates/DRMP/views/_popup.html
diff --git a/private/templates/DRMP/views/_update.html b/modules/templates/DRMP/views/_update.html
similarity index 100%
rename from private/templates/DRMP/views/_update.html
rename to modules/templates/DRMP/views/_update.html
diff --git a/private/templates/DRMP/views/contact.html b/modules/templates/DRMP/views/contact.html
similarity index 100%
rename from private/templates/DRMP/views/contact.html
rename to modules/templates/DRMP/views/contact.html
diff --git a/private/templates/DRMP/views/footer.html b/modules/templates/DRMP/views/footer.html
similarity index 100%
rename from private/templates/DRMP/views/footer.html
rename to modules/templates/DRMP/views/footer.html
diff --git a/private/templates/DRMP/views/glossary.html b/modules/templates/DRMP/views/glossary.html
similarity index 100%
rename from private/templates/DRMP/views/glossary.html
rename to modules/templates/DRMP/views/glossary.html
diff --git a/private/templates/DRMP/views/index.html b/modules/templates/DRMP/views/index.html
similarity index 100%
rename from private/templates/DRMP/views/index.html
rename to modules/templates/DRMP/views/index.html
diff --git a/private/templates/DRMP/views/layout.html b/modules/templates/DRMP/views/layout.html
similarity index 100%
rename from private/templates/DRMP/views/layout.html
rename to modules/templates/DRMP/views/layout.html
diff --git a/private/templates/DRMP/views/links.html b/modules/templates/DRMP/views/links.html
similarity index 100%
rename from private/templates/DRMP/views/links.html
rename to modules/templates/DRMP/views/links.html
diff --git a/private/templates/DRMP/views/msg/notify_post_email.html b/modules/templates/DRMP/views/msg/notify_post_email.html
similarity index 100%
rename from private/templates/DRMP/views/msg/notify_post_email.html
rename to modules/templates/DRMP/views/msg/notify_post_email.html
diff --git a/private/templates/DRMP/views/newsfeed.html b/modules/templates/DRMP/views/newsfeed.html
similarity index 100%
rename from private/templates/DRMP/views/newsfeed.html
rename to modules/templates/DRMP/views/newsfeed.html
diff --git a/private/templates/DRMP/views/subscriptions.html b/modules/templates/DRMP/views/subscriptions.html
similarity index 100%
rename from private/templates/DRMP/views/subscriptions.html
rename to modules/templates/DRMP/views/subscriptions.html
diff --git a/private/templates/DRMP/views/tos.html b/modules/templates/DRMP/views/tos.html
similarity index 100%
rename from private/templates/DRMP/views/tos.html
rename to modules/templates/DRMP/views/tos.html
diff --git a/private/templates/DRMP/__init__.py b/modules/templates/DRRPP/__init__.py
similarity index 100%
rename from private/templates/DRMP/__init__.py
rename to modules/templates/DRRPP/__init__.py
diff --git a/private/templates/DRRPP/auth_roles.csv b/modules/templates/DRRPP/auth_roles.csv
similarity index 100%
rename from private/templates/DRRPP/auth_roles.csv
rename to modules/templates/DRRPP/auth_roles.csv
diff --git a/private/templates/DRRPP/config.py b/modules/templates/DRRPP/config.py
similarity index 100%
rename from private/templates/DRRPP/config.py
rename to modules/templates/DRRPP/config.py
diff --git a/private/templates/DRRPP/controllers.py b/modules/templates/DRRPP/controllers.py
similarity index 100%
rename from private/templates/DRRPP/controllers.py
rename to modules/templates/DRRPP/controllers.py
diff --git a/private/templates/DRRPP/css.cfg b/modules/templates/DRRPP/css.cfg
similarity index 100%
rename from private/templates/DRRPP/css.cfg
rename to modules/templates/DRRPP/css.cfg
diff --git a/private/templates/DRRPP/gis_config.csv b/modules/templates/DRRPP/gis_config.csv
similarity index 100%
rename from private/templates/DRRPP/gis_config.csv
rename to modules/templates/DRRPP/gis_config.csv
diff --git a/private/templates/DRRPP/gis_layer_feature.csv b/modules/templates/DRRPP/gis_layer_feature.csv
similarity index 100%
rename from private/templates/DRRPP/gis_layer_feature.csv
rename to modules/templates/DRRPP/gis_layer_feature.csv
diff --git a/private/templates/DRRPP/gis_layer_google.csv b/modules/templates/DRRPP/gis_layer_google.csv
similarity index 100%
rename from private/templates/DRRPP/gis_layer_google.csv
rename to modules/templates/DRRPP/gis_layer_google.csv
diff --git a/private/templates/DRRPP/layouts.py b/modules/templates/DRRPP/layouts.py
similarity index 100%
rename from private/templates/DRRPP/layouts.py
rename to modules/templates/DRRPP/layouts.py
diff --git a/private/templates/DRRPP/maintenance.py b/modules/templates/DRRPP/maintenance.py
similarity index 100%
rename from private/templates/DRRPP/maintenance.py
rename to modules/templates/DRRPP/maintenance.py
diff --git a/private/templates/DRRPP/menus.py b/modules/templates/DRRPP/menus.py
similarity index 100%
rename from private/templates/DRRPP/menus.py
rename to modules/templates/DRRPP/menus.py
diff --git a/private/templates/DRRPP/organisation.csv b/modules/templates/DRRPP/organisation.csv
similarity index 100%
rename from private/templates/DRRPP/organisation.csv
rename to modules/templates/DRRPP/organisation.csv
diff --git a/private/templates/DRRPP/organisation_type.csv b/modules/templates/DRRPP/organisation_type.csv
similarity index 100%
rename from private/templates/DRRPP/organisation_type.csv
rename to modules/templates/DRRPP/organisation_type.csv
diff --git a/private/templates/DRRPP/tasks.cfg b/modules/templates/DRRPP/tasks.cfg
similarity index 100%
rename from private/templates/DRRPP/tasks.cfg
rename to modules/templates/DRRPP/tasks.cfg
diff --git a/private/templates/DRRPP/views/_create.html b/modules/templates/DRRPP/views/_create.html
similarity index 100%
rename from private/templates/DRRPP/views/_create.html
rename to modules/templates/DRRPP/views/_create.html
diff --git a/private/templates/DRRPP/views/_display.html b/modules/templates/DRRPP/views/_display.html
similarity index 100%
rename from private/templates/DRRPP/views/_display.html
rename to modules/templates/DRRPP/views/_display.html
diff --git a/private/templates/DRRPP/views/_list.html b/modules/templates/DRRPP/views/_list.html
similarity index 100%
rename from private/templates/DRRPP/views/_list.html
rename to modules/templates/DRRPP/views/_list.html
diff --git a/private/templates/DRRPP/views/_map.html b/modules/templates/DRRPP/views/_map.html
similarity index 100%
rename from private/templates/DRRPP/views/_map.html
rename to modules/templates/DRRPP/views/_map.html
diff --git a/private/templates/DRRPP/views/_search.html b/modules/templates/DRRPP/views/_search.html
similarity index 100%
rename from private/templates/DRRPP/views/_search.html
rename to modules/templates/DRRPP/views/_search.html
diff --git a/private/templates/DRRPP/views/_update.html b/modules/templates/DRRPP/views/_update.html
similarity index 100%
rename from private/templates/DRRPP/views/_update.html
rename to modules/templates/DRRPP/views/_update.html
diff --git a/private/templates/DRRPP/views/about.html b/modules/templates/DRRPP/views/about.html
similarity index 100%
rename from private/templates/DRRPP/views/about.html
rename to modules/templates/DRRPP/views/about.html
diff --git a/private/templates/DRRPP/views/admin.html b/modules/templates/DRRPP/views/admin.html
similarity index 100%
rename from private/templates/DRRPP/views/admin.html
rename to modules/templates/DRRPP/views/admin.html
diff --git a/private/templates/DRRPP/views/analysis.html b/modules/templates/DRRPP/views/analysis.html
similarity index 100%
rename from private/templates/DRRPP/views/analysis.html
rename to modules/templates/DRRPP/views/analysis.html
diff --git a/private/templates/DRRPP/views/contact.html b/modules/templates/DRRPP/views/contact.html
similarity index 100%
rename from private/templates/DRRPP/views/contact.html
rename to modules/templates/DRRPP/views/contact.html
diff --git a/private/templates/DRRPP/views/footer.html b/modules/templates/DRRPP/views/footer.html
similarity index 100%
rename from private/templates/DRRPP/views/footer.html
rename to modules/templates/DRRPP/views/footer.html
diff --git a/private/templates/DRRPP/views/get_started.html b/modules/templates/DRRPP/views/get_started.html
similarity index 100%
rename from private/templates/DRRPP/views/get_started.html
rename to modules/templates/DRRPP/views/get_started.html
diff --git a/private/templates/DRRPP/views/index.html b/modules/templates/DRRPP/views/index.html
similarity index 100%
rename from private/templates/DRRPP/views/index.html
rename to modules/templates/DRRPP/views/index.html
diff --git a/private/templates/DRRPP/views/layout.html b/modules/templates/DRRPP/views/layout.html
similarity index 100%
rename from private/templates/DRRPP/views/layout.html
rename to modules/templates/DRRPP/views/layout.html
diff --git a/private/templates/DRRPP/views/login.html b/modules/templates/DRRPP/views/login.html
similarity index 100%
rename from private/templates/DRRPP/views/login.html
rename to modules/templates/DRRPP/views/login.html
diff --git a/private/templates/DRRPP/views/mypage.html b/modules/templates/DRRPP/views/mypage.html
similarity index 100%
rename from private/templates/DRRPP/views/mypage.html
rename to modules/templates/DRRPP/views/mypage.html
diff --git a/private/templates/DRRPP/views/organisations.html b/modules/templates/DRRPP/views/organisations.html
similarity index 100%
rename from private/templates/DRRPP/views/organisations.html
rename to modules/templates/DRRPP/views/organisations.html
diff --git a/private/templates/DRRPP/views/register.html b/modules/templates/DRRPP/views/register.html
similarity index 100%
rename from private/templates/DRRPP/views/register.html
rename to modules/templates/DRRPP/views/register.html
diff --git a/private/templates/DRRPP/__init__.py b/modules/templates/Delphi/__init__.py
similarity index 100%
rename from private/templates/DRRPP/__init__.py
rename to modules/templates/Delphi/__init__.py
diff --git a/private/templates/Delphi/config.py b/modules/templates/Delphi/config.py
similarity index 100%
rename from private/templates/Delphi/config.py
rename to modules/templates/Delphi/config.py
diff --git a/private/templates/Delphi/controllers.py b/modules/templates/Delphi/controllers.py
similarity index 100%
rename from private/templates/Delphi/controllers.py
rename to modules/templates/Delphi/controllers.py
diff --git a/private/templates/Delphi/delphi_roles.csv b/modules/templates/Delphi/delphi_roles.csv
similarity index 100%
rename from private/templates/Delphi/delphi_roles.csv
rename to modules/templates/Delphi/delphi_roles.csv
diff --git a/private/templates/Delphi/delphi_user.xsl b/modules/templates/Delphi/delphi_user.xsl
similarity index 100%
rename from private/templates/Delphi/delphi_user.xsl
rename to modules/templates/Delphi/delphi_user.xsl
diff --git a/private/templates/Delphi/group.csv b/modules/templates/Delphi/group.csv
similarity index 100%
rename from private/templates/Delphi/group.csv
rename to modules/templates/Delphi/group.csv
diff --git a/private/templates/Delphi/problem.csv b/modules/templates/Delphi/problem.csv
similarity index 100%
rename from private/templates/Delphi/problem.csv
rename to modules/templates/Delphi/problem.csv
diff --git a/private/templates/Delphi/solution.csv b/modules/templates/Delphi/solution.csv
similarity index 100%
rename from private/templates/Delphi/solution.csv
rename to modules/templates/Delphi/solution.csv
diff --git a/private/templates/Delphi/tasks.cfg b/modules/templates/Delphi/tasks.cfg
similarity index 100%
rename from private/templates/Delphi/tasks.cfg
rename to modules/templates/Delphi/tasks.cfg
diff --git a/private/templates/Delphi/users.csv b/modules/templates/Delphi/users.csv
similarity index 100%
rename from private/templates/Delphi/users.csv
rename to modules/templates/Delphi/users.csv
diff --git a/private/templates/Delphi/views/index.html b/modules/templates/Delphi/views/index.html
similarity index 100%
rename from private/templates/Delphi/views/index.html
rename to modules/templates/Delphi/views/index.html
diff --git a/private/templates/Delphi/__init__.py b/modules/templates/Disease/__init__.py
similarity index 100%
rename from private/templates/Delphi/__init__.py
rename to modules/templates/Disease/__init__.py
diff --git a/private/templates/Disease/cms_post.csv b/modules/templates/Disease/cms_post.csv
similarity index 100%
rename from private/templates/Disease/cms_post.csv
rename to modules/templates/Disease/cms_post.csv
diff --git a/private/templates/Disease/config.py b/modules/templates/Disease/config.py
similarity index 100%
rename from private/templates/Disease/config.py
rename to modules/templates/Disease/config.py
diff --git a/private/templates/Disease/controllers.py b/modules/templates/Disease/controllers.py
similarity index 100%
rename from private/templates/Disease/controllers.py
rename to modules/templates/Disease/controllers.py
diff --git a/private/templates/Disease/css.cfg b/modules/templates/Disease/css.cfg
similarity index 100%
rename from private/templates/Disease/css.cfg
rename to modules/templates/Disease/css.cfg
diff --git a/private/templates/Disease/disease_disease.csv b/modules/templates/Disease/disease_disease.csv
similarity index 100%
rename from private/templates/Disease/disease_disease.csv
rename to modules/templates/Disease/disease_disease.csv
diff --git a/private/templates/Disease/disease_symptom.csv b/modules/templates/Disease/disease_symptom.csv
similarity index 100%
rename from private/templates/Disease/disease_symptom.csv
rename to modules/templates/Disease/disease_symptom.csv
diff --git a/private/templates/Disease/ebola.cases.update.py b/modules/templates/Disease/ebola.cases.update.py
similarity index 100%
rename from private/templates/Disease/ebola.cases.update.py
rename to modules/templates/Disease/ebola.cases.update.py
diff --git a/private/templates/Disease/gis_config.csv b/modules/templates/Disease/gis_config.csv
similarity index 100%
rename from private/templates/Disease/gis_config.csv
rename to modules/templates/Disease/gis_config.csv
diff --git a/private/templates/Disease/gis_layer_feature.csv b/modules/templates/Disease/gis_layer_feature.csv
similarity index 100%
rename from private/templates/Disease/gis_layer_feature.csv
rename to modules/templates/Disease/gis_layer_feature.csv
diff --git a/private/templates/Disease/gis_marker.csv b/modules/templates/Disease/gis_marker.csv
similarity index 100%
rename from private/templates/Disease/gis_marker.csv
rename to modules/templates/Disease/gis_marker.csv
diff --git a/private/templates/Disease/hospital.csv b/modules/templates/Disease/hospital.csv
similarity index 100%
rename from private/templates/Disease/hospital.csv
rename to modules/templates/Disease/hospital.csv
diff --git a/private/templates/Disease/organisation.csv b/modules/templates/Disease/organisation.csv
similarity index 100%
rename from private/templates/Disease/organisation.csv
rename to modules/templates/Disease/organisation.csv
diff --git a/private/templates/Disease/statistic.csv b/modules/templates/Disease/statistic.csv
similarity index 100%
rename from private/templates/Disease/statistic.csv
rename to modules/templates/Disease/statistic.csv
diff --git a/private/templates/Disease/tasks.cfg b/modules/templates/Disease/tasks.cfg
similarity index 100%
rename from private/templates/Disease/tasks.cfg
rename to modules/templates/Disease/tasks.cfg
diff --git a/private/templates/Disease/views/footer.html b/modules/templates/Disease/views/footer.html
similarity index 100%
rename from private/templates/Disease/views/footer.html
rename to modules/templates/Disease/views/footer.html
diff --git a/private/templates/Disease/views/index.html b/modules/templates/Disease/views/index.html
similarity index 100%
rename from private/templates/Disease/views/index.html
rename to modules/templates/Disease/views/index.html
diff --git a/private/templates/Disease/views/layout.html b/modules/templates/Disease/views/layout.html
similarity index 100%
rename from private/templates/Disease/views/layout.html
rename to modules/templates/Disease/views/layout.html
diff --git a/private/templates/IFRC/CVTL.png b/modules/templates/IFRC/CVTL.png
similarity index 100%
rename from private/templates/IFRC/CVTL.png
rename to modules/templates/IFRC/CVTL.png
diff --git a/private/templates/IFRC/Demo/24H-TL-Data.csv b/modules/templates/IFRC/Demo/24H-TL-Data.csv
similarity index 100%
rename from private/templates/IFRC/Demo/24H-TL-Data.csv
rename to modules/templates/IFRC/Demo/24H-TL-Data.csv
diff --git a/private/templates/IFRC/Demo/gis_layer_theme.csv b/modules/templates/IFRC/Demo/gis_layer_theme.csv
similarity index 100%
rename from private/templates/IFRC/Demo/gis_layer_theme.csv
rename to modules/templates/IFRC/Demo/gis_layer_theme.csv
diff --git a/private/templates/IFRC/Demo/gis_theme_data.csv b/modules/templates/IFRC/Demo/gis_theme_data.csv
similarity index 100%
rename from private/templates/IFRC/Demo/gis_theme_data.csv
rename to modules/templates/IFRC/Demo/gis_theme_data.csv
diff --git a/private/templates/IFRC/Demo/people.csv b/modules/templates/IFRC/Demo/people.csv
similarity index 100%
rename from private/templates/IFRC/Demo/people.csv
rename to modules/templates/IFRC/Demo/people.csv
diff --git a/private/templates/IFRC/Demo/project_location.csv b/modules/templates/IFRC/Demo/project_location.csv
similarity index 100%
rename from private/templates/IFRC/Demo/project_location.csv
rename to modules/templates/IFRC/Demo/project_location.csv
diff --git a/private/templates/IFRC/Demo/tasks.cfg b/modules/templates/IFRC/Demo/tasks.cfg
similarity index 100%
rename from private/templates/IFRC/Demo/tasks.cfg
rename to modules/templates/IFRC/Demo/tasks.cfg
diff --git a/private/templates/IFRC/Demo/training.csv b/modules/templates/IFRC/Demo/training.csv
similarity index 100%
rename from private/templates/IFRC/Demo/training.csv
rename to modules/templates/IFRC/Demo/training.csv
diff --git a/private/templates/IFRC/IFRC.png b/modules/templates/IFRC/IFRC.png
similarity index 100%
rename from private/templates/IFRC/IFRC.png
rename to modules/templates/IFRC/IFRC.png
diff --git a/private/templates/IFRC/LK.png b/modules/templates/IFRC/LK.png
similarity index 100%
rename from private/templates/IFRC/LK.png
rename to modules/templates/IFRC/LK.png
diff --git a/private/templates/IFRC/PMI.png b/modules/templates/IFRC/PMI.png
similarity index 100%
rename from private/templates/IFRC/PMI.png
rename to modules/templates/IFRC/PMI.png
diff --git a/private/templates/IFRC/PRC.png b/modules/templates/IFRC/PRC.png
similarity index 100%
rename from private/templates/IFRC/PRC.png
rename to modules/templates/IFRC/PRC.png
diff --git a/private/templates/IFRC/Train/24H-TL-Data.csv b/modules/templates/IFRC/Train/24H-TL-Data.csv
similarity index 100%
rename from private/templates/IFRC/Train/24H-TL-Data.csv
rename to modules/templates/IFRC/Train/24H-TL-Data.csv
diff --git a/private/templates/IFRC/Train/BRCS-education-test.csv b/modules/templates/IFRC/Train/BRCS-education-test.csv
similarity index 100%
rename from private/templates/IFRC/Train/BRCS-education-test.csv
rename to modules/templates/IFRC/Train/BRCS-education-test.csv
diff --git a/private/templates/IFRC/Train/BRCS-people-test.csv b/modules/templates/IFRC/Train/BRCS-people-test.csv
similarity index 100%
rename from private/templates/IFRC/Train/BRCS-people-test.csv
rename to modules/templates/IFRC/Train/BRCS-people-test.csv
diff --git a/private/templates/IFRC/Train/asset.csv b/modules/templates/IFRC/Train/asset.csv
similarity index 100%
rename from private/templates/IFRC/Train/asset.csv
rename to modules/templates/IFRC/Train/asset.csv
diff --git a/private/templates/IFRC/Train/auth_organisation.csv b/modules/templates/IFRC/Train/auth_organisation.csv
similarity index 100%
rename from private/templates/IFRC/Train/auth_organisation.csv
rename to modules/templates/IFRC/Train/auth_organisation.csv
diff --git a/private/templates/IFRC/Train/basestation.csv b/modules/templates/IFRC/Train/basestation.csv
similarity index 100%
rename from private/templates/IFRC/Train/basestation.csv
rename to modules/templates/IFRC/Train/basestation.csv
diff --git a/private/templates/IFRC/Train/campaign_response_summary.csv b/modules/templates/IFRC/Train/campaign_response_summary.csv
similarity index 100%
rename from private/templates/IFRC/Train/campaign_response_summary.csv
rename to modules/templates/IFRC/Train/campaign_response_summary.csv
diff --git a/private/templates/IFRC/Train/facility.csv b/modules/templates/IFRC/Train/facility.csv
similarity index 100%
rename from private/templates/IFRC/Train/facility.csv
rename to modules/templates/IFRC/Train/facility.csv
diff --git a/private/templates/IFRC/Train/gis_layer_feature.csv b/modules/templates/IFRC/Train/gis_layer_feature.csv
similarity index 100%
rename from private/templates/IFRC/Train/gis_layer_feature.csv
rename to modules/templates/IFRC/Train/gis_layer_feature.csv
diff --git a/private/templates/IFRC/Train/gis_layer_wms.csv b/modules/templates/IFRC/Train/gis_layer_wms.csv
similarity index 100%
rename from private/templates/IFRC/Train/gis_layer_wms.csv
rename to modules/templates/IFRC/Train/gis_layer_wms.csv
diff --git a/private/templates/IFRC/Train/gis_layer_wms_finnrc.csv b/modules/templates/IFRC/Train/gis_layer_wms_finnrc.csv
similarity index 100%
rename from private/templates/IFRC/Train/gis_layer_wms_finnrc.csv
rename to modules/templates/IFRC/Train/gis_layer_wms_finnrc.csv
diff --git a/private/templates/IFRC/Train/gis_marker.csv b/modules/templates/IFRC/Train/gis_marker.csv
similarity index 100%
rename from private/templates/IFRC/Train/gis_marker.csv
rename to modules/templates/IFRC/Train/gis_marker.csv
diff --git a/private/templates/IFRC/Train/hrm_course.csv b/modules/templates/IFRC/Train/hrm_course.csv
similarity index 100%
rename from private/templates/IFRC/Train/hrm_course.csv
rename to modules/templates/IFRC/Train/hrm_course.csv
diff --git a/private/templates/IFRC/Train/hrm_group_membership.csv b/modules/templates/IFRC/Train/hrm_group_membership.csv
similarity index 100%
rename from private/templates/IFRC/Train/hrm_group_membership.csv
rename to modules/templates/IFRC/Train/hrm_group_membership.csv
diff --git a/private/templates/IFRC/Train/hrm_programme_hours.csv b/modules/templates/IFRC/Train/hrm_programme_hours.csv
similarity index 100%
rename from private/templates/IFRC/Train/hrm_programme_hours.csv
rename to modules/templates/IFRC/Train/hrm_programme_hours.csv
diff --git a/private/templates/IFRC/Train/inv_item.csv b/modules/templates/IFRC/Train/inv_item.csv
similarity index 100%
rename from private/templates/IFRC/Train/inv_item.csv
rename to modules/templates/IFRC/Train/inv_item.csv
diff --git a/private/templates/IFRC/Train/ireport.csv b/modules/templates/IFRC/Train/ireport.csv
similarity index 100%
rename from private/templates/IFRC/Train/ireport.csv
rename to modules/templates/IFRC/Train/ireport.csv
diff --git a/private/templates/IFRC/Train/members.csv b/modules/templates/IFRC/Train/members.csv
similarity index 100%
rename from private/templates/IFRC/Train/members.csv
rename to modules/templates/IFRC/Train/members.csv
diff --git a/private/templates/IFRC/Train/office.csv b/modules/templates/IFRC/Train/office.csv
similarity index 100%
rename from private/templates/IFRC/Train/office.csv
rename to modules/templates/IFRC/Train/office.csv
diff --git a/private/templates/IFRC/Train/organisation.csv b/modules/templates/IFRC/Train/organisation.csv
similarity index 100%
rename from private/templates/IFRC/Train/organisation.csv
rename to modules/templates/IFRC/Train/organisation.csv
diff --git a/private/templates/IFRC/Train/project_location.csv b/modules/templates/IFRC/Train/project_location.csv
similarity index 100%
rename from private/templates/IFRC/Train/project_location.csv
rename to modules/templates/IFRC/Train/project_location.csv
diff --git a/private/templates/IFRC/Train/project_organisation.csv b/modules/templates/IFRC/Train/project_organisation.csv
similarity index 100%
rename from private/templates/IFRC/Train/project_organisation.csv
rename to modules/templates/IFRC/Train/project_organisation.csv
diff --git a/private/templates/IFRC/Train/project_project.csv b/modules/templates/IFRC/Train/project_project.csv
similarity index 100%
rename from private/templates/IFRC/Train/project_project.csv
rename to modules/templates/IFRC/Train/project_project.csv
diff --git a/private/templates/IFRC/Train/staff.csv b/modules/templates/IFRC/Train/staff.csv
similarity index 100%
rename from private/templates/IFRC/Train/staff.csv
rename to modules/templates/IFRC/Train/staff.csv
diff --git a/private/templates/IFRC/Train/tasks.cfg b/modules/templates/IFRC/Train/tasks.cfg
similarity index 100%
rename from private/templates/IFRC/Train/tasks.cfg
rename to modules/templates/IFRC/Train/tasks.cfg
diff --git a/private/templates/IFRC/Train/training.csv b/modules/templates/IFRC/Train/training.csv
similarity index 100%
rename from private/templates/IFRC/Train/training.csv
rename to modules/templates/IFRC/Train/training.csv
diff --git a/private/templates/IFRC/Train/users.csv b/modules/templates/IFRC/Train/users.csv
similarity index 100%
rename from private/templates/IFRC/Train/users.csv
rename to modules/templates/IFRC/Train/users.csv
diff --git a/private/templates/IFRC/Train/volunteers.csv b/modules/templates/IFRC/Train/volunteers.csv
similarity index 100%
rename from private/templates/IFRC/Train/volunteers.csv
rename to modules/templates/IFRC/Train/volunteers.csv
diff --git a/private/templates/IFRC/Train/warehouse.csv b/modules/templates/IFRC/Train/warehouse.csv
similarity index 100%
rename from private/templates/IFRC/Train/warehouse.csv
rename to modules/templates/IFRC/Train/warehouse.csv
diff --git a/private/templates/IFRC/VNRC.png b/modules/templates/IFRC/VNRC.png
similarity index 100%
rename from private/templates/IFRC/VNRC.png
rename to modules/templates/IFRC/VNRC.png
diff --git a/private/templates/IFRC/VNRC/education_level.csv b/modules/templates/IFRC/VNRC/education_level.csv
similarity index 100%
rename from private/templates/IFRC/VNRC/education_level.csv
rename to modules/templates/IFRC/VNRC/education_level.csv
diff --git a/private/templates/IFRC/VNRC/tasks.cfg b/modules/templates/IFRC/VNRC/tasks.cfg
similarity index 100%
rename from private/templates/IFRC/VNRC/tasks.cfg
rename to modules/templates/IFRC/VNRC/tasks.cfg
diff --git a/private/templates/Disease/__init__.py b/modules/templates/IFRC/__init__.py
similarity index 100%
rename from private/templates/Disease/__init__.py
rename to modules/templates/IFRC/__init__.py
diff --git a/private/templates/IFRC/auth_roles.csv b/modules/templates/IFRC/auth_roles.csv
similarity index 100%
rename from private/templates/IFRC/auth_roles.csv
rename to modules/templates/IFRC/auth_roles.csv
diff --git a/private/templates/IFRC/beneficiary_type.csv b/modules/templates/IFRC/beneficiary_type.csv
similarity index 100%
rename from private/templates/IFRC/beneficiary_type.csv
rename to modules/templates/IFRC/beneficiary_type.csv
diff --git a/private/templates/IFRC/config.py b/modules/templates/IFRC/config.py
similarity index 100%
rename from private/templates/IFRC/config.py
rename to modules/templates/IFRC/config.py
diff --git a/private/templates/IFRC/controllers.py b/modules/templates/IFRC/controllers.py
similarity index 100%
rename from private/templates/IFRC/controllers.py
rename to modules/templates/IFRC/controllers.py
diff --git a/private/templates/IFRC/css.cfg b/modules/templates/IFRC/css.cfg
similarity index 100%
rename from private/templates/IFRC/css.cfg
rename to modules/templates/IFRC/css.cfg
diff --git a/private/templates/IFRC/deploy_job_title.csv b/modules/templates/IFRC/deploy_job_title.csv
similarity index 100%
rename from private/templates/IFRC/deploy_job_title.csv
rename to modules/templates/IFRC/deploy_job_title.csv
diff --git a/private/templates/IFRC/education_level.csv b/modules/templates/IFRC/education_level.csv
similarity index 100%
rename from private/templates/IFRC/education_level.csv
rename to modules/templates/IFRC/education_level.csv
diff --git a/private/templates/IFRC/event_type.csv b/modules/templates/IFRC/event_type.csv
similarity index 100%
rename from private/templates/IFRC/event_type.csv
rename to modules/templates/IFRC/event_type.csv
diff --git a/private/templates/IFRC/galbirlag.png b/modules/templates/IFRC/galbirlag.png
similarity index 100%
rename from private/templates/IFRC/galbirlag.png
rename to modules/templates/IFRC/galbirlag.png
diff --git a/private/templates/IFRC/gis_config.csv b/modules/templates/IFRC/gis_config.csv
similarity index 100%
rename from private/templates/IFRC/gis_config.csv
rename to modules/templates/IFRC/gis_config.csv
diff --git a/private/templates/IFRC/gis_layer_empty.csv b/modules/templates/IFRC/gis_layer_empty.csv
similarity index 100%
rename from private/templates/IFRC/gis_layer_empty.csv
rename to modules/templates/IFRC/gis_layer_empty.csv
diff --git a/private/templates/IFRC/gis_layer_feature.csv b/modules/templates/IFRC/gis_layer_feature.csv
similarity index 100%
rename from private/templates/IFRC/gis_layer_feature.csv
rename to modules/templates/IFRC/gis_layer_feature.csv
diff --git a/private/templates/IFRC/gis_layer_georss.csv b/modules/templates/IFRC/gis_layer_georss.csv
similarity index 100%
rename from private/templates/IFRC/gis_layer_georss.csv
rename to modules/templates/IFRC/gis_layer_georss.csv
diff --git a/private/templates/IFRC/gis_layer_google.csv b/modules/templates/IFRC/gis_layer_google.csv
similarity index 100%
rename from private/templates/IFRC/gis_layer_google.csv
rename to modules/templates/IFRC/gis_layer_google.csv
diff --git a/private/templates/IFRC/gis_layer_kml.csv b/modules/templates/IFRC/gis_layer_kml.csv
similarity index 100%
rename from private/templates/IFRC/gis_layer_kml.csv
rename to modules/templates/IFRC/gis_layer_kml.csv
diff --git a/private/templates/IFRC/gis_layer_openstreetmap.csv b/modules/templates/IFRC/gis_layer_openstreetmap.csv
similarity index 100%
rename from private/templates/IFRC/gis_layer_openstreetmap.csv
rename to modules/templates/IFRC/gis_layer_openstreetmap.csv
diff --git a/private/templates/IFRC/gis_layer_wms.csv b/modules/templates/IFRC/gis_layer_wms.csv
similarity index 100%
rename from private/templates/IFRC/gis_layer_wms.csv
rename to modules/templates/IFRC/gis_layer_wms.csv
diff --git a/private/templates/IFRC/gis_marker.csv b/modules/templates/IFRC/gis_marker.csv
similarity index 100%
rename from private/templates/IFRC/gis_marker.csv
rename to modules/templates/IFRC/gis_marker.csv
diff --git a/private/templates/IFRC/gis_poi_type.csv b/modules/templates/IFRC/gis_poi_type.csv
similarity index 100%
rename from private/templates/IFRC/gis_poi_type.csv
rename to modules/templates/IFRC/gis_poi_type.csv
diff --git a/private/templates/IFRC/gis_style.csv b/modules/templates/IFRC/gis_style.csv
similarity index 100%
rename from private/templates/IFRC/gis_style.csv
rename to modules/templates/IFRC/gis_style.csv
diff --git a/private/templates/IFRC/hrm_competency_rating.csv b/modules/templates/IFRC/hrm_competency_rating.csv
similarity index 100%
rename from private/templates/IFRC/hrm_competency_rating.csv
rename to modules/templates/IFRC/hrm_competency_rating.csv
diff --git a/private/templates/IFRC/hrm_job_title.csv b/modules/templates/IFRC/hrm_job_title.csv
similarity index 100%
rename from private/templates/IFRC/hrm_job_title.csv
rename to modules/templates/IFRC/hrm_job_title.csv
diff --git a/private/templates/IFRC/hrm_programme.csv b/modules/templates/IFRC/hrm_programme.csv
similarity index 100%
rename from private/templates/IFRC/hrm_programme.csv
rename to modules/templates/IFRC/hrm_programme.csv
diff --git a/private/templates/IFRC/hrm_skill.csv b/modules/templates/IFRC/hrm_skill.csv
similarity index 100%
rename from private/templates/IFRC/hrm_skill.csv
rename to modules/templates/IFRC/hrm_skill.csv
diff --git a/private/templates/IFRC/icrc.png b/modules/templates/IFRC/icrc.png
similarity index 100%
rename from private/templates/IFRC/icrc.png
rename to modules/templates/IFRC/icrc.png
diff --git a/private/templates/IFRC/layouts.py b/modules/templates/IFRC/layouts.py
similarity index 100%
rename from private/templates/IFRC/layouts.py
rename to modules/templates/IFRC/layouts.py
diff --git a/private/templates/IFRC/membership_type.csv b/modules/templates/IFRC/membership_type.csv
similarity index 100%
rename from private/templates/IFRC/membership_type.csv
rename to modules/templates/IFRC/membership_type.csv
diff --git a/private/templates/IFRC/menus.py b/modules/templates/IFRC/menus.py
similarity index 100%
rename from private/templates/IFRC/menus.py
rename to modules/templates/IFRC/menus.py
diff --git a/private/templates/IFRC/office.csv b/modules/templates/IFRC/office.csv
similarity index 100%
rename from private/templates/IFRC/office.csv
rename to modules/templates/IFRC/office.csv
diff --git a/private/templates/IFRC/office_type.csv b/modules/templates/IFRC/office_type.csv
similarity index 100%
rename from private/templates/IFRC/office_type.csv
rename to modules/templates/IFRC/office_type.csv
diff --git a/private/templates/IFRC/org_logos.csv b/modules/templates/IFRC/org_logos.csv
similarity index 100%
rename from private/templates/IFRC/org_logos.csv
rename to modules/templates/IFRC/org_logos.csv
diff --git a/private/templates/IFRC/org_region.csv b/modules/templates/IFRC/org_region.csv
similarity index 100%
rename from private/templates/IFRC/org_region.csv
rename to modules/templates/IFRC/org_region.csv
diff --git a/private/templates/IFRC/org_sector.csv b/modules/templates/IFRC/org_sector.csv
similarity index 100%
rename from private/templates/IFRC/org_sector.csv
rename to modules/templates/IFRC/org_sector.csv
diff --git a/private/templates/IFRC/organisation.csv b/modules/templates/IFRC/organisation.csv
similarity index 100%
rename from private/templates/IFRC/organisation.csv
rename to modules/templates/IFRC/organisation.csv
diff --git a/private/templates/IFRC/organisation_branch.csv b/modules/templates/IFRC/organisation_branch.csv
similarity index 100%
rename from private/templates/IFRC/organisation_branch.csv
rename to modules/templates/IFRC/organisation_branch.csv
diff --git a/private/templates/IFRC/parser.py b/modules/templates/IFRC/parser.py
similarity index 100%
rename from private/templates/IFRC/parser.py
rename to modules/templates/IFRC/parser.py
diff --git a/private/templates/IFRC/project_activity_type.csv b/modules/templates/IFRC/project_activity_type.csv
similarity index 100%
rename from private/templates/IFRC/project_activity_type.csv
rename to modules/templates/IFRC/project_activity_type.csv
diff --git a/private/templates/IFRC/project_beneficiary_type.csv b/modules/templates/IFRC/project_beneficiary_type.csv
similarity index 100%
rename from private/templates/IFRC/project_beneficiary_type.csv
rename to modules/templates/IFRC/project_beneficiary_type.csv
diff --git a/private/templates/IFRC/project_hazard.csv b/modules/templates/IFRC/project_hazard.csv
similarity index 100%
rename from private/templates/IFRC/project_hazard.csv
rename to modules/templates/IFRC/project_hazard.csv
diff --git a/private/templates/IFRC/project_theme.csv b/modules/templates/IFRC/project_theme.csv
similarity index 100%
rename from private/templates/IFRC/project_theme.csv
rename to modules/templates/IFRC/project_theme.csv
diff --git a/private/templates/IFRC/stats_demographic.csv b/modules/templates/IFRC/stats_demographic.csv
similarity index 100%
rename from private/templates/IFRC/stats_demographic.csv
rename to modules/templates/IFRC/stats_demographic.csv
diff --git a/private/templates/IFRC/supply_item_category_ifrc_standard.csv b/modules/templates/IFRC/supply_item_category_ifrc_standard.csv
similarity index 100%
rename from private/templates/IFRC/supply_item_category_ifrc_standard.csv
rename to modules/templates/IFRC/supply_item_category_ifrc_standard.csv
diff --git a/private/templates/IFRC/supply_item_eic.csv b/modules/templates/IFRC/supply_item_eic.csv
similarity index 100%
rename from private/templates/IFRC/supply_item_eic.csv
rename to modules/templates/IFRC/supply_item_eic.csv
diff --git a/private/templates/IFRC/supply_item_ifrc_standard.csv b/modules/templates/IFRC/supply_item_ifrc_standard.csv
similarity index 100%
rename from private/templates/IFRC/supply_item_ifrc_standard.csv
rename to modules/templates/IFRC/supply_item_ifrc_standard.csv
diff --git a/private/templates/IFRC/supply_item_ifrc_standard_sample.csv b/modules/templates/IFRC/supply_item_ifrc_standard_sample.csv
similarity index 100%
rename from private/templates/IFRC/supply_item_ifrc_standard_sample.csv
rename to modules/templates/IFRC/supply_item_ifrc_standard_sample.csv
diff --git a/private/templates/IFRC/tasks.cfg b/modules/templates/IFRC/tasks.cfg
similarity index 100%
rename from private/templates/IFRC/tasks.cfg
rename to modules/templates/IFRC/tasks.cfg
diff --git a/private/templates/IFRC/tests.py b/modules/templates/IFRC/tests.py
similarity index 100%
rename from private/templates/IFRC/tests.py
rename to modules/templates/IFRC/tests.py
diff --git a/private/templates/IFRC/views/footer.html b/modules/templates/IFRC/views/footer.html
similarity index 100%
rename from private/templates/IFRC/views/footer.html
rename to modules/templates/IFRC/views/footer.html
diff --git a/private/templates/IFRC/views/index.html b/modules/templates/IFRC/views/index.html
similarity index 100%
rename from private/templates/IFRC/views/index.html
rename to modules/templates/IFRC/views/index.html
diff --git a/private/templates/IFRC/views/layout.html b/modules/templates/IFRC/views/layout.html
similarity index 100%
rename from private/templates/IFRC/views/layout.html
rename to modules/templates/IFRC/views/layout.html
diff --git a/private/templates/IFRC/__init__.py b/modules/templates/IRS/__init__.py
similarity index 100%
rename from private/templates/IFRC/__init__.py
rename to modules/templates/IRS/__init__.py
diff --git a/private/templates/IRS/auth_roles.csv b/modules/templates/IRS/auth_roles.csv
similarity index 100%
rename from private/templates/IRS/auth_roles.csv
rename to modules/templates/IRS/auth_roles.csv
diff --git a/private/templates/IRS/cms_series.csv b/modules/templates/IRS/cms_series.csv
similarity index 100%
rename from private/templates/IRS/cms_series.csv
rename to modules/templates/IRS/cms_series.csv
diff --git a/private/templates/IRS/config.py b/modules/templates/IRS/config.py
similarity index 100%
rename from private/templates/IRS/config.py
rename to modules/templates/IRS/config.py
diff --git a/private/templates/IRS/controllers.py b/modules/templates/IRS/controllers.py
similarity index 100%
rename from private/templates/IRS/controllers.py
rename to modules/templates/IRS/controllers.py
diff --git a/private/templates/IRS/css.cfg b/modules/templates/IRS/css.cfg
similarity index 100%
rename from private/templates/IRS/css.cfg
rename to modules/templates/IRS/css.cfg
diff --git a/private/templates/IRS/ebola.cases.update.py b/modules/templates/IRS/ebola.cases.update.py
similarity index 100%
rename from private/templates/IRS/ebola.cases.update.py
rename to modules/templates/IRS/ebola.cases.update.py
diff --git a/private/templates/IRS/gis_config.csv b/modules/templates/IRS/gis_config.csv
similarity index 100%
rename from private/templates/IRS/gis_config.csv
rename to modules/templates/IRS/gis_config.csv
diff --git a/private/templates/IRS/gis_hierarchy.csv b/modules/templates/IRS/gis_hierarchy.csv
similarity index 100%
rename from private/templates/IRS/gis_hierarchy.csv
rename to modules/templates/IRS/gis_hierarchy.csv
diff --git a/private/templates/IRS/gis_layer_feature.csv b/modules/templates/IRS/gis_layer_feature.csv
similarity index 100%
rename from private/templates/IRS/gis_layer_feature.csv
rename to modules/templates/IRS/gis_layer_feature.csv
diff --git a/private/templates/IRS/hospital.csv b/modules/templates/IRS/hospital.csv
similarity index 100%
rename from private/templates/IRS/hospital.csv
rename to modules/templates/IRS/hospital.csv
diff --git a/private/templates/IRS/menus.py b/modules/templates/IRS/menus.py
similarity index 100%
rename from private/templates/IRS/menus.py
rename to modules/templates/IRS/menus.py
diff --git a/private/templates/IRS/organisation.csv b/modules/templates/IRS/organisation.csv
similarity index 100%
rename from private/templates/IRS/organisation.csv
rename to modules/templates/IRS/organisation.csv
diff --git a/private/templates/IRS/statistic.csv b/modules/templates/IRS/statistic.csv
similarity index 100%
rename from private/templates/IRS/statistic.csv
rename to modules/templates/IRS/statistic.csv
diff --git a/private/templates/IRS/tasks.cfg b/modules/templates/IRS/tasks.cfg
similarity index 100%
rename from private/templates/IRS/tasks.cfg
rename to modules/templates/IRS/tasks.cfg
diff --git a/private/templates/IRS/views/footer.html b/modules/templates/IRS/views/footer.html
similarity index 100%
rename from private/templates/IRS/views/footer.html
rename to modules/templates/IRS/views/footer.html
diff --git a/private/templates/IRS/views/index.html b/modules/templates/IRS/views/index.html
similarity index 100%
rename from private/templates/IRS/views/index.html
rename to modules/templates/IRS/views/index.html
diff --git a/private/templates/IRS/views/layout.html b/modules/templates/IRS/views/layout.html
similarity index 100%
rename from private/templates/IRS/views/layout.html
rename to modules/templates/IRS/views/layout.html
diff --git a/private/templates/Kashmir/Demo/cr_shelter.csv b/modules/templates/Kashmir/Demo/cr_shelter.csv
similarity index 100%
rename from private/templates/Kashmir/Demo/cr_shelter.csv
rename to modules/templates/Kashmir/Demo/cr_shelter.csv
diff --git a/private/templates/Kashmir/Demo/facility.csv b/modules/templates/Kashmir/Demo/facility.csv
similarity index 100%
rename from private/templates/Kashmir/Demo/facility.csv
rename to modules/templates/Kashmir/Demo/facility.csv
diff --git a/private/templates/Kashmir/Demo/inv_item.csv b/modules/templates/Kashmir/Demo/inv_item.csv
similarity index 100%
rename from private/templates/Kashmir/Demo/inv_item.csv
rename to modules/templates/Kashmir/Demo/inv_item.csv
diff --git a/private/templates/Kashmir/Demo/office.csv b/modules/templates/Kashmir/Demo/office.csv
similarity index 100%
rename from private/templates/Kashmir/Demo/office.csv
rename to modules/templates/Kashmir/Demo/office.csv
diff --git a/private/templates/Kashmir/Demo/organisation.csv b/modules/templates/Kashmir/Demo/organisation.csv
similarity index 100%
rename from private/templates/Kashmir/Demo/organisation.csv
rename to modules/templates/Kashmir/Demo/organisation.csv
diff --git a/private/templates/Kashmir/Demo/tasks.cfg b/modules/templates/Kashmir/Demo/tasks.cfg
similarity index 100%
rename from private/templates/Kashmir/Demo/tasks.cfg
rename to modules/templates/Kashmir/Demo/tasks.cfg
diff --git a/private/templates/Kashmir/Demo/warehouse.csv b/modules/templates/Kashmir/Demo/warehouse.csv
similarity index 100%
rename from private/templates/Kashmir/Demo/warehouse.csv
rename to modules/templates/Kashmir/Demo/warehouse.csv
diff --git a/private/templates/IRS/__init__.py b/modules/templates/Kashmir/__init__.py
similarity index 100%
rename from private/templates/IRS/__init__.py
rename to modules/templates/Kashmir/__init__.py
diff --git a/private/templates/Kashmir/auth_roles.csv b/modules/templates/Kashmir/auth_roles.csv
similarity index 100%
rename from private/templates/Kashmir/auth_roles.csv
rename to modules/templates/Kashmir/auth_roles.csv
diff --git a/private/templates/Kashmir/config.py b/modules/templates/Kashmir/config.py
similarity index 100%
rename from private/templates/Kashmir/config.py
rename to modules/templates/Kashmir/config.py
diff --git a/private/templates/Kashmir/controllers.py b/modules/templates/Kashmir/controllers.py
similarity index 100%
rename from private/templates/Kashmir/controllers.py
rename to modules/templates/Kashmir/controllers.py
diff --git a/private/templates/Kashmir/css.cfg b/modules/templates/Kashmir/css.cfg
similarity index 100%
rename from private/templates/Kashmir/css.cfg
rename to modules/templates/Kashmir/css.cfg
diff --git a/private/templates/Kashmir/facility_type.csv b/modules/templates/Kashmir/facility_type.csv
similarity index 100%
rename from private/templates/Kashmir/facility_type.csv
rename to modules/templates/Kashmir/facility_type.csv
diff --git a/private/templates/Kashmir/gis_config.csv b/modules/templates/Kashmir/gis_config.csv
similarity index 100%
rename from private/templates/Kashmir/gis_config.csv
rename to modules/templates/Kashmir/gis_config.csv
diff --git a/private/templates/Kashmir/gis_hierarchy.csv b/modules/templates/Kashmir/gis_hierarchy.csv
similarity index 100%
rename from private/templates/Kashmir/gis_hierarchy.csv
rename to modules/templates/Kashmir/gis_hierarchy.csv
diff --git a/private/templates/Kashmir/gis_layer_feature.csv b/modules/templates/Kashmir/gis_layer_feature.csv
similarity index 100%
rename from private/templates/Kashmir/gis_layer_feature.csv
rename to modules/templates/Kashmir/gis_layer_feature.csv
diff --git a/private/templates/Kashmir/menus.py b/modules/templates/Kashmir/menus.py
similarity index 100%
rename from private/templates/Kashmir/menus.py
rename to modules/templates/Kashmir/menus.py
diff --git a/private/templates/Kashmir/tasks.cfg b/modules/templates/Kashmir/tasks.cfg
similarity index 100%
rename from private/templates/Kashmir/tasks.cfg
rename to modules/templates/Kashmir/tasks.cfg
diff --git a/private/templates/Kashmir/views/about.html b/modules/templates/Kashmir/views/about.html
similarity index 100%
rename from private/templates/Kashmir/views/about.html
rename to modules/templates/Kashmir/views/about.html
diff --git a/private/templates/Kashmir/views/contact.html b/modules/templates/Kashmir/views/contact.html
similarity index 100%
rename from private/templates/Kashmir/views/contact.html
rename to modules/templates/Kashmir/views/contact.html
diff --git a/private/templates/Kashmir/views/footer.html b/modules/templates/Kashmir/views/footer.html
similarity index 100%
rename from private/templates/Kashmir/views/footer.html
rename to modules/templates/Kashmir/views/footer.html
diff --git a/private/templates/Kashmir/views/index.html b/modules/templates/Kashmir/views/index.html
similarity index 100%
rename from private/templates/Kashmir/views/index.html
rename to modules/templates/Kashmir/views/index.html
diff --git a/private/templates/Kashmir/views/layout.html b/modules/templates/Kashmir/views/layout.html
similarity index 100%
rename from private/templates/Kashmir/views/layout.html
rename to modules/templates/Kashmir/views/layout.html
diff --git a/private/templates/Kashmir/views/listoforg.html b/modules/templates/Kashmir/views/listoforg.html
similarity index 100%
rename from private/templates/Kashmir/views/listoforg.html
rename to modules/templates/Kashmir/views/listoforg.html
diff --git a/private/templates/Kashmir/views/userguide.html b/modules/templates/Kashmir/views/userguide.html
similarity index 100%
rename from private/templates/Kashmir/views/userguide.html
rename to modules/templates/Kashmir/views/userguide.html
diff --git a/private/templates/Kashmir/__init__.py b/modules/templates/MCOP/__init__.py
similarity index 100%
rename from private/templates/Kashmir/__init__.py
rename to modules/templates/MCOP/__init__.py
diff --git a/private/templates/MCOP/auth_roles.csv b/modules/templates/MCOP/auth_roles.csv
similarity index 100%
rename from private/templates/MCOP/auth_roles.csv
rename to modules/templates/MCOP/auth_roles.csv
diff --git a/private/templates/MCOP/cms_post.csv b/modules/templates/MCOP/cms_post.csv
similarity index 100%
rename from private/templates/MCOP/cms_post.csv
rename to modules/templates/MCOP/cms_post.csv
diff --git a/private/templates/MCOP/cms_post_content.csv b/modules/templates/MCOP/cms_post_content.csv
similarity index 100%
rename from private/templates/MCOP/cms_post_content.csv
rename to modules/templates/MCOP/cms_post_content.csv
diff --git a/private/templates/MCOP/config.py b/modules/templates/MCOP/config.py
similarity index 100%
rename from private/templates/MCOP/config.py
rename to modules/templates/MCOP/config.py
diff --git a/private/templates/MCOP/controllers.py b/modules/templates/MCOP/controllers.py
similarity index 100%
rename from private/templates/MCOP/controllers.py
rename to modules/templates/MCOP/controllers.py
diff --git a/private/templates/MCOP/css.cfg b/modules/templates/MCOP/css.cfg
similarity index 100%
rename from private/templates/MCOP/css.cfg
rename to modules/templates/MCOP/css.cfg
diff --git a/private/templates/MCOP/event_resource.csv b/modules/templates/MCOP/event_resource.csv
similarity index 100%
rename from private/templates/MCOP/event_resource.csv
rename to modules/templates/MCOP/event_resource.csv
diff --git a/private/templates/MCOP/facility.csv b/modules/templates/MCOP/facility.csv
similarity index 100%
rename from private/templates/MCOP/facility.csv
rename to modules/templates/MCOP/facility.csv
diff --git a/private/templates/MCOP/gis_config.csv b/modules/templates/MCOP/gis_config.csv
similarity index 100%
rename from private/templates/MCOP/gis_config.csv
rename to modules/templates/MCOP/gis_config.csv
diff --git a/private/templates/MCOP/gis_hierarchy.csv b/modules/templates/MCOP/gis_hierarchy.csv
similarity index 100%
rename from private/templates/MCOP/gis_hierarchy.csv
rename to modules/templates/MCOP/gis_hierarchy.csv
diff --git a/private/templates/MCOP/gis_layer_feature.csv b/modules/templates/MCOP/gis_layer_feature.csv
similarity index 100%
rename from private/templates/MCOP/gis_layer_feature.csv
rename to modules/templates/MCOP/gis_layer_feature.csv
diff --git a/private/templates/MCOP/gis_layer_google.csv b/modules/templates/MCOP/gis_layer_google.csv
similarity index 100%
rename from private/templates/MCOP/gis_layer_google.csv
rename to modules/templates/MCOP/gis_layer_google.csv
diff --git a/private/templates/MCOP/gis_marker.csv b/modules/templates/MCOP/gis_marker.csv
similarity index 100%
rename from private/templates/MCOP/gis_marker.csv
rename to modules/templates/MCOP/gis_marker.csv
diff --git a/private/templates/MCOP/incidents.csv b/modules/templates/MCOP/incidents.csv
similarity index 100%
rename from private/templates/MCOP/incidents.csv
rename to modules/templates/MCOP/incidents.csv
diff --git a/private/templates/MCOP/org_resource.csv b/modules/templates/MCOP/org_resource.csv
similarity index 100%
rename from private/templates/MCOP/org_resource.csv
rename to modules/templates/MCOP/org_resource.csv
diff --git a/private/templates/MCOP/organisation.csv b/modules/templates/MCOP/organisation.csv
similarity index 100%
rename from private/templates/MCOP/organisation.csv
rename to modules/templates/MCOP/organisation.csv
diff --git a/private/templates/MCOP/people.csv b/modules/templates/MCOP/people.csv
similarity index 100%
rename from private/templates/MCOP/people.csv
rename to modules/templates/MCOP/people.csv
diff --git a/private/templates/MCOP/tasks.cfg b/modules/templates/MCOP/tasks.cfg
similarity index 100%
rename from private/templates/MCOP/tasks.cfg
rename to modules/templates/MCOP/tasks.cfg
diff --git a/private/templates/MCOP/tasks.csv b/modules/templates/MCOP/tasks.csv
similarity index 100%
rename from private/templates/MCOP/tasks.csv
rename to modules/templates/MCOP/tasks.csv
diff --git a/private/templates/MCOP/tests.py b/modules/templates/MCOP/tests.py
similarity index 100%
rename from private/templates/MCOP/tests.py
rename to modules/templates/MCOP/tests.py
diff --git a/private/templates/MCOP/views/about.html b/modules/templates/MCOP/views/about.html
similarity index 100%
rename from private/templates/MCOP/views/about.html
rename to modules/templates/MCOP/views/about.html
diff --git a/private/templates/MCOP/views/footer.html b/modules/templates/MCOP/views/footer.html
similarity index 100%
rename from private/templates/MCOP/views/footer.html
rename to modules/templates/MCOP/views/footer.html
diff --git a/private/templates/MCOP/views/index.html b/modules/templates/MCOP/views/index.html
similarity index 100%
rename from private/templates/MCOP/views/index.html
rename to modules/templates/MCOP/views/index.html
diff --git a/private/templates/MCOP/views/layout.html b/modules/templates/MCOP/views/layout.html
similarity index 100%
rename from private/templates/MCOP/views/layout.html
rename to modules/templates/MCOP/views/layout.html
diff --git a/private/templates/MCOP/__init__.py b/modules/templates/Magnu/__init__.py
similarity index 100%
rename from private/templates/MCOP/__init__.py
rename to modules/templates/Magnu/__init__.py
diff --git a/private/templates/Magnu/config.py b/modules/templates/Magnu/config.py
similarity index 100%
rename from private/templates/Magnu/config.py
rename to modules/templates/Magnu/config.py
diff --git a/private/templates/Magnu/controllers.py b/modules/templates/Magnu/controllers.py
similarity index 100%
rename from private/templates/Magnu/controllers.py
rename to modules/templates/Magnu/controllers.py
diff --git a/private/templates/Magnu/css.cfg b/modules/templates/Magnu/css.cfg
similarity index 100%
rename from private/templates/Magnu/css.cfg
rename to modules/templates/Magnu/css.cfg
diff --git a/private/templates/Magnu/gis_config.csv b/modules/templates/Magnu/gis_config.csv
similarity index 100%
rename from private/templates/Magnu/gis_config.csv
rename to modules/templates/Magnu/gis_config.csv
diff --git a/private/templates/Magnu/gis_layer_bing.csv b/modules/templates/Magnu/gis_layer_bing.csv
similarity index 100%
rename from private/templates/Magnu/gis_layer_bing.csv
rename to modules/templates/Magnu/gis_layer_bing.csv
diff --git a/private/templates/Magnu/gis_layer_feature.csv b/modules/templates/Magnu/gis_layer_feature.csv
similarity index 100%
rename from private/templates/Magnu/gis_layer_feature.csv
rename to modules/templates/Magnu/gis_layer_feature.csv
diff --git a/private/templates/Magnu/gis_layer_google.csv b/modules/templates/Magnu/gis_layer_google.csv
similarity index 100%
rename from private/templates/Magnu/gis_layer_google.csv
rename to modules/templates/Magnu/gis_layer_google.csv
diff --git a/private/templates/Magnu/gis_marker.csv b/modules/templates/Magnu/gis_marker.csv
similarity index 100%
rename from private/templates/Magnu/gis_marker.csv
rename to modules/templates/Magnu/gis_marker.csv
diff --git a/private/templates/Magnu/incident_type.csv b/modules/templates/Magnu/incident_type.csv
similarity index 100%
rename from private/templates/Magnu/incident_type.csv
rename to modules/templates/Magnu/incident_type.csv
diff --git a/private/templates/Magnu/menus.py b/modules/templates/Magnu/menus.py
similarity index 100%
rename from private/templates/Magnu/menus.py
rename to modules/templates/Magnu/menus.py
diff --git a/private/templates/Magnu/office_type.csv b/modules/templates/Magnu/office_type.csv
similarity index 100%
rename from private/templates/Magnu/office_type.csv
rename to modules/templates/Magnu/office_type.csv
diff --git a/private/templates/Magnu/org_sector.csv b/modules/templates/Magnu/org_sector.csv
similarity index 100%
rename from private/templates/Magnu/org_sector.csv
rename to modules/templates/Magnu/org_sector.csv
diff --git a/private/templates/Magnu/tasks.cfg b/modules/templates/Magnu/tasks.cfg
similarity index 100%
rename from private/templates/Magnu/tasks.cfg
rename to modules/templates/Magnu/tasks.cfg
diff --git a/private/templates/Magnu/views/footer.html b/modules/templates/Magnu/views/footer.html
similarity index 100%
rename from private/templates/Magnu/views/footer.html
rename to modules/templates/Magnu/views/footer.html
diff --git a/private/templates/Magnu/views/index.html b/modules/templates/Magnu/views/index.html
similarity index 100%
rename from private/templates/Magnu/views/index.html
rename to modules/templates/Magnu/views/index.html
diff --git a/private/templates/Magnu/views/layout.html b/modules/templates/Magnu/views/layout.html
similarity index 100%
rename from private/templates/Magnu/views/layout.html
rename to modules/templates/Magnu/views/layout.html
diff --git a/private/templates/NYC/SICanvasData.csv b/modules/templates/NYC/SICanvasData.csv
similarity index 100%
rename from private/templates/NYC/SICanvasData.csv
rename to modules/templates/NYC/SICanvasData.csv
diff --git a/private/templates/Magnu/__init__.py b/modules/templates/NYC/__init__.py
similarity index 100%
rename from private/templates/Magnu/__init__.py
rename to modules/templates/NYC/__init__.py
diff --git a/private/templates/NYC/auth_roles.csv b/modules/templates/NYC/auth_roles.csv
similarity index 100%
rename from private/templates/NYC/auth_roles.csv
rename to modules/templates/NYC/auth_roles.csv
diff --git a/private/templates/NYC/auth_user.csv b/modules/templates/NYC/auth_user.csv
similarity index 100%
rename from private/templates/NYC/auth_user.csv
rename to modules/templates/NYC/auth_user.csv
diff --git a/private/templates/NYC/catalog_item.csv b/modules/templates/NYC/catalog_item.csv
similarity index 100%
rename from private/templates/NYC/catalog_item.csv
rename to modules/templates/NYC/catalog_item.csv
diff --git a/private/templates/NYC/cms_series.csv b/modules/templates/NYC/cms_series.csv
similarity index 100%
rename from private/templates/NYC/cms_series.csv
rename to modules/templates/NYC/cms_series.csv
diff --git a/private/templates/NYC/config.py b/modules/templates/NYC/config.py
similarity index 100%
rename from private/templates/NYC/config.py
rename to modules/templates/NYC/config.py
diff --git a/private/templates/NYC/controllers.py b/modules/templates/NYC/controllers.py
similarity index 100%
rename from private/templates/NYC/controllers.py
rename to modules/templates/NYC/controllers.py
diff --git a/private/templates/NYC/css.cfg b/modules/templates/NYC/css.cfg
similarity index 100%
rename from private/templates/NYC/css.cfg
rename to modules/templates/NYC/css.cfg
diff --git a/private/templates/NYC/facility.csv b/modules/templates/NYC/facility.csv
similarity index 100%
rename from private/templates/NYC/facility.csv
rename to modules/templates/NYC/facility.csv
diff --git a/private/templates/NYC/facility_type.csv b/modules/templates/NYC/facility_type.csv
similarity index 100%
rename from private/templates/NYC/facility_type.csv
rename to modules/templates/NYC/facility_type.csv
diff --git a/private/templates/NYC/gis_config.csv b/modules/templates/NYC/gis_config.csv
similarity index 100%
rename from private/templates/NYC/gis_config.csv
rename to modules/templates/NYC/gis_config.csv
diff --git a/private/templates/NYC/gis_hierarchy.csv b/modules/templates/NYC/gis_hierarchy.csv
similarity index 100%
rename from private/templates/NYC/gis_hierarchy.csv
rename to modules/templates/NYC/gis_hierarchy.csv
diff --git a/private/templates/NYC/gis_layer_feature.csv b/modules/templates/NYC/gis_layer_feature.csv
similarity index 100%
rename from private/templates/NYC/gis_layer_feature.csv
rename to modules/templates/NYC/gis_layer_feature.csv
diff --git a/private/templates/NYC/gis_layer_google.csv b/modules/templates/NYC/gis_layer_google.csv
similarity index 100%
rename from private/templates/NYC/gis_layer_google.csv
rename to modules/templates/NYC/gis_layer_google.csv
diff --git a/private/templates/NYC/gis_layer_openstreetmap.csv b/modules/templates/NYC/gis_layer_openstreetmap.csv
similarity index 100%
rename from private/templates/NYC/gis_layer_openstreetmap.csv
rename to modules/templates/NYC/gis_layer_openstreetmap.csv
diff --git a/private/templates/NYC/hrm_skill.csv b/modules/templates/NYC/hrm_skill.csv
similarity index 100%
rename from private/templates/NYC/hrm_skill.csv
rename to modules/templates/NYC/hrm_skill.csv
diff --git a/private/templates/NYC/layouts.py b/modules/templates/NYC/layouts.py
similarity index 100%
rename from private/templates/NYC/layouts.py
rename to modules/templates/NYC/layouts.py
diff --git a/private/templates/NYC/menus.py b/modules/templates/NYC/menus.py
similarity index 100%
rename from private/templates/NYC/menus.py
rename to modules/templates/NYC/menus.py
diff --git a/private/templates/NYC/org_group.csv b/modules/templates/NYC/org_group.csv
similarity index 100%
rename from private/templates/NYC/org_group.csv
rename to modules/templates/NYC/org_group.csv
diff --git a/private/templates/NYC/org_group_membership.csv b/modules/templates/NYC/org_group_membership.csv
similarity index 100%
rename from private/templates/NYC/org_group_membership.csv
rename to modules/templates/NYC/org_group_membership.csv
diff --git a/private/templates/NYC/org_group_membership_status.csv b/modules/templates/NYC/org_group_membership_status.csv
similarity index 100%
rename from private/templates/NYC/org_group_membership_status.csv
rename to modules/templates/NYC/org_group_membership_status.csv
diff --git a/private/templates/NYC/org_service.csv b/modules/templates/NYC/org_service.csv
similarity index 100%
rename from private/templates/NYC/org_service.csv
rename to modules/templates/NYC/org_service.csv
diff --git a/private/templates/NYC/organisation.csv b/modules/templates/NYC/organisation.csv
similarity index 100%
rename from private/templates/NYC/organisation.csv
rename to modules/templates/NYC/organisation.csv
diff --git a/private/templates/NYC/organisation_type.csv b/modules/templates/NYC/organisation_type.csv
similarity index 100%
rename from private/templates/NYC/organisation_type.csv
rename to modules/templates/NYC/organisation_type.csv
diff --git a/private/templates/NYC/parser.py b/modules/templates/NYC/parser.py
similarity index 100%
rename from private/templates/NYC/parser.py
rename to modules/templates/NYC/parser.py
diff --git a/private/templates/NYC/req.csv b/modules/templates/NYC/req.csv
similarity index 100%
rename from private/templates/NYC/req.csv
rename to modules/templates/NYC/req.csv
diff --git a/private/templates/NYC/req_item.csv b/modules/templates/NYC/req_item.csv
similarity index 100%
rename from private/templates/NYC/req_item.csv
rename to modules/templates/NYC/req_item.csv
diff --git a/private/templates/NYC/req_skill.csv b/modules/templates/NYC/req_skill.csv
similarity index 100%
rename from private/templates/NYC/req_skill.csv
rename to modules/templates/NYC/req_skill.csv
diff --git a/private/templates/NYC/req_summary_option.csv b/modules/templates/NYC/req_summary_option.csv
similarity index 100%
rename from private/templates/NYC/req_summary_option.csv
rename to modules/templates/NYC/req_summary_option.csv
diff --git a/private/templates/NYC/sandySIquestionnaire.csv b/modules/templates/NYC/sandySIquestionnaire.csv
similarity index 100%
rename from private/templates/NYC/sandySIquestionnaire.csv
rename to modules/templates/NYC/sandySIquestionnaire.csv
diff --git a/private/templates/NYC/tasks.cfg b/modules/templates/NYC/tasks.cfg
similarity index 100%
rename from private/templates/NYC/tasks.cfg
rename to modules/templates/NYC/tasks.cfg
diff --git a/private/templates/NYC/tests.py b/modules/templates/NYC/tests.py
similarity index 100%
rename from private/templates/NYC/tests.py
rename to modules/templates/NYC/tests.py
diff --git a/private/templates/NYC/views/_create.html b/modules/templates/NYC/views/_create.html
similarity index 100%
rename from private/templates/NYC/views/_create.html
rename to modules/templates/NYC/views/_create.html
diff --git a/private/templates/NYC/views/_display.html b/modules/templates/NYC/views/_display.html
similarity index 100%
rename from private/templates/NYC/views/_display.html
rename to modules/templates/NYC/views/_display.html
diff --git a/private/templates/NYC/views/_list_filter.html b/modules/templates/NYC/views/_list_filter.html
similarity index 100%
rename from private/templates/NYC/views/_list_filter.html
rename to modules/templates/NYC/views/_list_filter.html
diff --git a/private/templates/NYC/views/_popup.html b/modules/templates/NYC/views/_popup.html
similarity index 100%
rename from private/templates/NYC/views/_popup.html
rename to modules/templates/NYC/views/_popup.html
diff --git a/private/templates/NYC/views/_update.html b/modules/templates/NYC/views/_update.html
similarity index 100%
rename from private/templates/NYC/views/_update.html
rename to modules/templates/NYC/views/_update.html
diff --git a/private/templates/NYC/views/contact.html b/modules/templates/NYC/views/contact.html
similarity index 100%
rename from private/templates/NYC/views/contact.html
rename to modules/templates/NYC/views/contact.html
diff --git a/private/templates/NYC/views/footer.html b/modules/templates/NYC/views/footer.html
similarity index 100%
rename from private/templates/NYC/views/footer.html
rename to modules/templates/NYC/views/footer.html
diff --git a/private/templates/NYC/views/index.html b/modules/templates/NYC/views/index.html
similarity index 100%
rename from private/templates/NYC/views/index.html
rename to modules/templates/NYC/views/index.html
diff --git a/private/templates/NYC/views/layout.html b/modules/templates/NYC/views/layout.html
similarity index 100%
rename from private/templates/NYC/views/layout.html
rename to modules/templates/NYC/views/layout.html
diff --git a/private/templates/NYC/views/register.html b/modules/templates/NYC/views/register.html
similarity index 100%
rename from private/templates/NYC/views/register.html
rename to modules/templates/NYC/views/register.html
diff --git a/private/templates/NYC/views/subscriptions.html b/modules/templates/NYC/views/subscriptions.html
similarity index 100%
rename from private/templates/NYC/views/subscriptions.html
rename to modules/templates/NYC/views/subscriptions.html
diff --git a/private/templates/NYC/views/tos.html b/modules/templates/NYC/views/tos.html
similarity index 100%
rename from private/templates/NYC/views/tos.html
rename to modules/templates/NYC/views/tos.html
diff --git a/private/templates/NYC/__init__.py b/modules/templates/NetHope/__init__.py
similarity index 100%
rename from private/templates/NYC/__init__.py
rename to modules/templates/NetHope/__init__.py
diff --git a/private/templates/NetHope/catalog_item.csv b/modules/templates/NetHope/catalog_item.csv
similarity index 100%
rename from private/templates/NetHope/catalog_item.csv
rename to modules/templates/NetHope/catalog_item.csv
diff --git a/private/templates/NetHope/config.py b/modules/templates/NetHope/config.py
similarity index 100%
rename from private/templates/NetHope/config.py
rename to modules/templates/NetHope/config.py
diff --git a/private/templates/NetHope/controllers.py b/modules/templates/NetHope/controllers.py
similarity index 100%
rename from private/templates/NetHope/controllers.py
rename to modules/templates/NetHope/controllers.py
diff --git a/private/templates/NetHope/css.cfg b/modules/templates/NetHope/css.cfg
similarity index 100%
rename from private/templates/NetHope/css.cfg
rename to modules/templates/NetHope/css.cfg
diff --git a/private/templates/NetHope/gis_config.csv b/modules/templates/NetHope/gis_config.csv
similarity index 100%
rename from private/templates/NetHope/gis_config.csv
rename to modules/templates/NetHope/gis_config.csv
diff --git a/private/templates/NetHope/gis_layer_feature.csv b/modules/templates/NetHope/gis_layer_feature.csv
similarity index 100%
rename from private/templates/NetHope/gis_layer_feature.csv
rename to modules/templates/NetHope/gis_layer_feature.csv
diff --git a/private/templates/NetHope/gis_marker.csv b/modules/templates/NetHope/gis_marker.csv
similarity index 100%
rename from private/templates/NetHope/gis_marker.csv
rename to modules/templates/NetHope/gis_marker.csv
diff --git a/private/templates/NetHope/item_category.csv b/modules/templates/NetHope/item_category.csv
similarity index 100%
rename from private/templates/NetHope/item_category.csv
rename to modules/templates/NetHope/item_category.csv
diff --git a/private/templates/NetHope/tasks.cfg b/modules/templates/NetHope/tasks.cfg
similarity index 100%
rename from private/templates/NetHope/tasks.cfg
rename to modules/templates/NetHope/tasks.cfg
diff --git a/private/templates/NetHope/views/footer.html b/modules/templates/NetHope/views/footer.html
similarity index 100%
rename from private/templates/NetHope/views/footer.html
rename to modules/templates/NetHope/views/footer.html
diff --git a/private/templates/NetHope/views/index.html b/modules/templates/NetHope/views/index.html
similarity index 100%
rename from private/templates/NetHope/views/index.html
rename to modules/templates/NetHope/views/index.html
diff --git a/private/templates/NetHope/views/layout.html b/modules/templates/NetHope/views/layout.html
similarity index 100%
rename from private/templates/NetHope/views/layout.html
rename to modules/templates/NetHope/views/layout.html
diff --git a/private/templates/NetHope/__init__.py b/modules/templates/OCHAROCCA/__init__.py
similarity index 100%
rename from private/templates/NetHope/__init__.py
rename to modules/templates/OCHAROCCA/__init__.py
diff --git a/private/templates/OCHAROCCA/auth_roles.csv b/modules/templates/OCHAROCCA/auth_roles.csv
similarity index 100%
rename from private/templates/OCHAROCCA/auth_roles.csv
rename to modules/templates/OCHAROCCA/auth_roles.csv
diff --git a/private/templates/OCHAROCCA/config.py b/modules/templates/OCHAROCCA/config.py
similarity index 100%
rename from private/templates/OCHAROCCA/config.py
rename to modules/templates/OCHAROCCA/config.py
diff --git a/private/templates/OCHAROCCA/controllers.py b/modules/templates/OCHAROCCA/controllers.py
similarity index 100%
rename from private/templates/OCHAROCCA/controllers.py
rename to modules/templates/OCHAROCCA/controllers.py
diff --git a/private/templates/OCHAROCCA/countries.csv b/modules/templates/OCHAROCCA/countries.csv
similarity index 100%
rename from private/templates/OCHAROCCA/countries.csv
rename to modules/templates/OCHAROCCA/countries.csv
diff --git a/private/templates/OCHAROCCA/css.cfg b/modules/templates/OCHAROCCA/css.cfg
similarity index 100%
rename from private/templates/OCHAROCCA/css.cfg
rename to modules/templates/OCHAROCCA/css.cfg
diff --git a/private/templates/OCHAROCCA/gis_config.csv b/modules/templates/OCHAROCCA/gis_config.csv
similarity index 100%
rename from private/templates/OCHAROCCA/gis_config.csv
rename to modules/templates/OCHAROCCA/gis_config.csv
diff --git a/private/templates/OCHAROCCA/gis_hierarchy.csv b/modules/templates/OCHAROCCA/gis_hierarchy.csv
similarity index 100%
rename from private/templates/OCHAROCCA/gis_hierarchy.csv
rename to modules/templates/OCHAROCCA/gis_hierarchy.csv
diff --git a/private/templates/OCHAROCCA/gis_layer_feature.csv b/modules/templates/OCHAROCCA/gis_layer_feature.csv
similarity index 100%
rename from private/templates/OCHAROCCA/gis_layer_feature.csv
rename to modules/templates/OCHAROCCA/gis_layer_feature.csv
diff --git a/private/templates/OCHAROCCA/gis_marker.csv b/modules/templates/OCHAROCCA/gis_marker.csv
similarity index 100%
rename from private/templates/OCHAROCCA/gis_marker.csv
rename to modules/templates/OCHAROCCA/gis_marker.csv
diff --git a/private/templates/OCHAROCCA/impact_types.csv b/modules/templates/OCHAROCCA/impact_types.csv
similarity index 100%
rename from private/templates/OCHAROCCA/impact_types.csv
rename to modules/templates/OCHAROCCA/impact_types.csv
diff --git a/private/templates/OCHAROCCA/tasks.cfg b/modules/templates/OCHAROCCA/tasks.cfg
similarity index 100%
rename from private/templates/OCHAROCCA/tasks.cfg
rename to modules/templates/OCHAROCCA/tasks.cfg
diff --git a/private/templates/OCHAROCCA/tests.py b/modules/templates/OCHAROCCA/tests.py
similarity index 100%
rename from private/templates/OCHAROCCA/tests.py
rename to modules/templates/OCHAROCCA/tests.py
diff --git a/private/templates/OCHAROCCA/views/_summary.html b/modules/templates/OCHAROCCA/views/_summary.html
similarity index 100%
rename from private/templates/OCHAROCCA/views/_summary.html
rename to modules/templates/OCHAROCCA/views/_summary.html
diff --git a/private/templates/OCHAROCCA/views/footer.html b/modules/templates/OCHAROCCA/views/footer.html
similarity index 100%
rename from private/templates/OCHAROCCA/views/footer.html
rename to modules/templates/OCHAROCCA/views/footer.html
diff --git a/private/templates/OCHAROCCA/views/index.html b/modules/templates/OCHAROCCA/views/index.html
similarity index 100%
rename from private/templates/OCHAROCCA/views/index.html
rename to modules/templates/OCHAROCCA/views/index.html
diff --git a/private/templates/OCHAROCCA/views/layout.html b/modules/templates/OCHAROCCA/views/layout.html
similarity index 100%
rename from private/templates/OCHAROCCA/views/layout.html
rename to modules/templates/OCHAROCCA/views/layout.html
diff --git a/private/templates/OCHAROCCA/__init__.py b/modules/templates/Philippines/__init__.py
similarity index 100%
rename from private/templates/OCHAROCCA/__init__.py
rename to modules/templates/Philippines/__init__.py
diff --git a/private/templates/Philippines/auth_roles.csv b/modules/templates/Philippines/auth_roles.csv
similarity index 100%
rename from private/templates/Philippines/auth_roles.csv
rename to modules/templates/Philippines/auth_roles.csv
diff --git a/private/templates/Philippines/cms_post.csv b/modules/templates/Philippines/cms_post.csv
similarity index 100%
rename from private/templates/Philippines/cms_post.csv
rename to modules/templates/Philippines/cms_post.csv
diff --git a/private/templates/Philippines/config.py b/modules/templates/Philippines/config.py
similarity index 100%
rename from private/templates/Philippines/config.py
rename to modules/templates/Philippines/config.py
diff --git a/private/templates/Philippines/controllers.py b/modules/templates/Philippines/controllers.py
similarity index 100%
rename from private/templates/Philippines/controllers.py
rename to modules/templates/Philippines/controllers.py
diff --git a/private/templates/Philippines/css.cfg b/modules/templates/Philippines/css.cfg
similarity index 100%
rename from private/templates/Philippines/css.cfg
rename to modules/templates/Philippines/css.cfg
diff --git a/private/templates/Philippines/facility_type.csv b/modules/templates/Philippines/facility_type.csv
similarity index 100%
rename from private/templates/Philippines/facility_type.csv
rename to modules/templates/Philippines/facility_type.csv
diff --git a/private/templates/Philippines/gis_config.csv b/modules/templates/Philippines/gis_config.csv
similarity index 100%
rename from private/templates/Philippines/gis_config.csv
rename to modules/templates/Philippines/gis_config.csv
diff --git a/private/templates/Philippines/gis_hierarchy.csv b/modules/templates/Philippines/gis_hierarchy.csv
similarity index 100%
rename from private/templates/Philippines/gis_hierarchy.csv
rename to modules/templates/Philippines/gis_hierarchy.csv
diff --git a/private/templates/Philippines/gis_layer_feature.csv b/modules/templates/Philippines/gis_layer_feature.csv
similarity index 100%
rename from private/templates/Philippines/gis_layer_feature.csv
rename to modules/templates/Philippines/gis_layer_feature.csv
diff --git a/private/templates/Philippines/gis_layer_google.csv b/modules/templates/Philippines/gis_layer_google.csv
similarity index 100%
rename from private/templates/Philippines/gis_layer_google.csv
rename to modules/templates/Philippines/gis_layer_google.csv
diff --git a/private/templates/Philippines/gis_layer_theme.csv b/modules/templates/Philippines/gis_layer_theme.csv
similarity index 100%
rename from private/templates/Philippines/gis_layer_theme.csv
rename to modules/templates/Philippines/gis_layer_theme.csv
diff --git a/private/templates/Philippines/gis_projection.csv b/modules/templates/Philippines/gis_projection.csv
similarity index 100%
rename from private/templates/Philippines/gis_projection.csv
rename to modules/templates/Philippines/gis_projection.csv
diff --git a/private/templates/Philippines/gis_theme_data.csv b/modules/templates/Philippines/gis_theme_data.csv
similarity index 100%
rename from private/templates/Philippines/gis_theme_data.csv
rename to modules/templates/Philippines/gis_theme_data.csv
diff --git a/private/templates/Philippines/office_type.csv b/modules/templates/Philippines/office_type.csv
similarity index 100%
rename from private/templates/Philippines/office_type.csv
rename to modules/templates/Philippines/office_type.csv
diff --git a/private/templates/Philippines/org_facility.csv b/modules/templates/Philippines/org_facility.csv
similarity index 100%
rename from private/templates/Philippines/org_facility.csv
rename to modules/templates/Philippines/org_facility.csv
diff --git a/private/templates/Philippines/org_logos.csv b/modules/templates/Philippines/org_logos.csv
similarity index 100%
rename from private/templates/Philippines/org_logos.csv
rename to modules/templates/Philippines/org_logos.csv
diff --git a/private/templates/Philippines/org_resource_type.csv b/modules/templates/Philippines/org_resource_type.csv
similarity index 100%
rename from private/templates/Philippines/org_resource_type.csv
rename to modules/templates/Philippines/org_resource_type.csv
diff --git a/private/templates/Philippines/organisation.csv b/modules/templates/Philippines/organisation.csv
similarity index 100%
rename from private/templates/Philippines/organisation.csv
rename to modules/templates/Philippines/organisation.csv
diff --git a/private/templates/Philippines/organisation_type.csv b/modules/templates/Philippines/organisation_type.csv
similarity index 100%
rename from private/templates/Philippines/organisation_type.csv
rename to modules/templates/Philippines/organisation_type.csv
diff --git a/private/templates/Philippines/req_organisation_needs.csv b/modules/templates/Philippines/req_organisation_needs.csv
similarity index 100%
rename from private/templates/Philippines/req_organisation_needs.csv
rename to modules/templates/Philippines/req_organisation_needs.csv
diff --git a/private/templates/Philippines/req_site_needs.csv b/modules/templates/Philippines/req_site_needs.csv
similarity index 100%
rename from private/templates/Philippines/req_site_needs.csv
rename to modules/templates/Philippines/req_site_needs.csv
diff --git a/private/templates/Philippines/sector.csv b/modules/templates/Philippines/sector.csv
similarity index 100%
rename from private/templates/Philippines/sector.csv
rename to modules/templates/Philippines/sector.csv
diff --git a/private/templates/Philippines/staff.csv b/modules/templates/Philippines/staff.csv
similarity index 100%
rename from private/templates/Philippines/staff.csv
rename to modules/templates/Philippines/staff.csv
diff --git a/private/templates/Philippines/tasks.cfg b/modules/templates/Philippines/tasks.cfg
similarity index 100%
rename from private/templates/Philippines/tasks.cfg
rename to modules/templates/Philippines/tasks.cfg
diff --git a/private/templates/Philippines/telehealth.png b/modules/templates/Philippines/telehealth.png
similarity index 100%
rename from private/templates/Philippines/telehealth.png
rename to modules/templates/Philippines/telehealth.png
diff --git a/private/templates/Philippines/tests.py b/modules/templates/Philippines/tests.py
similarity index 100%
rename from private/templates/Philippines/tests.py
rename to modules/templates/Philippines/tests.py
diff --git a/private/templates/Philippines/users.csv b/modules/templates/Philippines/users.csv
similarity index 100%
rename from private/templates/Philippines/users.csv
rename to modules/templates/Philippines/users.csv
diff --git a/private/templates/Philippines/views/_create.html b/modules/templates/Philippines/views/_create.html
similarity index 100%
rename from private/templates/Philippines/views/_create.html
rename to modules/templates/Philippines/views/_create.html
diff --git a/private/templates/Philippines/views/_list_filter.html b/modules/templates/Philippines/views/_list_filter.html
similarity index 100%
rename from private/templates/Philippines/views/_list_filter.html
rename to modules/templates/Philippines/views/_list_filter.html
diff --git a/private/templates/DRMP/views/_popup.html b/modules/templates/Philippines/views/_popup.html
similarity index 100%
rename from private/templates/DRMP/views/_popup.html
rename to modules/templates/Philippines/views/_popup.html
diff --git a/private/templates/Philippines/views/_update.html b/modules/templates/Philippines/views/_update.html
similarity index 100%
rename from private/templates/Philippines/views/_update.html
rename to modules/templates/Philippines/views/_update.html
diff --git a/private/templates/Philippines/views/footer.html b/modules/templates/Philippines/views/footer.html
similarity index 100%
rename from private/templates/Philippines/views/footer.html
rename to modules/templates/Philippines/views/footer.html
diff --git a/private/templates/Philippines/views/index.html b/modules/templates/Philippines/views/index.html
similarity index 100%
rename from private/templates/Philippines/views/index.html
rename to modules/templates/Philippines/views/index.html
diff --git a/private/templates/Philippines/views/layout.html b/modules/templates/Philippines/views/layout.html
similarity index 100%
rename from private/templates/Philippines/views/layout.html
rename to modules/templates/Philippines/views/layout.html
diff --git a/private/templates/Philippines/views/subscriptions.html b/modules/templates/Philippines/views/subscriptions.html
similarity index 100%
rename from private/templates/Philippines/views/subscriptions.html
rename to modules/templates/Philippines/views/subscriptions.html
diff --git a/private/templates/Philippines/views/tos.html b/modules/templates/Philippines/views/tos.html
similarity index 100%
rename from private/templates/Philippines/views/tos.html
rename to modules/templates/Philippines/views/tos.html
diff --git a/private/templates/Philippines/__init__.py b/modules/templates/RGIMS/__init__.py
similarity index 100%
rename from private/templates/Philippines/__init__.py
rename to modules/templates/RGIMS/__init__.py
diff --git a/private/templates/RGIMS/auth_roles.csv b/modules/templates/RGIMS/auth_roles.csv
similarity index 100%
rename from private/templates/RGIMS/auth_roles.csv
rename to modules/templates/RGIMS/auth_roles.csv
diff --git a/private/templates/RGIMS/config.py b/modules/templates/RGIMS/config.py
similarity index 100%
rename from private/templates/RGIMS/config.py
rename to modules/templates/RGIMS/config.py
diff --git a/private/templates/RGIMS/controllers.py b/modules/templates/RGIMS/controllers.py
similarity index 100%
rename from private/templates/RGIMS/controllers.py
rename to modules/templates/RGIMS/controllers.py
diff --git a/private/templates/RGIMS/css.cfg b/modules/templates/RGIMS/css.cfg
similarity index 100%
rename from private/templates/RGIMS/css.cfg
rename to modules/templates/RGIMS/css.cfg
diff --git a/private/templates/RGIMS/dswd.png b/modules/templates/RGIMS/dswd.png
similarity index 100%
rename from private/templates/RGIMS/dswd.png
rename to modules/templates/RGIMS/dswd.png
diff --git a/private/templates/RGIMS/gis_config.csv b/modules/templates/RGIMS/gis_config.csv
similarity index 100%
rename from private/templates/RGIMS/gis_config.csv
rename to modules/templates/RGIMS/gis_config.csv
diff --git a/private/templates/RGIMS/gis_hierarchy.csv b/modules/templates/RGIMS/gis_hierarchy.csv
similarity index 100%
rename from private/templates/RGIMS/gis_hierarchy.csv
rename to modules/templates/RGIMS/gis_hierarchy.csv
diff --git a/private/templates/RGIMS/gis_layer_feature.csv b/modules/templates/RGIMS/gis_layer_feature.csv
similarity index 100%
rename from private/templates/RGIMS/gis_layer_feature.csv
rename to modules/templates/RGIMS/gis_layer_feature.csv
diff --git a/private/templates/RGIMS/organisation.csv b/modules/templates/RGIMS/organisation.csv
similarity index 100%
rename from private/templates/RGIMS/organisation.csv
rename to modules/templates/RGIMS/organisation.csv
diff --git a/private/templates/RGIMS/tasks.cfg b/modules/templates/RGIMS/tasks.cfg
similarity index 100%
rename from private/templates/RGIMS/tasks.cfg
rename to modules/templates/RGIMS/tasks.cfg
diff --git a/private/templates/RGIMS/views/footer.html b/modules/templates/RGIMS/views/footer.html
similarity index 100%
rename from private/templates/RGIMS/views/footer.html
rename to modules/templates/RGIMS/views/footer.html
diff --git a/private/templates/RGIMS/views/index.html b/modules/templates/RGIMS/views/index.html
similarity index 100%
rename from private/templates/RGIMS/views/index.html
rename to modules/templates/RGIMS/views/index.html
diff --git a/private/templates/RGIMS/views/layout.html b/modules/templates/RGIMS/views/layout.html
similarity index 100%
rename from private/templates/RGIMS/views/layout.html
rename to modules/templates/RGIMS/views/layout.html
diff --git a/private/templates/RGIMS/warehouse.csv b/modules/templates/RGIMS/warehouse.csv
similarity index 100%
rename from private/templates/RGIMS/warehouse.csv
rename to modules/templates/RGIMS/warehouse.csv
diff --git a/private/templates/RGIMS/warehouse_stock.csv b/modules/templates/RGIMS/warehouse_stock.csv
similarity index 100%
rename from private/templates/RGIMS/warehouse_stock.csv
rename to modules/templates/RGIMS/warehouse_stock.csv
diff --git a/private/templates/SSF/Test/task.csv b/modules/templates/SSF/Test/task.csv
similarity index 100%
rename from private/templates/SSF/Test/task.csv
rename to modules/templates/SSF/Test/task.csv
diff --git a/private/templates/SSF/Test/tasks.cfg b/modules/templates/SSF/Test/tasks.cfg
similarity index 100%
rename from private/templates/SSF/Test/tasks.cfg
rename to modules/templates/SSF/Test/tasks.cfg
diff --git a/private/templates/SSF/Test/time.csv b/modules/templates/SSF/Test/time.csv
similarity index 100%
rename from private/templates/SSF/Test/time.csv
rename to modules/templates/SSF/Test/time.csv
diff --git a/private/templates/SSF/Test/users.csv b/modules/templates/SSF/Test/users.csv
similarity index 100%
rename from private/templates/SSF/Test/users.csv
rename to modules/templates/SSF/Test/users.csv
diff --git a/private/templates/SSF/__init__.py b/modules/templates/SSF/__init__.py
similarity index 100%
rename from private/templates/SSF/__init__.py
rename to modules/templates/SSF/__init__.py
diff --git a/private/templates/SSF/auth_roles.csv b/modules/templates/SSF/auth_roles.csv
similarity index 100%
rename from private/templates/SSF/auth_roles.csv
rename to modules/templates/SSF/auth_roles.csv
diff --git a/private/templates/SSF/config.py b/modules/templates/SSF/config.py
similarity index 100%
rename from private/templates/SSF/config.py
rename to modules/templates/SSF/config.py
diff --git a/private/templates/SSF/controllers.py b/modules/templates/SSF/controllers.py
similarity index 100%
rename from private/templates/SSF/controllers.py
rename to modules/templates/SSF/controllers.py
diff --git a/private/templates/SSF/css.cfg b/modules/templates/SSF/css.cfg
similarity index 100%
rename from private/templates/SSF/css.cfg
rename to modules/templates/SSF/css.cfg
diff --git a/private/templates/SSF/gis_marker.csv b/modules/templates/SSF/gis_marker.csv
similarity index 100%
rename from private/templates/SSF/gis_marker.csv
rename to modules/templates/SSF/gis_marker.csv
diff --git a/private/templates/SSF/job_title.csv b/modules/templates/SSF/job_title.csv
similarity index 100%
rename from private/templates/SSF/job_title.csv
rename to modules/templates/SSF/job_title.csv
diff --git a/private/templates/SSF/menus.py b/modules/templates/SSF/menus.py
similarity index 100%
rename from private/templates/SSF/menus.py
rename to modules/templates/SSF/menus.py
diff --git a/private/templates/SSF/org_sector.csv b/modules/templates/SSF/org_sector.csv
similarity index 100%
rename from private/templates/SSF/org_sector.csv
rename to modules/templates/SSF/org_sector.csv
diff --git a/private/templates/SSF/organisation.csv b/modules/templates/SSF/organisation.csv
similarity index 100%
rename from private/templates/SSF/organisation.csv
rename to modules/templates/SSF/organisation.csv
diff --git a/private/templates/SSF/pr_group.csv b/modules/templates/SSF/pr_group.csv
similarity index 100%
rename from private/templates/SSF/pr_group.csv
rename to modules/templates/SSF/pr_group.csv
diff --git a/private/templates/SSF/project_activity_type.csv b/modules/templates/SSF/project_activity_type.csv
similarity index 100%
rename from private/templates/SSF/project_activity_type.csv
rename to modules/templates/SSF/project_activity_type.csv
diff --git a/private/templates/SSF/project_role.csv b/modules/templates/SSF/project_role.csv
similarity index 100%
rename from private/templates/SSF/project_role.csv
rename to modules/templates/SSF/project_role.csv
diff --git a/private/templates/SSF/project_tag.csv b/modules/templates/SSF/project_tag.csv
similarity index 100%
rename from private/templates/SSF/project_tag.csv
rename to modules/templates/SSF/project_tag.csv
diff --git a/private/templates/SSF/tasks.cfg b/modules/templates/SSF/tasks.cfg
similarity index 100%
rename from private/templates/SSF/tasks.cfg
rename to modules/templates/SSF/tasks.cfg
diff --git a/private/templates/SSF/views/deployment_page.html b/modules/templates/SSF/views/deployment_page.html
similarity index 100%
rename from private/templates/SSF/views/deployment_page.html
rename to modules/templates/SSF/views/deployment_page.html
diff --git a/private/templates/SSF/views/footer.html b/modules/templates/SSF/views/footer.html
similarity index 100%
rename from private/templates/SSF/views/footer.html
rename to modules/templates/SSF/views/footer.html
diff --git a/private/templates/SSF/views/index.html b/modules/templates/SSF/views/index.html
similarity index 100%
rename from private/templates/SSF/views/index.html
rename to modules/templates/SSF/views/index.html
diff --git a/private/templates/SSF/views/layout.html b/modules/templates/SSF/views/layout.html
similarity index 100%
rename from private/templates/SSF/views/layout.html
rename to modules/templates/SSF/views/layout.html
diff --git a/private/templates/SSF/views/msg/notify_email.html b/modules/templates/SSF/views/msg/notify_email.html
similarity index 100%
rename from private/templates/SSF/views/msg/notify_email.html
rename to modules/templates/SSF/views/msg/notify_email.html
diff --git a/private/templates/SSF/views/subscriptions.html b/modules/templates/SSF/views/subscriptions.html
similarity index 100%
rename from private/templates/SSF/views/subscriptions.html
rename to modules/templates/SSF/views/subscriptions.html
diff --git a/private/templates/RGIMS/__init__.py b/modules/templates/Syria/__init__.py
similarity index 100%
rename from private/templates/RGIMS/__init__.py
rename to modules/templates/Syria/__init__.py
diff --git a/private/templates/Syria/auth_roles.csv b/modules/templates/Syria/auth_roles.csv
similarity index 100%
rename from private/templates/Syria/auth_roles.csv
rename to modules/templates/Syria/auth_roles.csv
diff --git a/private/templates/Syria/cms_series.csv b/modules/templates/Syria/cms_series.csv
similarity index 100%
rename from private/templates/Syria/cms_series.csv
rename to modules/templates/Syria/cms_series.csv
diff --git a/private/templates/Syria/config.py b/modules/templates/Syria/config.py
similarity index 100%
rename from private/templates/Syria/config.py
rename to modules/templates/Syria/config.py
diff --git a/private/templates/Syria/controllers.py b/modules/templates/Syria/controllers.py
similarity index 100%
rename from private/templates/Syria/controllers.py
rename to modules/templates/Syria/controllers.py
diff --git a/private/templates/Syria/css.cfg b/modules/templates/Syria/css.cfg
similarity index 100%
rename from private/templates/Syria/css.cfg
rename to modules/templates/Syria/css.cfg
diff --git a/private/templates/Syria/gis_config.csv b/modules/templates/Syria/gis_config.csv
similarity index 100%
rename from private/templates/Syria/gis_config.csv
rename to modules/templates/Syria/gis_config.csv
diff --git a/private/templates/Syria/gis_hierarchy.csv b/modules/templates/Syria/gis_hierarchy.csv
similarity index 100%
rename from private/templates/Syria/gis_hierarchy.csv
rename to modules/templates/Syria/gis_hierarchy.csv
diff --git a/private/templates/Syria/gis_layer_feature.csv b/modules/templates/Syria/gis_layer_feature.csv
similarity index 100%
rename from private/templates/Syria/gis_layer_feature.csv
rename to modules/templates/Syria/gis_layer_feature.csv
diff --git a/private/templates/Syria/gis_layer_google.csv b/modules/templates/Syria/gis_layer_google.csv
similarity index 100%
rename from private/templates/Syria/gis_layer_google.csv
rename to modules/templates/Syria/gis_layer_google.csv
diff --git a/private/templates/Syria/gis_layer_theme.csv b/modules/templates/Syria/gis_layer_theme.csv
similarity index 100%
rename from private/templates/Syria/gis_layer_theme.csv
rename to modules/templates/Syria/gis_layer_theme.csv
diff --git a/private/templates/Syria/gis_marker.csv b/modules/templates/Syria/gis_marker.csv
similarity index 100%
rename from private/templates/Syria/gis_marker.csv
rename to modules/templates/Syria/gis_marker.csv
diff --git a/private/templates/Syria/gis_projection.csv b/modules/templates/Syria/gis_projection.csv
similarity index 100%
rename from private/templates/Syria/gis_projection.csv
rename to modules/templates/Syria/gis_projection.csv
diff --git a/private/templates/Syria/gis_theme_data.csv b/modules/templates/Syria/gis_theme_data.csv
similarity index 100%
rename from private/templates/Syria/gis_theme_data.csv
rename to modules/templates/Syria/gis_theme_data.csv
diff --git a/private/templates/Syria/office_type.csv b/modules/templates/Syria/office_type.csv
similarity index 100%
rename from private/templates/Syria/office_type.csv
rename to modules/templates/Syria/office_type.csv
diff --git a/private/templates/Syria/organisation.csv b/modules/templates/Syria/organisation.csv
similarity index 100%
rename from private/templates/Syria/organisation.csv
rename to modules/templates/Syria/organisation.csv
diff --git a/private/templates/Syria/organisation2.csv b/modules/templates/Syria/organisation2.csv
similarity index 100%
rename from private/templates/Syria/organisation2.csv
rename to modules/templates/Syria/organisation2.csv
diff --git a/private/templates/Syria/organisation_type.csv b/modules/templates/Syria/organisation_type.csv
similarity index 100%
rename from private/templates/Syria/organisation_type.csv
rename to modules/templates/Syria/organisation_type.csv
diff --git a/private/templates/Syria/project_activity_type.csv b/modules/templates/Syria/project_activity_type.csv
similarity index 100%
rename from private/templates/Syria/project_activity_type.csv
rename to modules/templates/Syria/project_activity_type.csv
diff --git a/private/templates/Syria/project_beneficiary_type.csv b/modules/templates/Syria/project_beneficiary_type.csv
similarity index 100%
rename from private/templates/Syria/project_beneficiary_type.csv
rename to modules/templates/Syria/project_beneficiary_type.csv
diff --git a/private/templates/Syria/project_beneficiary_type2.csv b/modules/templates/Syria/project_beneficiary_type2.csv
similarity index 100%
rename from private/templates/Syria/project_beneficiary_type2.csv
rename to modules/templates/Syria/project_beneficiary_type2.csv
diff --git a/private/templates/Syria/project_status.csv b/modules/templates/Syria/project_status.csv
similarity index 100%
rename from private/templates/Syria/project_status.csv
rename to modules/templates/Syria/project_status.csv
diff --git a/private/templates/Syria/sector.csv b/modules/templates/Syria/sector.csv
similarity index 100%
rename from private/templates/Syria/sector.csv
rename to modules/templates/Syria/sector.csv
diff --git a/private/templates/Syria/tasks.cfg b/modules/templates/Syria/tasks.cfg
similarity index 100%
rename from private/templates/Syria/tasks.cfg
rename to modules/templates/Syria/tasks.cfg
diff --git a/private/templates/Syria/tests.py b/modules/templates/Syria/tests.py
similarity index 100%
rename from private/templates/Syria/tests.py
rename to modules/templates/Syria/tests.py
diff --git a/private/templates/Syria/views/_create.html b/modules/templates/Syria/views/_create.html
similarity index 100%
rename from private/templates/Syria/views/_create.html
rename to modules/templates/Syria/views/_create.html
diff --git a/private/templates/Syria/views/_list_filter.html b/modules/templates/Syria/views/_list_filter.html
similarity index 100%
rename from private/templates/Syria/views/_list_filter.html
rename to modules/templates/Syria/views/_list_filter.html
diff --git a/private/templates/Philippines/views/_popup.html b/modules/templates/Syria/views/_popup.html
similarity index 100%
rename from private/templates/Philippines/views/_popup.html
rename to modules/templates/Syria/views/_popup.html
diff --git a/private/templates/Syria/views/_summary.html b/modules/templates/Syria/views/_summary.html
similarity index 100%
rename from private/templates/Syria/views/_summary.html
rename to modules/templates/Syria/views/_summary.html
diff --git a/private/templates/Syria/views/_update.html b/modules/templates/Syria/views/_update.html
similarity index 100%
rename from private/templates/Syria/views/_update.html
rename to modules/templates/Syria/views/_update.html
diff --git a/private/templates/CRMT/views/footer.html b/modules/templates/Syria/views/footer.html
similarity index 100%
rename from private/templates/CRMT/views/footer.html
rename to modules/templates/Syria/views/footer.html
diff --git a/private/templates/Syria/views/layout.html b/modules/templates/Syria/views/layout.html
similarity index 100%
rename from private/templates/Syria/views/layout.html
rename to modules/templates/Syria/views/layout.html
diff --git a/private/templates/Syria/views/msg/notify_post_email.html b/modules/templates/Syria/views/msg/notify_post_email.html
similarity index 100%
rename from private/templates/Syria/views/msg/notify_post_email.html
rename to modules/templates/Syria/views/msg/notify_post_email.html
diff --git a/private/templates/Vulnerability/aggregated_indicator.csv b/modules/templates/Vulnerability/aggregated_indicator.csv
similarity index 100%
rename from private/templates/Vulnerability/aggregated_indicator.csv
rename to modules/templates/Vulnerability/aggregated_indicator.csv
diff --git a/private/templates/Vulnerability/css.cfg b/modules/templates/Vulnerability/css.cfg
similarity index 100%
rename from private/templates/Vulnerability/css.cfg
rename to modules/templates/Vulnerability/css.cfg
diff --git a/private/templates/Vulnerability/demographic_data_fast.csv b/modules/templates/Vulnerability/demographic_data_fast.csv
similarity index 100%
rename from private/templates/Vulnerability/demographic_data_fast.csv
rename to modules/templates/Vulnerability/demographic_data_fast.csv
diff --git a/private/templates/Vulnerability/demographic_data_long.csv b/modules/templates/Vulnerability/demographic_data_long.csv
similarity index 100%
rename from private/templates/Vulnerability/demographic_data_long.csv
rename to modules/templates/Vulnerability/demographic_data_long.csv
diff --git a/private/templates/Vulnerability/demographic_data_short.csv b/modules/templates/Vulnerability/demographic_data_short.csv
similarity index 100%
rename from private/templates/Vulnerability/demographic_data_short.csv
rename to modules/templates/Vulnerability/demographic_data_short.csv
diff --git a/private/templates/Vulnerability/gis_layer_feature.csv b/modules/templates/Vulnerability/gis_layer_feature.csv
similarity index 100%
rename from private/templates/Vulnerability/gis_layer_feature.csv
rename to modules/templates/Vulnerability/gis_layer_feature.csv
diff --git a/private/templates/Vulnerability/indicator.csv b/modules/templates/Vulnerability/indicator.csv
similarity index 100%
rename from private/templates/Vulnerability/indicator.csv
rename to modules/templates/Vulnerability/indicator.csv
diff --git a/private/templates/Vulnerability/views/layout.html b/modules/templates/Vulnerability/views/layout.html
similarity index 100%
rename from private/templates/Vulnerability/views/layout.html
rename to modules/templates/Vulnerability/views/layout.html
diff --git a/private/templates/Vulnerability/vulnerability_data_fast.csv b/modules/templates/Vulnerability/vulnerability_data_fast.csv
similarity index 100%
rename from private/templates/Vulnerability/vulnerability_data_fast.csv
rename to modules/templates/Vulnerability/vulnerability_data_fast.csv
diff --git a/private/templates/Vulnerability/vulnerability_data_historical_long.csv b/modules/templates/Vulnerability/vulnerability_data_historical_long.csv
similarity index 100%
rename from private/templates/Vulnerability/vulnerability_data_historical_long.csv
rename to modules/templates/Vulnerability/vulnerability_data_historical_long.csv
diff --git a/private/templates/Vulnerability/vulnerability_data_historical_short.csv b/modules/templates/Vulnerability/vulnerability_data_historical_short.csv
similarity index 100%
rename from private/templates/Vulnerability/vulnerability_data_historical_short.csv
rename to modules/templates/Vulnerability/vulnerability_data_historical_short.csv
diff --git a/private/templates/Vulnerability/vulnerability_data_long.csv b/modules/templates/Vulnerability/vulnerability_data_long.csv
similarity index 100%
rename from private/templates/Vulnerability/vulnerability_data_long.csv
rename to modules/templates/Vulnerability/vulnerability_data_long.csv
diff --git a/private/templates/Vulnerability/vulnerability_data_short.csv b/modules/templates/Vulnerability/vulnerability_data_short.csv
similarity index 100%
rename from private/templates/Vulnerability/vulnerability_data_short.csv
rename to modules/templates/Vulnerability/vulnerability_data_short.csv
diff --git a/private/templates/locations/BI_L1.csv b/modules/templates/locations/BI_L1.csv
similarity index 100%
rename from private/templates/locations/BI_L1.csv
rename to modules/templates/locations/BI_L1.csv
diff --git a/private/templates/locations/CF_L1.csv b/modules/templates/locations/CF_L1.csv
similarity index 100%
rename from private/templates/locations/CF_L1.csv
rename to modules/templates/locations/CF_L1.csv
diff --git a/private/templates/locations/CK_L1.csv b/modules/templates/locations/CK_L1.csv
similarity index 100%
rename from private/templates/locations/CK_L1.csv
rename to modules/templates/locations/CK_L1.csv
diff --git a/private/templates/locations/California_L2.csv b/modules/templates/locations/California_L2.csv
similarity index 100%
rename from private/templates/locations/California_L2.csv
rename to modules/templates/locations/California_L2.csv
diff --git a/private/templates/locations/GN_L1.csv b/modules/templates/locations/GN_L1.csv
similarity index 100%
rename from private/templates/locations/GN_L1.csv
rename to modules/templates/locations/GN_L1.csv
diff --git a/private/templates/locations/GN_L2.csv b/modules/templates/locations/GN_L2.csv
similarity index 100%
rename from private/templates/locations/GN_L2.csv
rename to modules/templates/locations/GN_L2.csv
diff --git a/private/templates/locations/GN_demographic_data.csv b/modules/templates/locations/GN_demographic_data.csv
similarity index 100%
rename from private/templates/locations/GN_demographic_data.csv
rename to modules/templates/locations/GN_demographic_data.csv
diff --git a/private/templates/locations/GR_L1.csv b/modules/templates/locations/GR_L1.csv
similarity index 100%
rename from private/templates/locations/GR_L1.csv
rename to modules/templates/locations/GR_L1.csv
diff --git a/private/templates/locations/IN_L1.csv b/modules/templates/locations/IN_L1.csv
similarity index 100%
rename from private/templates/locations/IN_L1.csv
rename to modules/templates/locations/IN_L1.csv
diff --git a/private/templates/locations/IT_L1.csv b/modules/templates/locations/IT_L1.csv
similarity index 100%
rename from private/templates/locations/IT_L1.csv
rename to modules/templates/locations/IT_L1.csv
diff --git a/private/templates/locations/IT_L2.csv b/modules/templates/locations/IT_L2.csv
similarity index 100%
rename from private/templates/locations/IT_L2.csv
rename to modules/templates/locations/IT_L2.csv
diff --git a/private/templates/locations/IT_L3.csv b/modules/templates/locations/IT_L3.csv
similarity index 100%
rename from private/templates/locations/IT_L3.csv
rename to modules/templates/locations/IT_L3.csv
diff --git a/private/templates/locations/KE_L1.csv b/modules/templates/locations/KE_L1.csv
similarity index 100%
rename from private/templates/locations/KE_L1.csv
rename to modules/templates/locations/KE_L1.csv
diff --git a/private/templates/locations/LA_L4.csv b/modules/templates/locations/LA_L4.csv
similarity index 100%
rename from private/templates/locations/LA_L4.csv
rename to modules/templates/locations/LA_L4.csv
diff --git a/private/templates/locations/LB_L1.csv b/modules/templates/locations/LB_L1.csv
similarity index 100%
rename from private/templates/locations/LB_L1.csv
rename to modules/templates/locations/LB_L1.csv
diff --git a/private/templates/locations/LR_L1.csv b/modules/templates/locations/LR_L1.csv
similarity index 100%
rename from private/templates/locations/LR_L1.csv
rename to modules/templates/locations/LR_L1.csv
diff --git a/private/templates/locations/LR_demographic_data.csv b/modules/templates/locations/LR_demographic_data.csv
similarity index 100%
rename from private/templates/locations/LR_demographic_data.csv
rename to modules/templates/locations/LR_demographic_data.csv
diff --git a/private/templates/locations/ML_L1.csv b/modules/templates/locations/ML_L1.csv
similarity index 100%
rename from private/templates/locations/ML_L1.csv
rename to modules/templates/locations/ML_L1.csv
diff --git a/private/templates/locations/ML_L2.csv b/modules/templates/locations/ML_L2.csv
similarity index 100%
rename from private/templates/locations/ML_L2.csv
rename to modules/templates/locations/ML_L2.csv
diff --git a/private/templates/locations/MN_L1.csv b/modules/templates/locations/MN_L1.csv
similarity index 100%
rename from private/templates/locations/MN_L1.csv
rename to modules/templates/locations/MN_L1.csv
diff --git a/private/templates/locations/MV_L1.csv b/modules/templates/locations/MV_L1.csv
similarity index 100%
rename from private/templates/locations/MV_L1.csv
rename to modules/templates/locations/MV_L1.csv
diff --git a/private/templates/locations/MV_L2.csv b/modules/templates/locations/MV_L2.csv
similarity index 100%
rename from private/templates/locations/MV_L2.csv
rename to modules/templates/locations/MV_L2.csv
diff --git a/private/templates/locations/NG_L1.csv b/modules/templates/locations/NG_L1.csv
similarity index 100%
rename from private/templates/locations/NG_L1.csv
rename to modules/templates/locations/NG_L1.csv
diff --git a/private/templates/locations/NYC_L4.csv b/modules/templates/locations/NYC_L4.csv
similarity index 100%
rename from private/templates/locations/NYC_L4.csv
rename to modules/templates/locations/NYC_L4.csv
diff --git a/private/templates/locations/PH_L1.csv b/modules/templates/locations/PH_L1.csv
similarity index 100%
rename from private/templates/locations/PH_L1.csv
rename to modules/templates/locations/PH_L1.csv
diff --git a/private/templates/locations/SE_L1.csv b/modules/templates/locations/SE_L1.csv
similarity index 100%
rename from private/templates/locations/SE_L1.csv
rename to modules/templates/locations/SE_L1.csv
diff --git a/private/templates/locations/SE_L2.csv b/modules/templates/locations/SE_L2.csv
similarity index 100%
rename from private/templates/locations/SE_L2.csv
rename to modules/templates/locations/SE_L2.csv
diff --git a/private/templates/locations/SL_L1.csv b/modules/templates/locations/SL_L1.csv
similarity index 100%
rename from private/templates/locations/SL_L1.csv
rename to modules/templates/locations/SL_L1.csv
diff --git a/private/templates/locations/SL_L2.csv b/modules/templates/locations/SL_L2.csv
similarity index 100%
rename from private/templates/locations/SL_L2.csv
rename to modules/templates/locations/SL_L2.csv
diff --git a/private/templates/locations/SL_demographic_data.csv b/modules/templates/locations/SL_demographic_data.csv
similarity index 100%
rename from private/templates/locations/SL_demographic_data.csv
rename to modules/templates/locations/SL_demographic_data.csv
diff --git a/private/templates/locations/SN_L1.csv b/modules/templates/locations/SN_L1.csv
similarity index 100%
rename from private/templates/locations/SN_L1.csv
rename to modules/templates/locations/SN_L1.csv
diff --git a/private/templates/locations/SN_L2.csv b/modules/templates/locations/SN_L2.csv
similarity index 100%
rename from private/templates/locations/SN_L2.csv
rename to modules/templates/locations/SN_L2.csv
diff --git a/private/templates/locations/SN_L3.csv b/modules/templates/locations/SN_L3.csv
similarity index 100%
rename from private/templates/locations/SN_L3.csv
rename to modules/templates/locations/SN_L3.csv
diff --git a/private/templates/locations/SY_L1.csv b/modules/templates/locations/SY_L1.csv
similarity index 100%
rename from private/templates/locations/SY_L1.csv
rename to modules/templates/locations/SY_L1.csv
diff --git a/private/templates/locations/TD_L1.csv b/modules/templates/locations/TD_L1.csv
similarity index 100%
rename from private/templates/locations/TD_L1.csv
rename to modules/templates/locations/TD_L1.csv
diff --git a/private/templates/locations/TL_L0.csv b/modules/templates/locations/TL_L0.csv
similarity index 100%
rename from private/templates/locations/TL_L0.csv
rename to modules/templates/locations/TL_L0.csv
diff --git a/private/templates/locations/TL_L1.csv b/modules/templates/locations/TL_L1.csv
similarity index 100%
rename from private/templates/locations/TL_L1.csv
rename to modules/templates/locations/TL_L1.csv
diff --git a/private/templates/locations/TL_L2.csv b/modules/templates/locations/TL_L2.csv
similarity index 100%
rename from private/templates/locations/TL_L2.csv
rename to modules/templates/locations/TL_L2.csv
diff --git a/private/templates/locations/TL_L3.csv b/modules/templates/locations/TL_L3.csv
similarity index 100%
rename from private/templates/locations/TL_L3.csv
rename to modules/templates/locations/TL_L3.csv
diff --git a/private/templates/locations/TL_L4.csv b/modules/templates/locations/TL_L4.csv
similarity index 100%
rename from private/templates/locations/TL_L4.csv
rename to modules/templates/locations/TL_L4.csv
diff --git a/private/templates/locations/US_L0.csv b/modules/templates/locations/US_L0.csv
similarity index 100%
rename from private/templates/locations/US_L0.csv
rename to modules/templates/locations/US_L0.csv
diff --git a/private/templates/locations/US_L1.csv b/modules/templates/locations/US_L1.csv
similarity index 100%
rename from private/templates/locations/US_L1.csv
rename to modules/templates/locations/US_L1.csv
diff --git a/private/templates/locations/US_L2.csv b/modules/templates/locations/US_L2.csv
similarity index 100%
rename from private/templates/locations/US_L2.csv
rename to modules/templates/locations/US_L2.csv
diff --git a/private/templates/locations/US_gis_hierarchy.csv b/modules/templates/locations/US_gis_hierarchy.csv
similarity index 100%
rename from private/templates/locations/US_gis_hierarchy.csv
rename to modules/templates/locations/US_gis_hierarchy.csv
diff --git a/private/templates/locations/countries.csv b/modules/templates/locations/countries.csv
similarity index 100%
rename from private/templates/locations/countries.csv
rename to modules/templates/locations/countries.csv
diff --git a/private/templates/Syria/__init__.py b/modules/templates/mobile/__init__.py
similarity index 100%
rename from private/templates/Syria/__init__.py
rename to modules/templates/mobile/__init__.py
diff --git a/private/templates/mobile/css.cfg b/modules/templates/mobile/css.cfg
similarity index 100%
rename from private/templates/mobile/css.cfg
rename to modules/templates/mobile/css.cfg
diff --git a/private/templates/mobile/views/layout.html b/modules/templates/mobile/views/layout.html
similarity index 100%
rename from private/templates/mobile/views/layout.html
rename to modules/templates/mobile/views/layout.html
diff --git a/private/templates/setup/__init__.py b/modules/templates/setup/__init__.py
similarity index 100%
rename from private/templates/setup/__init__.py
rename to modules/templates/setup/__init__.py
diff --git a/private/templates/setup/config.py b/modules/templates/setup/config.py
similarity index 100%
rename from private/templates/setup/config.py
rename to modules/templates/setup/config.py
diff --git a/private/templates/test/inv-mngt/inv_item.csv b/modules/templates/test/inv-mngt/inv_item.csv
similarity index 100%
rename from private/templates/test/inv-mngt/inv_item.csv
rename to modules/templates/test/inv-mngt/inv_item.csv
diff --git a/private/templates/test/inv-mngt/masterUsers.csv b/modules/templates/test/inv-mngt/masterUsers.csv
similarity index 100%
rename from private/templates/test/inv-mngt/masterUsers.csv
rename to modules/templates/test/inv-mngt/masterUsers.csv
diff --git a/private/templates/test/inv-mngt/office.csv b/modules/templates/test/inv-mngt/office.csv
similarity index 100%
rename from private/templates/test/inv-mngt/office.csv
rename to modules/templates/test/inv-mngt/office.csv
diff --git a/private/templates/test/inv-mngt/organisation.csv b/modules/templates/test/inv-mngt/organisation.csv
similarity index 100%
rename from private/templates/test/inv-mngt/organisation.csv
rename to modules/templates/test/inv-mngt/organisation.csv
diff --git a/private/templates/test/inv-mngt/people.csv b/modules/templates/test/inv-mngt/people.csv
similarity index 100%
rename from private/templates/test/inv-mngt/people.csv
rename to modules/templates/test/inv-mngt/people.csv
diff --git a/private/templates/test/inv-mngt/req_item.csv b/modules/templates/test/inv-mngt/req_item.csv
similarity index 100%
rename from private/templates/test/inv-mngt/req_item.csv
rename to modules/templates/test/inv-mngt/req_item.csv
diff --git a/private/templates/test/inv-mngt/req_req.csv b/modules/templates/test/inv-mngt/req_req.csv
similarity index 100%
rename from private/templates/test/inv-mngt/req_req.csv
rename to modules/templates/test/inv-mngt/req_req.csv
diff --git a/private/templates/test/inv-mngt/tasks.cfg b/modules/templates/test/inv-mngt/tasks.cfg
similarity index 100%
rename from private/templates/test/inv-mngt/tasks.cfg
rename to modules/templates/test/inv-mngt/tasks.cfg
diff --git a/private/templates/test/inv-mngt/track_item1.csv b/modules/templates/test/inv-mngt/track_item1.csv
similarity index 100%
rename from private/templates/test/inv-mngt/track_item1.csv
rename to modules/templates/test/inv-mngt/track_item1.csv
diff --git a/private/templates/test/inv-mngt/track_item2.csv b/modules/templates/test/inv-mngt/track_item2.csv
similarity index 100%
rename from private/templates/test/inv-mngt/track_item2.csv
rename to modules/templates/test/inv-mngt/track_item2.csv
diff --git a/private/templates/test/inv-mngt/track_item3.csv b/modules/templates/test/inv-mngt/track_item3.csv
similarity index 100%
rename from private/templates/test/inv-mngt/track_item3.csv
rename to modules/templates/test/inv-mngt/track_item3.csv
diff --git a/private/templates/test/inv-mngt/track_item4.csv b/modules/templates/test/inv-mngt/track_item4.csv
similarity index 100%
rename from private/templates/test/inv-mngt/track_item4.csv
rename to modules/templates/test/inv-mngt/track_item4.csv
diff --git a/private/templates/test/inv-mngt/users.csv b/modules/templates/test/inv-mngt/users.csv
similarity index 100%
rename from private/templates/test/inv-mngt/users.csv
rename to modules/templates/test/inv-mngt/users.csv
diff --git a/private/templates/test/tasks.cfg b/modules/templates/test/tasks.cfg
similarity index 100%
rename from private/templates/test/tasks.cfg
rename to modules/templates/test/tasks.cfg
diff --git a/private/templates/000_config.py b/private/templates/000_config.py
deleted file mode 100644
index 3e9533568b..0000000000
--- a/private/templates/000_config.py
+++ /dev/null
@@ -1,250 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    Machine-specific settings
-    All settings which are typically edited for a specific machine should be done here
-
-    Deployers should ideally not need to edit any other files outside of their template folder
-
-    Note for Developers:
-        /models/000_config.py is NOT in the Git repository, to avoid leaking of
-        sensitive or irrelevant information into the repository.
-    For changes to be committed, please also edit:
-        private/templates/000_config.py
-"""
-
-# Remove this line when you have edited this file sufficiently to proceed to the web interface
-FINISHED_EDITING_CONFIG_FILE = False
-
-# Select the Template
-# - which Modules are enabled
-# - PrePopulate data
-# - Security Policy
-# - Workflows
-# - Theme
-# - note that you should restart your web2py after changing this setting
-settings.base.template = "default"
-
-# Database settings
-# Uncomment to use a different database, other than sqlite
-#settings.database.db_type = "postgres"
-#settings.database.db_type = "mysql"
-# Uncomment to use a different host
-#settings.database.host = "localhost"
-# Uncomment to use a different port
-#settings.database.port = 3306
-#settings.database.port = 5432
-# Uncomment to select a different name for your database
-#settings.database.database = "sahana"
-# Uncomment to select a different username for your database
-#settings.database.username = "sahana"
-# Uncomment to set the password
-# NB Web2Py doesn't like passwords with an @ in them
-#settings.database.password = "password"
-# Uncomment to use a different pool size
-#settings.database.pool_size = 30
-# Do we have a spatial DB available? (currently supports PostGIS. Spatialite to come.)
-#settings.gis.spatialdb = True
-
-# Base settings
-#settings.base.system_name = T("Sahana Eden Humanitarian Management Platform")
-#settings.base.system_name_short = T("Sahana Eden")
-# Set this to the Public URL of the instance
-#settings.base.public_url = "http://127.0.0.1:8000"
-
-# Switch to "False" in Production for a Performance gain
-# (need to set to "True" again when Table definitions are changed)
-settings.base.migrate = True
-# To just create the .table files (also requires migrate=True):
-#settings.base.fake_migrate = True
-
-# Set this to True to switch to Debug mode
-# Debug mode means that uncompressed CSS/JS files are loaded
-# JS Debug messages are also available in the Console
-# can also load an individual page in debug mode by appending URL with
-# ?debug=1
-settings.base.debug = False
-
-# Uncomment this to prevent automated test runs from remote
-# settings.base.allow_testing = False
-
-# Configure the log level ("DEBUG", "INFO", "WARNING", "ERROR" or "CRITICAL"), None = turn off logging
-#settings.log.level = "WARNING"
-# Uncomment to prevent writing log messages to the console (sys.stderr)
-#settings.log.console = False
-# Configure a log file (file name)
-#settings.log.logfile = None
-# Uncomment to get detailed caller information
-#settings.log.caller_info = True
-
-# Uncomment to use Content Delivery Networks to speed up Internet-facing sites
-#settings.base.cdn = True
-
-# Allow language files to be updated automatically
-#settings.L10n.languages_readonly = False
-
-# This setting should be changed _before_ registering the 1st user
-# - should happen automatically if installing using supported scripts
-settings.auth.hmac_key = "akeytochange"
-
-# Minimum Password Length
-#settings.auth.password_min_length = 8
-
-# Email settings
-# Outbound server
-#settings.mail.server = "127.0.0.1:25"
-#settings.mail.tls = True
-# Useful for Windows Laptops:
-#settings.mail.server = "smtp.gmail.com:587"
-#settings.mail.tls = True
-#settings.mail.login = "username:password"
-# From Address - until this is set, no mails can be sent
-#settings.mail.sender = "'Sahana' <sahana@example.org>"
-# Default email address to which requests to approve new user accounts gets sent
-# This can be overridden for specific domains/organisations via the auth_domain table
-#settings.mail.approver = "useradmin@example.org"
-# Daily Limit on Sending of emails
-#settings.mail.limit = 1000
-
-# Frontpage settings
-# RSS feeds
-settings.frontpage.rss = [
-    {"title": "Eden",
-     # Trac timeline
-     "url": "http://eden.sahanafoundation.org/timeline?ticket=on&changeset=on&milestone=on&wiki=on&max=50&daysback=90&format=rss"
-    },
-    {"title": "Twitter",
-     # @SahanaFOSS
-     #"url": "https://search.twitter.com/search.rss?q=from%3ASahanaFOSS" # API v1 deprecated, so doesn't work, need to use 3rd-party service, like:
-     "url": "http://www.rssitfor.me/getrss?name=@SahanaFOSS"
-     # Hashtag
-     #url: "http://search.twitter.com/search.atom?q=%23eqnz" # API v1 deprecated, so doesn't work, need to use 3rd-party service, like:
-     #url: "http://api2.socialmention.com/search?q=%23eqnz&t=all&f=rss"
-    }
-]
-
-# Uncomment to restrict to specific country/countries
-#settings.gis.countries= ("LK",)
-
-# Uncomment to enable a guided tour
-#settings.base.guided_tour = True
-
-# Instance Name - for management scripts
-#settings.base.instance_name = "test"
-
-# Bing API Key (for Map layers)
-# http://www.microsoft.com/maps/create-a-bing-maps-key.aspx
-#settings.gis.api_bing = ""
-# Google API Key (for Earth & MapMaker Layers)
-# default works for localhost
-#settings.gis.api_google = ""
-# Yahoo API Key (for Geocoder)
-#settings.gis.api_yahoo = ""
-
-# GeoNames username
-#settings.gis.geonames_username = ""
-
-# Fill this in to get Google Analytics for your site
-#settings.base.google_analytics_tracking_id = ""
-
-# Chat server, see: http://eden.sahanafoundation.org/wiki/InstallationGuidelines/Chat
-#settings.base.chat_server = {
-#   "ip": "127.0.0.1",
-#   "port": 7070,
-#   "name": "servername",
-#	# Default group everyone is added to
-#   "groupname" : "everyone",
-#   "server_db" : "openfire",
-#   # These settings fallback to main DB settings if not specified
-#   # Only mysql/postgres supported
-#   #"server_db_type" : "mysql",
-#   #"server_db_username" : "",
-#   #"server_db_password": "",
-#   #"server_db_port" : 3306,
-#   #"server_db_ip" : "127.0.0.1",
-#   }
-
-# GeoServer (Currently used by GeoExplorer. Will allow REST control of GeoServer.)
-# NB Needs to be publically-accessible URL for querying via client JS
-#settings.gis.geoserver_url = "http://localhost/geoserver"
-#settings.gis.geoserver_username = "admin"
-#settings.gis.geoserver_password = ""
-# Print Service URL: http://eden.sahanafoundation.org/wiki/BluePrintGISPrinting
-#settings.gis.print_service = "/geoserver/pdf/"
-
-# Google OAuth (to allow users to login using Google)
-# https://code.google.com/apis/console/
-#settings.auth.google_id = ""
-#settings.auth.google_secret = ""
-
-# Pootle server
-# settings.L10n.pootle_url = "http://pootle.sahanafoundation.org/"
-# settings.L10n.pootle_username = "username"
-# settings.L10n.pootle_password = "*****"
-
-# SOLR server for Full-Text Search
-#settings.base.solr_url = "http://127.0.0.1:8983/solr/"
-
-# Memcache server to allow sharing of sessions across instances
-#settings.base.session_memcache = '127.0.0.1:11211'
-
-# UI options
-# Should user be prompted to save before navigating away?
-#settings.ui.navigate_away_confirm = False
-# Should user be prompted to confirm actions?
-#settings.ui.confirm = False
-# Should potentially large dropdowns be turned into autocompletes?
-# (unused currently)
-#settings.ui.autocomplete = True
-#settings.ui.read_label = "Details"
-#settings.ui.update_label = "Edit"
-
-# Audit settings
-# - can be a callable for custom hooks (return True to also perform normal logging, or False otherwise)
-# NB Auditing (especially Reads) slows system down & consumes diskspace
-#settings.security.audit_write = False
-#settings.security.audit_read = False
-
-# Performance Options
-# Maximum number of search results for an Autocomplete Widget
-#settings.search.max_results = 200
-# Maximum number of features for a Map Layer
-#settings.gis.max_features = 1000
-
-# =============================================================================
-# Import the settings from the Template
-# - note: invalid settings are ignored
-#
-path = template_path()
-if os.path.exists(path):
-    settings.exec_template(path)
-
-# =============================================================================
-# Over-rides to the Template may be done here
-#
-
-# e.g.
-#settings.base.system_name = T("Sahana TEST")
-#settings.base.prepopulate = ("default", "default/users")
-#settings.base.theme = "default"
-#settings.L10n.default_language = "en"
-#settings.security.policy = 7 # Organisation-ACLs
-# Enable Additional Module(s)
-#settings.modules["delphi"] = Storage(
-#        name_nice = T("Delphi Decision Maker"),
-#        restricted = False,
-#        module_type = 10,
-#    )
-# Disable a module which is nromally used by the template
-# - NB Only templates with adaptive menus will work nicely with this!
-#del settings.modules["irs"]
-
-# After 1st_run, set this for Production to save 1x DAL hit/request
-#settings.base.prepopulate = 0
-
-# =============================================================================
-# A version number to tell update_check if there is a need to refresh the
-# running copy of this file
-VERSION = 1
-
-# END =========================================================================
diff --git a/private/templates/CRMT/Demo/LMS_sample_facs.csv b/private/templates/CRMT/Demo/LMS_sample_facs.csv
deleted file mode 100644
index e7c97aa088..0000000000
--- a/private/templates/CRMT/Demo/LMS_sample_facs.csv
+++ /dev/null
@@ -1,190 +0,0 @@
-Name,Comments,Type,SubType,SubSubType,Address,Postcode,L3,L2,L1,Opening Times,Phone,Organisation,Website,KV:OBJECTID,KV:post_id,Lat,Lon
-Alhambra Main Post Office,This is a US. Postal Office and Includes Passport Services.,Postal,Post Offices,,10 W. Bay State St.,91802,Alhambra,Los Angeles County,California,"Monday through Friday, 11:30am to 1:00pm.",,US Postal Service,www.usps.com,4255,4339,34.09282556,-118.1257465
-Altadena Post Office,This is a US. Postal Office and Includes Passport Services.,Postal,Post Offices,,2271 N. Lake Ave.,91001,Altadena,Los Angeles County,California,"Monday through Friday, 12:00pm to 6:30pm",,US Postal Service,www.usps.com,4256,4340,34.18495759,-118.132151
-Arco Plaza Post Office,This is a US. Postal Office and Includes Passport Services.,Postal,Post Offices,,505 S. Flower St.,90071,Los Angeles,Los Angeles County,California,"Monday through Friday, 7:00am to 5:00pm",,US Postal Service,www.usps.com,4257,4341,34.05147487,-118.256487
-Artesia Post Office,This is a US. Postal Office and Includes Passport Services.,Postal,Post Offices,,11721 183rd St.,90701,Artesia,Los Angeles County,California,"Monday through Friday, 7:00am to 5:30pm.",,US Postal Service,www.usps.com,4258,4342,33.86639793,-118.0839786
-Baldwin Hills Plaza Station Post Office,This is a US. Postal Office and Includes Passport Services.,Postal,Post Offices,,3650 Martin L. King Blvd.,90008,Los Angeles,Los Angeles County,California,"Monday through Friday, 7:30am to 4:30pm.",,US Postal Service,www.usps.com,4259,4343,34.01117599,-118.3364896
-Barrington Post Office,This is a US. Postal Office and Includes Passport Services.,Postal,Post Offices,,200 Barrington Ave.,90049,Los Angeles,Los Angeles County,California,"Monday through Friday, 7:30am to 4:30pm.",,US Postal Service,www.usps.com,4260,4344,34.06693426,-118.4709623
-Bellflower Main Post Office,This is a US. Postal Office and Includes Passport Services.,Postal,Post Offices,,9835 Flower St.,90706,Bellflower,Los Angeles County,California,"Monday through Friday, 7:30am to 5:30pm.",,US Postal Service,www.usps.com,4261,4345,33.88258385,-118.1239551
-Beverly Hills Main Post Office,This is a US. Postal Office and Includes Passport Services.,Postal,Post Offices,,325 N. Maple Dr.,90210,Beverly Hills,Los Angeles County,California,"Monday through Friday, 8:00 a.m. to 5:00 p.m.",,US Postal Service,www.usps.com,4262,4346,34.07313531,-118.3945262
-UPS Alliance Location,,Postal,UPS Locations,,39950 10th St W,93551,Palmdale,Los Angeles County,California,,661-265-7746,UPS,,49773,50494,34.608318,-118.147592
-Authorized Shipping Outlet,,Postal,UPS Locations,,4654 E Ave S,93552,Palmdale,Los Angeles County,California,,661-285-4318,UPS,,49774,50495,34.557959,-118.046526
-Southern California Edison Company Generating Station,,Environment,EPA Facility Registration System (FRS),,1 Pebbly Beach Road,90704,Avalon,Los Angeles County,California,,,,oaspub.epa.gov/enviro/fac_gateway.main?p_regid=110002420425,15713,15907,33.334453,-118.312992
-Avalon WWTP,,Environment,EPA Facility Registration System (FRS),,25 Pebbly Beach Road,90704,Avalon,Los Angeles County,California,,,,oaspub.epa.gov/enviro/fac_gateway.main?p_regid=110000759368,15714,15908,33.336528,-118.312448
-USAF Plant 42 Site 4 Northrop Grumman,,Environment,EPA Facility Registration System (FRS),,3520 East Avenue M,93550,Palmdale,Los Angeles County,California,,,,oaspub.epa.gov/enviro/fac_gateway.main?p_regid=110000781459,15715,15909,34.645857,-118.06671
-Holliday Rock Co Inc,,Environment,EPA Facility Registration System (FRS),,7749 E Ave T,93543,Littlerock,Los Angeles County,California,,,,oaspub.epa.gov/enviro/fac_gateway.main?p_regid=110020516967,15716,15910,34.544726,-117.990344
-Service Rock Products Inc - Palmdale,,Environment,EPA Facility Registration System (FRS),,37790 75th Street East,93552,Palmdale,Los Angeles County,California,,,,oaspub.epa.gov/enviro/fac_gateway.main?p_regid=110013286096,15717,15911,34.571012,-117.99599
-Eastside Water Treatment Plant,,Environment,EPA Facility Registration System (FRS),,35261 116th Street East,93553,Pearblossom,Los Angeles County,California,,,,oaspub.epa.gov/enviro/fac_gateway.main?p_regid=110000526093,15718,15912,34.521389,-117.923056
-S R Technics America Incorporated,,Environment,EPA Facility Registration System (FRS),,2825 East Avenue P,93550,Palmdale,Los Angeles County,California,,,,oaspub.epa.gov/enviro/fac_gateway.main?p_regid=110000481899,15719,15913,34.610347,-118.077206
-USAF Plant Site 2,,Environment,EPA Facility Registration System (FRS),,20th Street East and Avenue M,93550,Palmdale,Los Angeles County,California,,,,oaspub.epa.gov/enviro/fac_gateway.main?p_regid=110006488327,15720,15914,34.645945,-118.09438
-Arco Facility No 06180,,Environment,EPA Facility Registration System (FRS),,44407 Ave J,93535,Lancaster,Los Angeles County,California,,,,oaspub.epa.gov/enviro/fac_gateway.main?p_regid=110012185018,15721,15915,34.736127,-117.898801
-Los Angeles World Airports - Pmd,,Environment,EPA Facility Registration System (FRS),,39516 N. 25th Street East,93550,Palmdale,Los Angeles County,California,,,,oaspub.epa.gov/enviro/fac_gateway.main?p_regid=110038862282,15722,15916,34.600776,-118.085356
-People Who Care Youth Center,The center provides family life education and youth services for people who live in South Los Angeles.,Arts and Recreation,Recreation Centers,,1500 W. Slauson Ave.,90047,Los Angeles,Los Angeles County,California,"Monday through Friday, 8:30am to 5:00pm; Saturday, 7:00am to 3:30pm.","Service/Intake (323) 778-8905, FAX (323) 778-9060",People Who Care Youth Center,www.pwcyc.org,,66,33.988994,-118.302639
-California Aquatic Therapy and Wellness Center,The agency provides aquatic therapy and hydrotherapeutic exercise classes for people who have physical or mental disabilities and people who are elderly.,Arts and Recreation,Recreation Programs,,6801 Long Beach Blvd.,90805,Long Beach,Los Angeles County,California,,"Service/Intake (310) 537-2224, FAX (310) 537-2255",California Aquatic Therapy and Wellness Center,www.caaquatictherapy.com,,243,33.877688,-118.203929
-Koreatown Youth and Community Center,"The agency provides business services, child care, conservation, counseling services, housing services, and youth services to residents of Koreatown.",Arts and Recreation,Recreation Programs,,3727 W. 6th St.,90020,Los Angeles,Los Angeles County,California,"Monday through Friday, 9:00am to 6:00pm","FAX (213) 927-0017, Service/Intake and Administration (213) 365-7400, Property Management Co. Administrative (213) 482-1600, Property Management Co. Service/Intake (213) 482-1600",Koreatown Youth & Community Center,www.kyccla.org,,257,34.063702,-118.303529
-Salvation Army Corps Community Center - El Centro,The agency provides counseling services and recreational programs for people who live in central Los Angeles.,Arts and Recreation,Recreation Programs,,906 Francisco St,90015,Los Angeles,Los Angeles County,California,,Service/Intake (213) 896-9178,Salvation Army,www.salvationarmy-socal.org,,373,34.04686118,-118.2647376
-Salvation Army Corps Community Center - Hollywood,The agency provides pastoral counseling services and recreational programs for people in the Hollywood area.,Arts and Recreation,Recreation Programs,,5941 Hollywood Blvd,90028,Los Angeles,Los Angeles County,California,,"General Information Service/Intake and Administration (323) 960-0640, Weingart Youth Center - After School Program Service/Intake (323) 960-0643",Salvation Army,www.salvationarmy-socal.org,,712,34.10186267,-118.3193219
-Beach Cities Health District Community Care Services Department,"The agency provides health services to individuals age 0 to 65 and services for older adults age 60 and older or disabled adults age 18 and older, who live in the Beach Cities of Manhattan Beach, Redondo Beach and Hermosa Beach.",Arts and Recreation,Recreation Programs,,514 N Prospect Ave,90277,Redondo Beach,Los Angeles County,California,,"Service/Intake and Administration (310) 374-3426, Senior exercise programs Information Only (310) 347-3426, FAX (310) 374-1242",Beach Cities Health District,www.bchd.org,,731,33.85201328,-118.3788906
-Asian Youth Center,"The agency provides health services and youth services for youth and young adults, age 6 to 18, in the San Gabriel Valley and from satellites in Los Angeles and Lancaster.",Arts and Recreation,Recreation Centers,,100 W. Clary Ave.,91776,San Gabriel,Los Angeles County,California,"Monday through Friday, 9:00am to 6:00pm.","Case/Care Management for Pregnant and Postpartum Women Service/Intake (626) 731-1161, Service/Intake and Administration (626) 309-0622, FAX (626) 309-0717",Asian Youth Center,www.asianyouthcenter.org,,753,34.097564,-118.099643
-City of Baldwin Park Department of Recreation and Community Services,"The Baldwin Park Recreation and Community Services Department provides counseling services, emergency food, health services, personal goods, services for older adults, transportation and youth services for people who live in Baldwin Park including specia",Arts and Recreation,Recreation Programs,,4100 Baldwin Park Blvd.,91706,Baldwin Park,Los Angeles County,California,"Monday through Friday, 8:00am to 8:00pm.","Service/Intake (626) 813-5245, Senior Center number ext. 323 Service/Intake (626) 813-5245 Ext.323",City of Baldwin Park Department of Recreation and Community Services,www.baldwinpark.com,,770,34.087127,-117.964652
-City of Baldwin Park Department of Recreation and Community Services,"The Baldwin Park Recreation and Community Services Department provides counseling services, emergency food, health services, personal goods, services for older adults, transportation and youth services for people who live in Baldwin Park including specia",Arts and Recreation,Recreation Centers,,4100 Baldwin Park Blvd.,91706,Baldwin Park,Los Angeles County,California,"Monday through Friday, 8:00am to 8:00pm.","Service/Intake (626) 813-5245, Senior Center number ext. 323 Service/Intake (626) 813-5245 Ext.323",City of Baldwin Park Department of Recreation and Community Services,www.baldwinpark.com,,771,34.087127,-117.964652
-Claremont Joslyn Senior Center,"The center provides advocacy, cooling center, health services, housing services, nutrition services, and services for older adults, age 55 and older, and for people who live in the City of Claremont.",Arts and Recreation,Recreation Programs,,660 N. Mountain Ave.,91711,Claremont,Los Angeles County,California,"Monday through Friday, 8:00am to 5:00pm.","Senior HelpLine/Housing Info Service/Intake (909) 625-4600, Service/Intake (909) 399-5488, FAX (909) 621-7320",City of Claremont Senior Services,www.ci.claremont.ca.us,,791,34.10031,-117.728836
-Burbank Housing Authority,The Housing Authority provides housing services in the City of Burbank.,Social Services,Housing Assistance and Information,,150 N. 3rd St.,91502,Burbank,Los Angeles County,California,"Monday through Friday, 8:00am to 5:00pm.","FAX (818) 238-5159, Service/Intake (818) 238-5160",City of Burbank Redevelopment Agency,www.burbankca.org/redevelopment/housing/,,59876,34.182747,-118.308034
-Burbank Housing Authority,The Housing Authority provides housing services in the City of Burbank.,Social Services,Public Housing,,150 N. 3rd St.,91502,Burbank,Los Angeles County,California,"Monday through Friday, 8:00am to 5:00pm.","FAX (818) 238-5159, Service/Intake (818) 238-5160",City of Burbank Redevelopment Agency,www.burbankca.org/redevelopment/housing/,,59877,34.182747,-118.308034
-Institute For Multicultural Counseling and Education Services Inc,"The institute provides counseling services, domestic violence services, education services, and legal services for people who live in Los Angeles County.",Social Services,Domestic Violence Services,,3580 Wilshire Blvd.,90010,Los Angeles,Los Angeles County,California,,"FAX (213) 383-4803, Service/Intake and Administration (213) 381-1250",Institute For Multicultural Counseling and Education Services Inc,imces.org,,59880,34.061601,-118.302893
-Institute For Multicultural Counseling and Education Services Inc - Glendale,"The institute provides counseling services, domestic violence services, education services, and legal services for people who live in Los Angeles County.",Social Services,Domestic Violence Services,,431 N. Brand Blvd.,91203,Glendale,Los Angeles County,California,,"Service/Intake (818) 240-4311, FAX (818) 240-4318",Institute For Multicultural Counseling and Education Services Inc,imces.org,,59882,34.152126,-118.255195
-Juvenile Dependency Court,"The Juvenile Dependency Court, a part of the Superior Court, has jurisdiction over cases which involve minors who may be victims of abuse or neglect.",Social Services,Adoption,,201 Centre Plaza Dr.,91754,Monterey Park,Los Angeles County,California,"Monday through Friday, 8:30am to 4:30pm.","Court Clerks Office Service/Intake and Administration (323) 526-6645, Administrative (323) 526-6610, Adoptions Unit - Records Service/Intake (323) 526-6343, DCFS Court Liaison Service/Intake (323) 526-6790, 211 L A Project, Lyz Melendez Service/Intake",LA County Superior Court ,www.lasuperiorcourt.org,,59895,34.058269,-118.166839
-Juvenile Dependency Court - Lancaster Courthouse,"The Juvenile Dependency Court, a part of the Superior Court, has jurisdiction over cases which involve minors who may be victims of abuse or neglect.",Social Services,Adoption,,1000 E Ave J,93534,Lancaster,Los Angeles County,California,"Monday through Friday, 8:30am to 4:30pm.",Dependency Court Clerk Service/Intake (661) 945-6447,LA County Superior Court ,www.lasuperiorcourt.org,,59898,34.68912432,-118.1122364
-Assistance League of Whittier,"The league provides financial assistance, health services, library services and thrift shops for people who live in the Whittier area.",Social Services,Payment Assistance,,6339 Greenleaf Ave.,90601,Whittier,Los Angeles County,California,,Service/Intake (562) 693-6533,Assistance League,whittier.assistanceleague.org/dcontact.cfm,,59905,33.983335,-118.037717
-Bargain Bin Thrift Store,"The league provides financial assistance, health services, library services and thrift shops for people who live in the Whittier area.",Social Services,Thrift Shops,,6339 S. Greenleaf Ave.,90601,Whittier,Los Angeles County,California,,Service/Intake (562) 698-7012,Bargain Bin Thrift Store,whittier.assistanceleague.org/dcontact.cfm,,59908,33.983446,-118.037503
-LA County Department of Public Health - Injury and Violence Prevention Program,The agency provides public safety services to individuals in Los Angeles County.,Social Services,Public Information Services,,3530 Wilshire Blvd.,90010,Los Angeles,Los Angeles County,California,,"Child Passenger Safety Seat Inspections Service/Intake (866) 732-8243, Administrative (213) 351-7888, FAX (213) 351-2713",LA County Department of Public Health,www.publichealth.lacounty.gov/IVPP,,59910,34.061611,-118.30132
-St. Francis Medical Center - Career College,"The medical center provides child abuse services, health education, hospital services, WIA programs, and youth services for people of all ages who live in Southeast Los Angeles County.",Social Services,Job Training,,3680 E. Imperial Hwy.,90262,Lynwood,Los Angeles County,California,Monday through Friday 7:30am to 5:00pm.,"Service/Intake (800) 603-9355, Service/Intake and Administration (310) 900-8050",St. Francis Medical Center,www.stfrancismedicalcenter.com,,59911,33.932015,-118.200999
-People Who Care Youth Center,The center provides family life education and youth services for people who live in South Los Angeles.,Education,Guidance and Tutoring Programs,,1500 W. Slauson Ave.,90047,Los Angeles,Los Angeles County,California,"Monday through Friday, 8:30am to 5:00pm; Saturday, 7:00am to 3:30pm.","Service/Intake (323) 778-8905, FAX (323) 778-9060",People Who Care Youth Center,www.pwcyc.org,,65,33.988994,-118.302639
-Reiss-Davis Child Study Center,"The center provides counseling services for children, adolescents, and young adults age zero to 25 and their families who live primarily, in the West Los Angeles area.",Education,Adult Education,,3200 Motor Ave.,90034,Los Angeles,Los Angeles County,California,"Monday through Friday, 8:30am to 8:00pm; and Saturday, 8:30am to 2:30pm.","Service/Intake (310) 204-1666 Ext.356, Intake Service/Intake (310) 204-1666 Ext.407, Service Service/Intake (310) 204-1666 Ext.356",Vista Del Mar Child and Family Services,,,74,34.031049,-118.410792
-Toberman Neighborhood Center,"The agency provides advocacy, counseling services, emergency food, holiday assistance, personal goods, recreational programs, substance abuse services, utility bill assistance, volunteer opportunities and youth services.",Education,Early Childhood Education and Head Start,,131 N. Grand Ave.,90731,San Pedro,Los Angeles County,California,"Monday through Friday, 9:00am to 5:00pm.","FAX (310) 832-6712, Service/Intake and Administration (310) 832-1145",Toberman Neighborhood Center,www.toberman.org,,241,33.743902,-118.290245
-Bienvenidos - East Los Angeles Family Preservation,"The agency provides child abuse services, family support services, foster care services, health services, and substance abuse services for families throughout the San Gabriel Valley.",Education,Special Curriculum Schools and Programs,,5257 E. Beverly Blvd.,90022,Los Angeles,Los Angeles County,California,"Monday through Friday, 8:30am to 5:30pm.","FAX (323) 726-9789, Service/Intake (323) 726-9790, CARE Central Intake/Assessment Service/Intake (323) 726-9777",Bienvenidos Children's Center,www.bienvenidos.org,,302,34.031363,-118.151838
-Para Los Ninos - Family Services Office,"The agency provides child care, child abuse services, counseling services, family life education, school readiness for children, ages 0 to 5, and youth services to families who live in the Los Angeles area, including downtown Los Angeles, East Los Angele",Education,Early Childhood Education and Head Start,,234 S. Loma Dr.,90026,Los Angeles,Los Angeles County,California,"Monday through Friday, 8:30am to 5:00pm.",Service/Intake (213) 413-1466,Para Los Niños,www.paralosninos.org,,321,34.0607,-118.264345
-Para Los Ninos - Youth Center,"The agency provides child care, child abuse services, counseling services, family life education, school readiness for children, ages 0 to 5, and youth services to families who live in the Los Angeles area, including downtown Los Angeles, East Los Angele",Education,Guidance and Tutoring Programs,,845 E. 6th St.,90021,Los Angeles,Los Angeles County,California,"Monday through Friday, 9:00am to 6:30pm.","Service/Intake (213) 623-3942 Ext.222, Service/Intake (213) 623-3942 Ext.227",Para Los Niños,www.paralosninos.org,,325,34.040275,-118.241765
-El Nido Family Centers - South Los Angeles,The agency provides counseling services and family life education for youth and their families in Los Angeles.,Education,Early Childhood Education and Head Start,,2152 W. Manchester Ave.,90047,Los Angeles,Los Angeles County,California,"Monday through Friday, 8:30am to 5:30pm.","FAX (323) 753-1222, Service/Intake (323) 971-7360",El Nido Family Centers,www.elnidofamilycenters.org,,360,33.959796,-118.317314
-New Directions For Youth Inc,"The agency provides counseling services, education services and youth services for people in the San Fernando, Santa Clarita, and Antelope Valleys.",Education,Adult Education,,7315 N. Lankershim Blvd.,91605,North Hollywood,Los Angeles County,California,,"Service/Intake (818) 503-6330, FAX (818) 982-6339",New Directions for Youth,www.ndfy.org,,438,34.203296,-118.387943
-Kheper Life Enrichment Institute,"The agency provides counseling, domestic violence services, family life education, substance abuse services and youth services in Los Angeles County.",Education,Guidance and Tutoring Programs,,3406 W. 75th St.,90043,Los Angeles,Los Angeles County,California,,"FAX (323) 750-7540, Service/Intake and Administration (323) 750-7550",Kheper Life Enrichment Institute,,,442,33.97168,-118.331038
-Meet Each Need With Dignity - Mend,"The agency provides education services, emergency food, employment services, health services, holiday assistance, household goods, and personal goods for low-income people who live in the northeast part of the San Fernando Valley.",Education,Adult Education,,10641 N. San Fernando Rd.,91331,Pacoima,Los Angeles County,California,,"FAX (818) 897-0128, Service/Intake (818) 896-0246, Dental Clinic Direct Line Service/Intake (818) 686-7355, Information Only (818) 897-2443, Front Desk Service/Intake and Administration (818) 686-7300",MEND Poverty,www.mendpoverty.org,,491,34.263288,-118.419329
-Los Angeles District,,Postal,USPS Administrative Offices,,7001 S Central Ave,,Los Angeles,Los Angeles County,California,,90052,US Postal Service (USPS),,49798,50519,33.97668,-118.2565
-Sierra Coastal District,,Postal,USPS Administrative Offices,,28201 Franklin Pkwy,,Santa Clarita,Los Angeles County,California,,91383,US Postal Service (USPS),,49799,50520,34.43624,-118.6263
-Pepperdine University Library 90265,,Postal,USPS Mail Collection Boxes,Business,24255 Pacific Coast Hwy #1 Lib W,90265,Malibu,Los Angeles County,California,,,US Postal Service (USPS),,49800,50521,34.03474769,-118.7042308
-Seaver Dr / Baxter Dr (Pepperdine Univ),,Postal,USPS Mail Collection Boxes,Residential,24255 Pacific Coast Hwy #2 Dormne,90265,Malibu,Los Angeles County,California,,,US Postal Service (USPS),,49801,50522,34.03474769,-118.7042308
-"23525 Civic Center Way Malibu, CA 90265",,Postal,USPS Mail Collection Boxes,Business,23525 Civic Center Way,90265,Malibu,Los Angeles County,California,,,US Postal Service (USPS),,49802,50523,34.03629026,-118.6891628
-3854 Cross Creek Rd Malibu CA 90265,,Postal,USPS Mail Collection Boxes,Business,3854 Cross Creekrd,90265,Malibu,Los Angeles County,California,,,US Postal Service (USPS),,49803,50524,34.0359511,-118.685433
-"Pt. Dume Station Malibu, CA 90265-02",,Postal,USPS Mail Collection Boxes,Business,29350 Pacific Coast Hwy,90265,Malibu,Los Angeles County,California,,,US Postal Service (USPS),,49804,50525,34.01868015,-118.8142222
-Collection Mail Deposit / Dispatch Point,,Postal,USPS Mail Collection Boxes,Other,23648 Pacific Cosat Hwy,90265,Malibu,Los Angeles County,California,,,US Postal Service (USPS),,49805,50526,34.03451729,-118.6900836
-Pepperdine Univ-Via Pacifica / Catalina,,Postal,USPS Mail Collection Boxes,Business,24255 Pacific Coast Hwy (Univ-Grad),90265,Malibu,Los Angeles County,California,,,US Postal Service (USPS),,49806,50527,34.03474769,-118.7042308
-23410 Civic Center Way Malibu CA 90265,,Postal,USPS Mail Collection Boxes,Business,23410 Civic Center Way W,90265,Malibu,Los Angeles County,California,,,US Postal Service (USPS),,49807,50528,34.03687472,-118.6860188
-Vincent Substation,,Transportation,Heliports,,,93550,Acton,Los Angeles County,California,,,,,,4383,34.48610472,-118.1159056
-Agua Dulce Airport,,Transportation,Airports,,,91390,Agua Dulce,Los Angeles County,California,,,,,,4384,34.50256944,-118.3146444
-Camp 11 Heliport,,Transportation,Heliports,,,91350,Agua Dulce,Los Angeles County,California,,,,,,4385,34.43832833,-118.2875781
-Santa Fe International Corp Heliport,,Transportation,Heliports,,,91802,Alhambra,Los Angeles County,California,,,,,,4386,34.08084306,-118.1492369
-SCE Energy Control Center,,Transportation,Heliports,,,91801,Alhambra,Los Angeles County,California,,,,,,4387,34.08389861,-118.144515
-St Joseph Medical Center,,Transportation,Heliports,,,91505,Burbank,Los Angeles County,California,,,St Joseph Medical Center,,,4388,34.15556222,-118.3289664
-NBC-TV,,Transportation,Heliports,,,91523,Burbank,Los Angeles County,California,,,,,,4389,34.15361778,-118.3314667
-Station 125,,Transportation,Heliports,,,91302,Calabasas,Los Angeles County,California,,,,,,4390,34.15028306,-118.6981436
-Lost Hills Sheriff's Station,,Transportation,Heliports,,,91754,Calabasas,Los Angeles County,California,,,Lost Hills Sheriff's Station,,,4391,34.13777778,-118.7144444
-Hughes-Canoga Park Heliport,,Transportation,Heliports,,,91409,Canoga Park,Los Angeles County,California,,,,,,4392,34.23750361,-118.6259217
-Residential Program,"Case Management, Crisis Intervention, Full Service Partnership, Medication Support, Mental Health Services, Psych Testing, Therapeutic Behavioral Services (Tbs)<Br>Languages Spoken: English",Health and Mental Health,Mental Health Programs,,44738 Sierra Highway,93534,Lancaster,Los Angeles County,California,Operational Hours: Contact Provider; Walk-In Hours: Contact Provider,(661) 942-5749,Residential Program,,,1,34.69526626,-118.1360705
-Jewish Family Service of Los Angeles - Family Violence Project,"Case Management, Medication Support, Mental Health Services",Health and Mental Health,Mental Health Counseling,,2931 Redondo Avenue,90806,Long Beach,Los Angeles County,California,Operational Hours: Contact Provider; Walk-In Hours: Contact Provider,562490-7600,Jewish Family Service of Los Angeles,,,2,33.80869832,-118.151981
-Foothill Family Service - Duarte Office,"Case Management, Mental Health Promotion, Crisis Intervention, Medication Support, Mental Health Services, Psych Testing",Health and Mental Health,Mental Health Counseling,,808 N Los Robles,91104,Pasadena,Los Angeles County,California,Operational Hours: Mon - Fri 9:30 am - 5:00 pm; Walk-In Hours: No Walk-ins,(626) 395-7100,Foothill Family Services,,,3,34.16025058,-118.1409188
-Fuller Psychological and Family Services,"Day Treatment, Full Service Partnership, Medication Support, Mental Health Services, Psych Testing, Residential",Health and Mental Health,Mental Health Counseling,,"520 S La Fayette Park Place, 3rd Floor - Suite 300",90057,Los Angeles,Los Angeles County,California,Operational Hours: Mon 8:30 - 7:00 pm Tues -Fri 8:30 am - 6.00 pm; Walk-In Hours: No Walk-ins,(213) 252-2100,Fuller Psychological and Family Services,,,4,34.06376126,-118.2824114
-Olive Vista,"Medication Support, Mental Health Services<Br>Languages Spoken: English, Spanish",Health and Mental Health,Mental Health Programs,,"23504 Lyons Avenue, Suite 204",91321,Newhall,Los Angeles County,California,Operational Hours: Contact Provider; Walk-In Hours: Contact Provider,(661) 259-9439,Olive Vista,,,5,34.37941004,-118.5445223
-VNA Care,The agency provides end of life services and in-home health services for people in the San Fernando and San Gabriel Valleys and parts of Los Angeles.,Health and Mental Health,Health Clinics,,3452 E Foothill Blvd,91107,Pasadena,Los Angeles County,California,"Monday through Friday, 8:30am to 5:00pm. A registered nurse is on call 24 hours per day, seven days per week.","Service/Intake and Administration (626) 568-2588, FAX (626) 568-2590",Visiting Nurses Association,www.vnahhs.com,,6,34.14915478,-118.07839
-Valley Trauma Counseling Center - Sophia Ave Van Nuys Office,The center provides sexual assault services and family support services primarily for survivors of all interpersonal violence who live in the San Fernando Valley and Santa Clarita Valley,Health and Mental Health,Mental Health Programs,,7116 Sophia Ave.,91406,Van Nuys,Los Angeles County,California,SITE HOURS: Appointment hours vary; please call.,"24 hours/7days Service/Intake and Hotline (818) 886-0453, Administrative (818) 756-5330, FAX (818) 756-5443",Valley Trauma Counseling Center ,www.csun.edu/vtc,,8,34.19969,-118.486827
-Planned Parenthood Pasadena and San Gabriel Valley - Pasadena Health Center,The agency provides family planning services for people of all ages in Los Angeles County.,Health and Mental Health,Health Clinics,,1045 N. Lake Ave.,91104,Pasadena,Los Angeles County,California,"Clinic hours are Monday, 8:30am to 5:00pm; Tuesday, Wednesday, 8:00am to 9:00pm; Thursday, 8:00am to 10:00pm; Friday, 7:30am to 4:00pm; Saturday, 8:00am to 2:00pm.","Administrative (626) 794-5737, Appointments Service/Intake (626) 798-0706",Planned Parenthood - Pasadena and San Gabriel Valley,www.pppasadena.org,,9,34.16396,-118.132931
-Planned Parenthood Pasadena and San Gabriel Valley - Pasadena Health Center,The agency provides family planning services for people of all ages in Los Angeles County.,Health and Mental Health,Health Education and Counseling,,1045 N. Lake Ave.,91104,Pasadena,Los Angeles County,California,"Clinic hours are Monday, 8:30am to 5:00pm; Tuesday, Wednesday, 8:00am to 9:00pm; Thursday, 8:00am to 10:00pm; Friday, 7:30am to 4:00pm; Saturday, 8:00am to 2:00pm.","Administrative (626) 794-5737, Appointments Service/Intake (626) 798-0706",Planned Parenthood - Pasadena and San Gabriel Valley,www.pppasadena.org,,10,34.16396,-118.132931
-Planned Parenthood Pasadena and San Gabriel Valley - Pasadena Health Center,The agency provides family planning services for people of all ages in Los Angeles County.,Health and Mental Health,Health Screening and Testing,,1045 N. Lake Ave.,91104,Pasadena,Los Angeles County,California,"Clinic hours are Monday, 8:30am to 5:00pm; Tuesday, Wednesday, 8:00am to 9:00pm; Thursday, 8:00am to 10:00pm; Friday, 7:30am to 4:00pm; Saturday, 8:00am to 2:00pm.","Administrative (626) 794-5737, Appointments Service/Intake (626) 798-0706",Planned Parenthood - Pasadena and San Gabriel Valley,www.pppasadena.org,,11,34.16396,-118.132931
-KABC,,Communications,AM Antennas,,,,,Los Angeles County,California,,,,,,4751,34.0281,-118.3728
-KALI,,Communications,AM Antennas,,,,,Los Angeles County,California,,,,,,4752,34.0317,-117.935
-KNKA584,,Communications,Cellular Towers,,Tejon Lookout,,Gorman,Los Angeles County,California,,,,,,12595,34.80305556,-118.8141667
-KNKA351,,Communications,Cellular Towers,,918 Latigo Canyon Rd.,,Malibu,Los Angeles County,California,,,,,,12596,34.08583333,-118.7858333
-K205EP,,Communications,FM Antennas,,,,La Cañada Flintridge,Los Angeles County,California,,,,,,22360,34.215,-118.275
-K209CN,,Communications,FM Antennas,,,,Gorman,Los Angeles County,California,,,,,,22361,34.7447,-118.7269
-Kpjo-Fm (Avalon),,Communications,Towers,,,,,Los Angeles County,California,,,,,,23409,33.343362,-118.3220171
-Kbet-Am (Canyon Country),,Communications,Towers,,,,,Los Angeles County,California,,,,,,23522,34.465272,-118.4028592
-KSW93,,Communications,BRS and EBS Transmitters,,,,,Los Angeles County,California,,,,,,62139,34.22611111,-118.06672222
-WHG229,,Communications,BRS and EBS Transmitters,,,,,Los Angeles County,California,,,,,,62140,34.22611111,-118.06672222
-BLP0042,,Communications,Land Mobile Broadcast,,,,,Los Angeles County,California,,,,,,29694,34,-118.0008333
-BLP0053,,Communications,Land Mobile Broadcast,,,,,Los Angeles County,California,,,,,,29695,34.0775,-118.2602778
-WPYB999,,Communications,Land Mobile Commercial Towers,,2238 S. Bradley,,Santa Maria,Los Angeles County,California,,,,,,29898,34.91916667,-120.4183333
-WPCP434,,Communications,Land Mobile Commercial Towers,,1600 Mulholland Dr,,Sepulveda Canyon Ber,Los Angeles County,California,,,,,,29899,37.12861111,-118.4819444
-KA88887,,Communications,Microwave Towers,,,,Los Angeles,Los Angeles County,California,,,,,,41460,33.34305556,-118.3208333
-KB55326,,Communications,Microwave Towers,,,,Los Angeles,Los Angeles County,California,,,,,,41461,33.40222222,-118.4138889
-"Los Angeles, Outer Harbor",,Environment,Tsunami Tide Gauges,,,,,Los Angeles County,California,,,,,48668,49389,33.71994,-118.27286
-"Santa Monica, Pacific Ocean",,Environment,Tsunami Tide Gauges,,,,,Los Angeles County,California,,,,,48669,49390,34.00833,-118.5
-Glendora Mini-Bus,"The Agency Provides Employment Services, Health Services, Information and Referral, Recreational Programs, Services for Older Adults and Transportation For People of All Ages Who Live, Primarily in Glendora.",Transportation,Transit Systems,,410 Dalton St.,91741,Glendora,Los Angeles County,California,"Monday through Thursday, 10:00am to 8:00pm; Friday, 10:00am to 6:00pm and Saturday, 10:00am to 5:00pm.",,Glendora Mini-Bus,www.ci.glendora.ca.us/departments-services/parks-recreation-senior-services/transportation-glendora-mini-bus,4030,4105,34.13680685,-117.8607088
-Healthlink Medi-Van,"The Agency Provides Transportation For People in Southern California. Services include Disabled Transportation and Senior Ride Programs. There are Age, Disability and Income Restrictions for Services.",Transportation,Transit Systems,,6053 W. Century Blvd.,90045,Los Angeles,Los Angeles County,California,"Monday through Thursday, 7:30am to 5:00pm; Friday, 7:30am to 4:00pm.",,Healthlink Medi-Van,www.hlmv.com,4081,4156,33.9461251,-118.3896682
-Gardena Special Transit,"The Agency Provides Transportation Services for Adults, Age 60 and Older and for Disabled People of any Age who Reside in the Agency's Designated Service Area.",Transportation,Transit Systems,,15350 S. Van Ness Ave.,90247,Gardena,Los Angeles County,California,"Monday through Sunday, Daylight Hours",,Gardena Special Transit,www.ci.gardena.ca.us/government/Transportation,4084,4159,33.89145763,-118.3181602
-Los Angeles County Metropolitan Transportation Authority - Administration,The Agency Provides Transportation Services for Residents of Los Angeles County.,Transportation,Transit Systems,,1 Gateway Plaza,90012,Los Angeles,Los Angeles County,California,,,LA Metro,www.metro.net,4085,4160,34.05642501,-118.232715
-West Covina Transit Store,The Agency Provides Transportation Services for Residents of Los Angeles County. There are no Geographic Restrictions,Transportation,Transit Systems,,100 N. Barranca Ave.,91791,West Covina,Los Angeles County,California,,,Foothill Transit,www.foothilltransit.org,4086,4161,34.07311069,-117.8807266
-Santa Monica's Big Blue Bus,"The Bus Line Provides Public Transportation for People in the City of Santa Monica, the West Los Angeles area, Downtown Los Angeles, the Los Angeles International Airport, and the Metro Green Line Station.",Transportation,Transit Systems,,1660 7th St.,90401,Santa Monica,Los Angeles County,California,,,Big Blue Bus,www.bigbluebus.com,4087,4162,34.01501611,-118.4874566
-Norwalk Transit System,The Department Provides Public Transportation Services for People with Disabilities of all Ages. Geographic Restrictions apply for some services.,Transportation,Transit Systems,,12650 E. Imperial Hwy.,90650,Norwalk,Los Angeles County,California,,,Norwalk Transit System,www.ci.norwalk.ca.us,4201,4283,33.91680566,-118.0634789
-Santa Clarita Transit,The Program Provides Transportation for Residents in the City of Santa Clarita.,Transportation,Transit Systems,,28250 Constellation Rd.,91355,Santa Clarita,Los Angeles County,California,,,Santa Clarita Transit,www.santa-clarita.com/cityhall/field/transit/,4247,4330,34.44971174,-118.577536
-Burbank Transportation Service,The Program Provides Transportation for Seniors Age 60 and Older and for People of any Age who have Disabilities and Live in the City of Burbank. Local Transportation also includes Shuttle Services for Burbank Residents.,Transportation,Transit Systems,,275 E. Olive Ave.,91502,Burbank,Los Angeles County,California,"Monday through Friday, 8:00am to 4:30pm.",,Burbank Transportation Service,www.ci.burbank.ca.us,4249,4332,34.17347408,-118.3160934
-Cityride Program - Eastside - Central - Area 2B,This is a Transportation Service for Residents of the City of Los Angeles.,Transportation,Transit Systems,,221 N. Figueroa St.,90012,Los Angeles,Los Angeles County,California,"Monday through Friday, 9:00am to 4:00pm.",,LADOT Transit Services - Cityride,www.ladottransit.com/other/cityride,4254,4338,34.05882048,-118.2509893
-Los Angeles International Internet Exchange (LAIIX),,Communications,Internet Exchange Points,,626 Wilshire Blvd,90017,Los Angeles,Los Angeles County,California,,718-355-2500,Los Angeles International Internet Exchange (LAIIX),www.laiix.net,29649,30343,34.048153,-118.256361
-Mae West,,Communications,Internet Exchange Points,,624 S Grand Ave,90017,Los Angeles,Los Angeles County,California,,213-627-0874,Mae West,www.mae.net/fac/mae-west.htm,29650,30344,34.049449,-118.254553
-Switch and Data/PAIX,,Communications,Internet Exchange Points,,624 S Grand Ave,90017,Los Angeles,Los Angeles County,California,,815-207-7700,Switch and Data/PAIX,www.switchanddata.com,29651,30345,34.049449,-118.254553
-Pacific Wave,,Communications,Internet Exchange Points,,624 S Grand Ave,90017,Los Angeles,Los Angeles County,California,,888-722-9283,Pacific Wave,www.pacificwave.net,29652,30346,34.049449,-118.254553
-Pacific Wave,,Communications,Internet Exchange Points,,600 W 7th St,90017,Los Angeles,Los Angeles County,California,,888-722-9283,Pacific Wave,www.pacificwave.net,29653,30347,34.047341,-118.256716
-Any2 Packet Exchange Los Angeles,,Communications,Internet Exchange Points,,624 S Grand Ave,90017,Los Angeles,Los Angeles County,California,,213-327-1223,Any2 Packet Exchange Los Angeles,www.onewilshire.com/meet_me_room/any2.htm,29654,30348,34.049449,-118.254553
-United Online/Net Zero,,Communications,Internet Service Providers,,21301 Burbank Blvd,91367,Woodland Hills,Los Angeles County,California,,800-560-7429,United Online/Net Zero,www.netzero.net,29655,30349,34.173349,-118.594982
-Agenda Media Services,,Communications,Internet Service Providers,,5445 Balboa Blvd,91316,Encino,Los Angeles County,California,,818-990-5343,Agenda Media Services,www.agenda.net,29656,30350,34.169353,-118.501122
-Am6 Networks,,Communications,Internet Service Providers,,700 S Flower St,90017,Los Angeles,Los Angeles County,California,,877-743-3266,Am6 Networks,www.am6.net,29657,30351,34.048532,-118.258868
-Antelecom,,Communications,Internet Service Providers,,104 E Ave,93535,Lancaster,Los Angeles County,California,,661-726-3516,Antelecom,www.antelecom.net,29658,30352,34.671637,-118.073284
-Boingo Wireless,,Communications,Internet Service Providers,,1601 Cloverfield Blvd,90404,Santa Monica,Los Angeles County,California,,310-586-5180,Boingo Wireless,www.boingo.com,29659,30353,34.028343,-118.473665
-San Pedro Bay,,Physical Features,Water,Bays,,,,Los Angeles County,California,,,,,62615,25097,33.7261304,-118.2550705
-Angels Gate Lighthouse,,Physical Features,Water,Lighthouses,,,,Los Angeles County,California,,,,,62617,24279,33.7083531,-118.251737
-Mormon Island,,Physical Features,Named Locations,Rocks,,,,Los Angeles County,California,,,,,62618,26431,33.7597406,-118.2642374
-Smith Island,,Physical Features,Named Locations,Rocks,,,,Los Angeles County,California,,,,,62619,26433,33.7519627,-118.2770154
-Polliwog Lake,This lake is part of Polliwog Park,Physical Features,Water,Lakes,1601 Manhattan Beach Blvd,90266,Manhattan Beach,Los Angeles County,California,,,City of Manhattan Beach,,63315,62370,33.88940562,-118.38551759
-Mast-Up Dry Sailboat Storage,<p> The Mast-Up storage area is for trailerable sailboats up to 28 in length. It is next to the boat launch ramp. </p><p> Enter through the boat launch ramp from Fiji Way. </p>,Physical Features,Water,,13837 Fiji Way,90292,Marina del Rey,Los Angeles County,California,"Mast-Up storage and the boat launch ramp are open 24 hours a day, 7 days a week.",<p> Mast-Up Storage information: 310-305-9503 </p><p> Visitors Center: 310-305-9545 </p><p> Beaches and Harbors: 310-305-9503 </p>,LA County Department of Beaches and Harbors,marinadelrey.lacounty.gov,63381,65891,33.9770507,-118.44059944
-Nicholas Canyon Beach,"<p>Facilities: Fishing, Picnic Tables, Handicapped Accessways, Restrooms, Showers, Surfing, Swimming</p><p>Food truck during summer months</p><p><a href=""http://fire.lacounty.gov"">Lifeguards </a> are on the beach during daylight hours.</p><p><a hre",Physical Features,Water,,33850 Pacific Coast Highway,90265,Malibu,Los Angeles County,California,"<p><a href=""http://file.lacounty.gov/dbh/cms1_150144.gif"">Parking Lot Map</a></p><p>Parking Fees: Winter $3.00 to $8.00; Summer $3.00 to $10.00</p>",<p>Beaches and Harbors: 310-305-9504</p><p>Northern Surf Report: 310-457-9701</p>,LA County Department of Beaches and Harbors,beaches.lacounty.gov,63384,63738,34.04341426,-118.91486227
-Marina Beach (Mothers Beach),"Facilities: Swimming (no surf), Children's Playground, Picnic Tables, Windsurfing, Kayaking, Free Boat Launch for Hand-Carried Boats, Restaurants, Hotels, Restrooms, ShowersFood: Restaurants overlooking the beach and water, grocery storeHotel: Foghor",Physical Features,Water,,4101 Admiralty Way,90292,Marina del Rey,Los Angeles County,California,Open during daylight hours.,Visitors Center: 310-305-9545 <br>Beaches and Harbors: 310-305-9503 <br>Central Surf Report Information Only: 310-578-0478,LA County Department of Beaches and Harbors,marinadelrey.lacounty.gov,63388,63775,33.98184605,-118.4589672
-Silver Canyon Landing,"<a href=""http://www.catalinachamber.com/""> Catalina Island information </a>",Physical Features,Water,,,,,Los Angeles County,California,,,,www.catalinachamber.com,63394,23894,33.3194738,-118.3936867
-White Point Beach - Royal Palms,"Facilities: Tidepools, Swimming, Surfing, Diving, Picnic Tables, Children's Playground, Fishing, Waterside Promenade (Available for Event Rental), Restrooms, Showers,Aquarium: <a href=""http://www.cabrillomarineaquarium.org""> Cabrillo Marine Aquarium <",Physical Features,Water,,1799 Paseo Del Mar,90732,San Pedro,Los Angeles County,California,,Visitors Center: 310-305-9545 <br>Beaches and Harbors: 310-305-9503 </br> <br>Southern Surf Report Information Only: 310-399-8471 </br>,LA County Department of Beaches and Harbors,beaches.lacounty.gov,63397,1408,33.7165849,-118.31819415
-Family Planning Associates Medical Group - Administration - Downey,The agency administers clinics which provide family planning services for women age 12 years and older who live in Los Angeles County.,Government,Government Offices,,3050 Airport Way,90806,Long Beach,Los Angeles County,California,,"After 5pm, Tuesday - Saturday Service/Intake (800) 821-1318, Service/Intake and Administration (562) 862-5121, FAX (562) 426-4227, Appointments Service/Intake (877) 883-7264",Family Planning Associates Medical Group,www.fpamg.net,151,695,33.810466,-118.157135
-El Nido Family Centers - Administrative Office,The agency provides counseling services and family life education for youth and their families in Los Angeles.,Government,Government Offices,,10200 Sepulveda Blvd.,91345,Mission Hills,Los Angeles County,California,"Monday through Friday, 8:30am to 5:30pm.","Service/Intake and Administration (818) 830-3646, FAX (818) 891-6547",El Nido Family Centers,www.elnidofamilycenters.org,365,833,34.255482,-118.467233
-Children's Hospital Los Angeles - High Risk Youth Program,The agency provides health services and homeless support services for youth age 12 to 24 in the Hollywood area.,Government,Government Offices,,5000 W Sunset Blvd,90027,Los Angeles,Los Angeles County,California,"Monday through Friday, 8:30am to 5:00pm. Clinic hours Tuesday and Thursday, 1:00pm to 5:30pm.","Administrative (323) 361-2390, Appointments Service/Intake (323) 653-1990, Medi-Cal, HMO and Patients under 21 Service/Intake (323) 337-1775",Children's Hospital Los Angeles,www.childrenshospitalla.org/site/c.ipINKTOAJsG/b.4452451/,588,947,34.09787921,-118.2984449
-American Health Services - El Dorado Community Service Centers,"The agency provides health services, mental health services and substance abuse services for people of all ages who live in the Los Angeles County area.",Government,Government Offices,,26460 Summit Circle,91350,Santa Clarita,Los Angeles County,California,"Monday through Friday, 8:00am to 4:30pm.","Administrative (661) 254-6630, FAX (661) 254-6644, Suboxone Detox Services/Drug Testing Services Service/Intake (877) 557-7826",American Health Services,www.americanhealthservices.org,655,1000,34.41208,-118.508746
-LA County Department of Mental Health - Administration,The department provides mental health services for people in Los Angeles County.,Government,Government Offices,,550 S Vermont Ave,90020,Los Angeles,Los Angeles County,California,"Monday through Friday, 7:30am to 6:30pm.","Medi-Cal Professionals Unit Service/Intake (213) 738-2466, Training Division Administrative (213) 251-6854, Access Line and PMRT After Hours/Weekends Service/Intake and Hotline (800) 854-7771, ACCESS Line and PMRT After Hours/Weekends TDD (562) 651-2549,",LA County Department of Mental Health,dmh.co.la.ca.us,1045,1236,34.06403022,-118.2914462
-LA County Department of Public Health - Comprehensive Perinatal Services Program,The program provides health services for low-income pregnant women who are Medi-Cal recipients and live in Los Angeles County.,Government,Government Offices,,600 S Commonwealth Ave,90005,Los Angeles,Los Angeles County,California,,Administrative (213) 639-6419,"LA County Public Health - Maternal, Child, & Adolescent Health",www.publichealth.lacounty.gov/mch,1176,1340,34.0634825,-118.285451
-Commission For Children & Family Main Office,Advises The Board of Supervisors In Areas of Child Welfare and Family Policy.,Government,County Offices,,500 W. Temple St.,90012,Los Angeles,Los Angeles County,California,"Monday through Friday, 9:00am to 5:00pm.",(213) 974-1558 (Primary),LA County Commission For Children and Families,lachildrenscommission.org,1258,1383,34.05715006,-118.2455071
-Civil Service Commission Main Office,An Independent Administrative Appeals Body Established By The Los Angeles County Charter To Provide Impartial and Fair Application of The Los Angeles County Civil Service Rules.,Government,County Offices,,Kenneth Hahn Hall of Administration,90012,Los Angeles,Los Angeles County,California,"Monday through Friday, 9:00am to 5:00pm",(213) 974-2411 (Primary),LA County Civil Service Commission,civilservice.lacountycommissions.info,1259,1384,34.05715006,-118.2455071
-Emergency Medical Services Agency,"Coordinates The County's Medical 9-1-1 System, Which Includes Fire Departments, Law Enforcement Agencies, Ambulance Companies, and Hospitals.",Government,County Offices,,5555 Ferguson Dr.,90022,City of Commerce,Los Angeles County,California,"Monday through Sunday, 24 hours per day.",(323) 890-7500 (Primary),LA County - Department of Health Services,ladhs.org/ems,1262,1388,34.01124817,-118.1532851
-Housing Inspection Program Headquarters,"Inspects More Than 71,000 Licensed Housing Sites (Five Or More Units) and Responds To More Than 17,000 Complaints Per Year To Ensure That Residential Housing Is Safe, Sanitary and Fit For Human Habitation.",Government,County Offices,,Headquarters,91706,Baldwin Park,Los Angeles County,California,"Monday through Thursday, 8:00am to 5:00pm; Friday, 8:00am to 3:00pm.",(626) 430-5200 (Primary)<br>(888) 700-9995 (Hotline),LA County Public Health - Environmental Health,ph.lacounty.gov/eh,1279,1411,34.1030499,-117.974395
-Taiwan Buddhist Tzu Chi Foundation - Buddhist Tzu-Chi Free Clinic - Alhambra,The foundation provides disaster services in the United States and internationally; and health services for low-income Los Angeles County residents.,Emergency Response,Emergency and Disaster Offices,,1000 S. Garfield Ave.,91801,Alhambra,Los Angeles County,California,,"Main Intake Service/Intake (626) 636-8700, FAX (626) 281-5303, Service/Intake (626) 281-3383",Tzu Chi Foundation,www.tzuchi.org,1070,1280,34.084516,-118.122637
-LA County Department of Health Services - Olive View - UCLA Medical Center and Health Center Mental Health Services,"The unit provides disaster services and inpatient mental health services for adults in the Antelope, Santa Clarita and San Fernando Valleys.",Emergency Response,Emergency and Disaster Offices,,14445 Olive View Dr.,91342,Sylmar,Los Angeles County,California,"Monday through Sunday, 24 hours per day.","Administrative (818) 364-3001, Hospital Operator Information Only (818) 364-1555, Access Line and PMRT After Hours/Weekends Service/Intake (800) 854-7771, Psychiatric Service/Intake Service/Intake (800) 854-7771",LA County Department of Health Services,www.ladhs.org/wps/portal/valleycareHomePage,2080,2218,34.324379,-118.448374
-LA County Office of Emergency Management,The agency provides disaster services for Los Angeles County.,Emergency Response,Emergency and Disaster Offices,,1275 N. Eastern Ave.,90063,Los Angeles,Los Angeles County,California,,"Emergency Survival Program - Alisa Williams Service/Intake (323) 980-2265, Preparedness Materials/English Service/Intake (213) 974-1166, Preparedness Materials/Spanish Service/Intake (213) 974-2217, Disaster Information Service/Intake and Hotline (800) 2",LA County Office of Emergency Management,lacoa.org/esp.htm,2540,2696,34.053534,-118.175588
-LA County Sheriff - Emergency Operations Bureau,"The department provides correctional programs, disaster services, environmental services, holiday assistance, law enforcement services, substance abuse services and youth services for the unincorporated areas of Los Angeles County and contracting cities.",Emergency Response,Emergency and Disaster Offices,,1275 N. Eastern Ave.,90063,Los Angeles,Los Angeles County,California,,Emergency Operations Bureau Service/Intake (323) 980-2200,LA County Sheriff's Department,www.lasd.org,2653,2794,34.053534,-118.175588
-City of Los Angeles Animal Services Department,The department provides animal services and volunteer opportunties for people who live in the city of Los Angeles.,Emergency Response,Emergency and Disaster Offices,,221 N. Figueroa St.,90012,Los Angeles,Los Angeles County,California,,"Management Office Administrative (213) 482-9558, Licensing Service/Intake (213) 482-9550, FAX (213) 482-9511, Volunteer Programs FAX (323) 224-2353, Information for Assistance Service/Intake (888) 452-7381, Volunteer Office Service/Intake (818) 374-5878",City of Los Angeles Animal Services Department,www.laanimalservices.com,2793,2924,34.058813,-118.250854
-United Way of Greater Los Angeles - Antelope Valley Region,The agency is a community funding organization that administers services for non-profit organizations in Los Angeles County.,Emergency Response,Emergency and Disaster Offices,,42225 10th St W,93534,Lancaster,Los Angeles County,California,,Service/Intake and Administration (661) 874-4282,United Way of Greater Los Angeles,www.unitedwayla.org,2992,3097,34.64993244,-118.1483507
-United Way of Greater Los Angeles,The agency is a community funding organization that administers services for non-profit organizations in Los Angeles County.,Emergency Response,Emergency and Disaster Offices,,1150 S Olive St,90015,Los Angeles,Los Angeles County,California,,"Auto Donations Service/Intake (800) 336-1868, Service/Intake (213) 808-6220, FAX (213) 808-6221, Service/Intake (213) 630-2100, Donor Services Service/Intake (866) 366-7335",United Way of Greater Los Angeles,www.unitedwayla.org,3063,3154,34.03962221,-118.2618133
-LA County Emergency Medical Services Main Office,"Serves as the Lead Agency for the Emergency Medical Services System at the Local Level and is Responsible for Coordinating all System Participants, both Public and Private, to include Fire Departments and Law Enforcement as well as Ambulance Companies. EMS works with both the private and public sectors to bring paramedic coverage to our county's more than 10 million residents and visitors.",Emergency Response,Emergency and Disaster Offices,,5555 Ferguson Dr.,90022,City of Commerce,Los Angeles County,California,"Monday through Sunday, 24 hours per day.",(323) 890-7500 (Primary),LA County Emergency Medical Services,,3987,4057,34.01124817,-118.1532851
-Pomona Emergency Operations Center,,Emergency Response,Emergency and Disaster Offices,,590 South Park Avenue,91766,Pomona,Los Angeles County,California,,909-620-2201,City of Pomona,,41407,42102,34.0541901,-117.7540105
-Glendale Emergency Operations Information Center,,Emergency Response,Emergency and Disaster Offices,,613 East Broadway,91206,Glendale,Los Angeles County,California,,818-548-3301,City of Glendale,,41408,42103,34.1466261,-118.2482383
-Los Angeles County District Attorney - Victim-Witness Assistance Program - El Monte,The program provides victims of crime support in Los Angeles County.,Public Safety,Crime Prevention and Support,,11234 Vly Blvd,91731,El Monte,Los Angeles County,California,,"FAX (626) 442-6543, Service/Intake (626) 575-5565",LA County District Attorney,da.co.la.ca.us/vwap,123,669,34.07138269,-118.0322191
-Los Angeles County District Attorney - Victim-Witness Assistance Program - El Monte,The program provides victims of crime support in Los Angeles County.,Public Safety,Legal Services and Counseling,,11234 Vly Blvd,91731,El Monte,Los Angeles County,California,,"FAX (626) 442-6543, Service/Intake (626) 575-5565",LA County District Attorney,da.co.la.ca.us/vwap,124,669,34.07138269,-118.0322191
-UCLA Medical Center - Santa Monica - Rape Treatment Center,The agency provides sexual assault services for people of all ages in Los Angeles.,Public Safety,Crime Prevention and Support,,1250 16th St.,90404,Santa Monica,Los Angeles County,California,,"24 hour service and intake Service/Intake and Hotline (310) 319-4000 Ext.0, Administration (310) 319-4503",UCLA Medical Center,www.911rape.org,127,672,34.027548,-118.486272
-Los Angeles County District Attorney - Victim-Witness Assistance Program - Compton,The program provides victims of crime support in Los Angeles County.,Public Safety,Crime Prevention and Support,,200 W. Compton Blvd.,90220,Compton,Los Angeles County,California,,"FAX (310) 537-5675, Service/Intake (310) 603-7574, Service/Intake (310) 603-7579, Hardcore Gang Service/Intake (310) 603-7127",LA County District Attorney,da.co.la.ca.us/vwap,161,702,33.895835,-118.225402
-Los Angeles County District Attorney - Victim-Witness Assistance Program - Compton,The program provides victims of crime support in Los Angeles County.,Public Safety,Legal Services and Counseling,,200 W. Compton Blvd.,90220,Compton,Los Angeles County,California,,"FAX (310) 537-5675, Service/Intake (310) 603-7574, Service/Intake (310) 603-7579, Hardcore Gang Service/Intake (310) 603-7127",LA County District Attorney,da.co.la.ca.us/vwap,162,702,33.895835,-118.225402
-Los Angeles County District Attorney - Victim-Witness Assistance Program - Family Violence Division,The program provides victims of crime support in Los Angeles County.,Public Safety,Crime Prevention and Support,,210 W. Temple St.,90012,Los Angeles,Los Angeles County,California,,"Service/Intake (213) 974-9795, Service/Intake and Administration (213) 974-7499, Service/Intake (800) 380-3811, Family Violence Division Service/Intake (213) 974-9795, Service/Intake (213) 974-9795, FAX (213) 617-9720, Family Violence Division Servic",LA County District Attorney,da.co.la.ca.us/vwap,164,703,34.054911,-118.242858
-Los Angeles County District Attorney - Victim-Witness Assistance Program - Family Violence Division,The program provides victims of crime support in Los Angeles County.,Public Safety,Legal Services and Counseling,,210 W. Temple St.,90012,Los Angeles,Los Angeles County,California,,"Service/Intake (213) 974-9795, Service/Intake and Administration (213) 974-7499, Service/Intake (800) 380-3811, Family Violence Division Service/Intake (213) 974-9795, Service/Intake (213) 974-9795, FAX (213) 617-9720, Family Violence Division Servic",LA County District Attorney,da.co.la.ca.us/vwap,165,703,34.054911,-118.242858
-SHIELDS For Families Inc - Eden,"The agency provides child abuse services, domestic violence services, family preservation services, mental health services, residential substance abuse treatment, substance abuse services, vocational education services and youth services primarily for fa",Public Safety,Crime Prevention and Support,,2620 Industry Way,90262,Lynwood,Los Angeles County,California,,Service/Intake and Administration (323) 242-5000,SHIELDS for Families ,www.shieldsforfamilies.org,181,712,33.923299,-118.225448
-San Gabriel / Pomona Regional Center,"The center provides services for people of all ages with developmental disabilities who live in the El Monte, Foothill and Pomona Health Districts of Los Angeles County.",Public Safety,Legal Services and Counseling,,761 Corporate Center Dr.,91768,Pomona,Los Angeles County,California,,Regional Center Service/Intake and Administration (909) 620-7722,San Gabriel/Pomona Regional Center,www.sgprc.org,195,722,34.064644,-117.800254
-1736 Family Crisis Center - South Bay Community Service Center,"The agency provides case management, counseling services, domestic violence services, family support services for low income families, runaway services, emergency and transitional shelter for battered women and their children, shelter for runaway/homeles",Public Safety,Legal Services and Counseling,,21707 Hawthorne Blvd.,90503,Torrance,Los Angeles County,California,"Monday through Friday, 8:30am to 5:30pm. Evenings and Saturdays by appointment. The hotlines operate Monday through Sunday, 24 hours per day.","FAX (310) 543-9910, Community Service Center Service/Intake (310) 543-9900",1736 Family Crisis Center,www.1736fcc.org,261,787,33.831319,-118.35272
-Impacto Leadership Challenge - Elementary School Component Site,"The agency provides business services, child care, community services, homeless support services, shelter for homeless, volunteer opportunities and youth services to low-income people in the Spanish-speaking community of East Los Angeles.",Municipal Services,Community Services,,1300 Plaza Del Sol,90033,Los Angeles,Los Angeles County,California,"Monday through Friday, 1:30pm to 6:00pm.","Service/Intake (323) 881-0024, Impacto Elementary Component Service/Intake (323) 269-7552",Proyecto Pastoral,www.proyectopastoral.org,248,783,34.048544,-118.225636
-Impacto Leadership Challenge - Junior/High School College Prep. Component Site,"The agency provides business services, child care, community services, homeless support services, shelter for homeless, volunteer opportunities and youth services to low-income people in the Spanish-speaking community of East Los Angeles.",Municipal Services,Community Services,,135 N. Mission Rd.,90033,Los Angeles,Los Angeles County,California,"Monday through Friday, 2:00pm to 7:00pm.","Service/Intake (323) 881-0024, Impacto After School Program Service/Intake (323) 881-0006",Proyecto Pastoral,www.proyectopastoral.org,253,784,34.048871,-118.227871
-Koreatown Youth and Community Center,"The agency provides business services, child care, conservation, counseling services, housing services, and youth services to residents of Koreatown.",Municipal Services,Community Services,,3727 W. 6th St.,90020,Los Angeles,Los Angeles County,California,"Monday through Friday, 9:00am to 6:00pm","FAX (213) 927-0017, Service/Intake and Administration (213) 365-7400, Property Management Co. Administrative (213) 482-1600, Property Management Co. Service/Intake (213) 482-1600",Koreatown Youth & Community Center,www.kyccla.org,258,785,34.063702,-118.303529
-City of Pasadena Department of Public Health,"The agency provides health services, HIV/AIDS services, substance abuse services, vital records, welfare-to-work support services and WIC services for people of all ages who live in the Pasadena area.",Municipal Services,Public Records,,1845 N. Fair Oaks Ave.,91103,Pasadena,Los Angeles County,California,"Monday through Friday, 7:30am to 5:30pm; the office is closed every other Friday.","Child Health Clinic Service/Intake (626) 744-6136, Tuberculosis Clinic Service/Intake (626) 744-6024, Vital Records Service/Intake (626) 744-6010, Mobile HIV testing unit Service/Intake (626) 744-6145, Healthy Kids Enrollment Service/Intake (626) 744-608",City of Pasadena,www.cityofpasadena.net/PublicHealth/,642,995,34.17768,-118.15122
-Teri G. Muse Family Service Center,"The Baldwin Park Recreation and Community Services Department provides counseling services, emergency food, health services, personal goods, services for older adults, transportation and youth services for people who live in Baldwin Park including specia",Municipal Services,Community Services,,14305 Morgan St.,91706,Baldwin Park,Los Angeles County,California,"Monday through Thursday, 11:00am to 5:00pm.","Service/Intake and Administration (626) 813-5270, FAX (626) 851-3676",City of Baldwin Park Department of Recreation and Community Services,www.baldwinpark.com,776,1069,34.087951,-117.962508
-Claremont Joslyn Senior Center,"The center provides advocacy, cooling center, health services, housing services, nutrition services, and services for older adults, age 55 and older, and for people who live in the City of Claremont.",Municipal Services,Community Services,,660 N. Mountain Ave.,91711,Claremont,Los Angeles County,California,"Monday through Friday, 8:00am to 5:00pm.","Senior HelpLine/Housing Info Service/Intake (909) 625-4600, Service/Intake (909) 399-5488, FAX (909) 621-7320",City of Claremont Senior Services,www.ci.claremont.ca.us,795,1072,34.10031,-117.728836
-Claremont Joslyn Senior Center,"The center provides advocacy, cooling center, health services, housing services, nutrition services, and services for older adults, age 55 and older, and for people who live in the City of Claremont.",Municipal Services,Property and Tax,,660 N. Mountain Ave.,91711,Claremont,Los Angeles County,California,"Monday through Friday, 8:00am to 5:00pm.","Senior HelpLine/Housing Info Service/Intake (909) 625-4600, Service/Intake (909) 399-5488, FAX (909) 621-7320",City of Claremont Senior Services,www.ci.claremont.ca.us,796,1072,34.10031,-117.728836
-Alicia Broadous-Duncan Multipurpose Center,The center provides emergency food and services for older adults age 55 and older who live in the northeast San Fernando Valley.,Municipal Services,Community Services,,11300 Glenoaks Blvd.,91331,Pacoima,Los Angeles County,California,"Monday through Friday, 8:00am to 4:00pm.","Service/Intake and Administration (818) 834-6100, FAX (818) 834-6108",San Fernando Valley Interfaith Council,www.vic-la.org,865,1105,34.275742,-118.413579
-Alicia Broadous-Duncan Multipurpose Center,The center provides emergency food and services for older adults age 55 and older who live in the northeast San Fernando Valley.,Municipal Services,Property and Tax,,11300 Glenoaks Blvd.,91331,Pacoima,Los Angeles County,California,"Monday through Friday, 8:00am to 4:00pm.","Service/Intake and Administration (818) 834-6100, FAX (818) 834-6108",San Fernando Valley Interfaith Council,www.vic-la.org,867,1105,34.275742,-118.413579
-Salvation Army Los Angeles Korean Corps,"The center provides information and referral, recreational programs and services for older adults in the downtown and Koreatown areas of Los Angeles.",Municipal Services,Community Services,,933 S Hoover St,90006,Los Angeles,Los Angeles County,California,"Monday through Friday, 9:00am to 5:00pm.","Service/Intake (213) 480-0714, Service/Intake (213) 480-6679, Service/Intake (213) 480-6690",Salvation Army,,933,1141,34.05447177,-118.2843834
-Carson Refinery,,Private Industry,Agriculture and Food,Agriculture and Mineral Operations,,,,Los Angeles County,California,,,Carson Refinery,,4376,4460,33.808,-118.253
-El Segundo Refinery,,Private Industry,Agriculture and Food,Agriculture and Mineral Operations,,,,Los Angeles County,California,,,El Segundo Refinery,,4377,4461,33.916,-118.419
-Los Angeles Refinery,,Private Industry,Agriculture and Food,Agriculture and Mineral Operations,,,,Los Angeles County,California,,,Los Angeles Refinery,,4378,4462,33.78,-118.295
-Torrance Refinery,,Private Industry,Agriculture and Food,Agriculture and Mineral Operations,,,,Los Angeles County,California,,,Torrance Refinery,,4379,4463,33.858,-118.336
-Paramount Refinery,,Private Industry,Agriculture and Food,Agriculture and Mineral Operations,,,,Los Angeles County,California,,,Paramount Refinery,,4380,4464,33.9,-118.155
-Shell Los Angeles Refinery,,Private Industry,Agriculture and Food,Agriculture and Mineral Operations,,,,Los Angeles County,California,,,Shell Los Angeles Refinery,,4381,4465,33.791,-118.238
-Wilmington Refinery,,Private Industry,Agriculture and Food,Agriculture and Mineral Operations,,,,Los Angeles County,California,,,Wilmington Refinery,,4382,4466,33.782,-118.232
-Alliance Bank,,Private Industry,Banking and Finance,Bank Main Offices,100 Corporate Pointe,90230,Culver City,Los Angeles County,California,,310-410-9281,Alliance Bank,,5692,5809,33.9883649,-118.381451
-Mirae Bank,,Private Industry,Banking and Finance,Bank Main Offices,3255 Wilshire Boulevard,90010,Los Angeles,Los Angeles County,California,,213-427-7900,Mirae Bank,,5693,5810,34.0622682,-118.2929535
-Golden Coast Bank,,Private Industry,Banking and Finance,Bank Main Offices,850 Long Beach Boulevard,90813,Long Beach,Los Angeles County,California,,562-216-6388,Golden Coast Bank,,5694,5811,33.7775585,-118.1889882
-Casa de Los Angelitos,The agency operates a maternity home for women age 18 and older.,Community Groups,Volunteer Opportunities,,954 Koleeta Dr.,90710,Harbor City,Los Angeles County,California,"Monday through Sunday, 24 hours per day.","FAX (310) 325-8217, Service/Intake and Administration (310) 325-8208",Mission of Casa de Los Angelitos,www.casadelosangelitos.org,45,604,33.803532,-118.292348
-DIGNITY Los Angeles,The agency provides personal enrichment services for people of all ages.,Community Groups,Community Organizations,,126 S. Ave. 64,90042,Los Angeles,Los Angeles County,California,,Service/Intake (323) 344-8064,DIGNITY Los Angeles,www.dignitylosangeles.org,136,678,34.113639,-118.181761
-Korean Resource Center,"The agency provides advocacy, community action groups, education services, and health insurance.",Community Groups,Community Organizations,,900 Crenshaw Blvd.,90019,Los Angeles,Los Angeles County,California,"Monday through Thursday, 9:00am to 5:00pm.",Service/Intake (323) 937-3718,Korean Resource Center,www.krcla.org,234,775,34.056122,-118.321998
-Impacto Leadership Challenge - Elementary School Component Site,"The agency provides business services, child care, community services, homeless support services, shelter for homeless, volunteer opportunities and youth services to low-income people in the Spanish-speaking community of East Los Angeles.",Community Groups,Volunteer Opportunities,,1300 Plaza Del Sol,90033,Los Angeles,Los Angeles County,California,"Monday through Friday, 1:30pm to 6:00pm.","Service/Intake (323) 881-0024, Impacto Elementary Component Service/Intake (323) 269-7552",Proyecto Pastoral,www.proyectopastoral.org,246,783,34.048544,-118.225636
-Impacto Leadership Challenge - Junior/High School College Prep. Component Site,"The agency provides business services, child care, community services, homeless support services, shelter for homeless, volunteer opportunities and youth services to low-income people in the Spanish-speaking community of East Los Angeles.",Community Groups,Volunteer Opportunities,,135 N. Mission Rd.,90033,Los Angeles,Los Angeles County,California,"Monday through Friday, 2:00pm to 7:00pm.","Service/Intake (323) 881-0024, Impacto After School Program Service/Intake (323) 881-0006",Proyecto Pastoral,www.proyectopastoral.org,251,784,34.048871,-118.227871
-Little Tokyo Service Center - A Community Development Corporation,"The agency provides child care, counseling services, services for older adults and youth services for Japanese immigrants and Japanese-Americans in Los Angeles County.",Community Groups,Community Organizations,,231 E. Third St.,90013,Los Angeles,Los Angeles County,California,,"Administrative (213) 473-3030, FAX (213) 473-3031, Child Care Programs Information Only (213) 473-1699, Head Start Program Information Only (213) 481-0227, Service/Intake (213) 473-3035, Japanese Students Hotline Hotline/Talkline/Warmline (213) 473-163",Little Tokyo Service Center,www.ltsc.org,327,810,34.048458,-118.244317
-Salvation Army Corps Community Center - El Centro,The agency provides counseling services and recreational programs for people who live in central Los Angeles.,Community Groups,Community Organizations,,906 Francisco St,90015,Los Angeles,Los Angeles County,California,,Service/Intake (213) 896-9178,Salvation Army,www.salvationarmy-socal.org,375,838,34.04686118,-118.2647376
-"Maple Counseling Center, The",The agency provides counseling services and volunteer opportunities for people of all ages who live or work in Beverly Hills and adjacent areas.,Community Groups,Volunteer Opportunities,,9107 Wilshire Blvd.,90210,Beverly Hills,Los Angeles County,California,,"Crisis Response Team Administrative (310) 854-8996, Mary Monreal - Volunteer Opportunities Service/Intake and Administration (310) 271-9999 Ext.224, FAX (310) 247-4910, Service/Intake and Administration (310) 271-9999",The Maple Counseling Center,www.tmcc.org,382,842,34.067385,-118.390318
-Grandparents As Parents Inc,The agency provides counseling services through therapy/support groups and information and referral for grandparents or any relative caregivers who live in Los Angeles County.,Community Groups,Community Organizations,,22048 Sherman Way,91303,Canoga Park,Los Angeles County,California,,"Corporate Office Administrative (818) 264-0880, Caregiver Center Edelman Children's Court Service/Intake (323) 526-6553, Service/Intake (562) 421-7991, Service/Intake (310) 839-2548, Service/Intake (818) 789-1177",Grandparents as Parents,www.grandparentsasparents.org,407,864,34.200883,-118.606994
-Meet Each Need With Dignity - Mend,"The agency provides education services, emergency food, employment services, health services, holiday assistance, household goods, and personal goods for low-income people who live in the northeast part of the San Fernando Valley.",Community Groups,Volunteer Opportunities,,10641 N. San Fernando Rd.,91331,Pacoima,Los Angeles County,California,,"FAX (818) 897-0128, Service/Intake (818) 896-0246, Dental Clinic Direct Line Service/Intake (818) 686-7355, Information Only (818) 897-2443, Front Desk Service/Intake and Administration (818) 686-7300",MEND Poverty,www.mendpoverty.org,490,902,34.263288,-118.419329
diff --git a/private/templates/CRMT/Demo/activity.csv b/private/templates/CRMT/Demo/activity.csv
deleted file mode 100644
index 7ef852808f..0000000000
--- a/private/templates/CRMT/Demo/activity.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-Activity,Project,Activity Type,Organisation Group,Country,L1,L2,L3,Location,Lat,Lon,ContactPerson,Comments,Beneficiaries:Total
-First Aid Training,,Training,Acton & Agua Dulce,US,California,Los Angeles County,Los Angeles,Activity Location,34.04008962,-118.2615446,,,12
-Workshop,,Training,Acton & Agua Dulce,US,California,Los Angeles County,Los Angeles,Activity Location,34.04941097,-118.4610231,,,23
-Coalition Meeting,,Meetings,Culver City,US,California,Los Angeles County,Los Angeles,Activity Location,34.05235,-118.220466,,,40
-Vaccination Campaign,,Outreach,Culver City,US,California,Los Angeles County,Los Angeles,Activity Location,34.053346,-118.219928,,,500
-Free Music Festival,,Community Events,Huntington Park,US,California,Los Angeles County,Los Angeles,Activity Location,34.050449,-118.272361,,,1000
-Community Gardening,,Training,Huntington Park,US,California,Los Angeles County,Los Angeles,Activity Location,34.064319,-118.265074,,,120
-Fieldwork,,Outreach,La Crescenta,US,California,Los Angeles County,Los Angeles,Activity Location,34.05921555,-118.2510071,,,88
-Neighborhood Watch,,Meetings,La Crescenta,US,California,Los Angeles County,Los Angeles,Activity Location,34.061518,-118.272079,,,124
-Emergency Preparedness Campaign,,Outreach,Pico-Union,US,California,Los Angeles County,Los Angeles,Activity Location,34.01970751,-118.3556546,,,345
-Farmer's Market,,Community Events,Pico-Union,US,California,Los Angeles County,Los Angeles,Activity Location,34.089461,-118.293173,,,600
-First Aid Training ,,Training,Watts,US,California,Los Angeles County,Los Angeles,Activity Location,34.024868,-118.261606,,,32
-Workshop,,Training,Watts,US,California,Los Angeles County,Los Angeles,Activity Location,34.049259,-118.257027,,,65
-Coalition Meeting,,Meetings,Wilmington,US,California,Los Angeles County,Los Angeles,Activity Location,33.958834,-118.291917,,,32
-Vaccination Campaign,,Outreach,Wilmington,US,California,Los Angeles County,Los Angeles,Activity Location,34.2328539,-118.5361364,,,346
-Free Music Festival,,Community Events,Pomona,US,California,Los Angeles County,Pomona,Activity Location,34.060607,-117.746992,,,642
-Community Gardening,,Community Events,Pomona,US,California,Los Angeles County,Pomona,Activity Location,34.05273819,-117.7538605,,,125
\ No newline at end of file
diff --git a/private/templates/CRMT/Demo/auth_roles_demo.csv b/private/templates/CRMT/Demo/auth_roles_demo.csv
deleted file mode 100644
index 2819ea9ff9..0000000000
--- a/private/templates/CRMT/Demo/auth_roles_demo.csv
+++ /dev/null
@@ -1,66 +0,0 @@
-uid,role,description,controller,function,table,entity,uacl,oacl,hidden,system,protected,Notes
-ANONYMOUS,Anonymous,,org,group,,,READ,,,,,Allow display of Coalition Polygons on homepage
-ANONYMOUS,Anonymous,,"cms","page",,,"READ","READ",,,,Allow display of Map Layer Metadata
-ANONYMOUS,Anonymous,,,,"s3_audit",,"READ",,,,,Allow display of Site Activity on Homepage
-ANONYMOUS,Anonymous,,"default","person",,,"READ|CREATE|UPDATE",,,,,
-ANONYMOUS,Anonymous,,"default","person","gis_location",,"READ|CREATE|UPDATE",,,,,
-ANONYMOUS,Anonymous,,"gis","config",,,"READ|CREATE","READ|CREATE|UPDATE",,,,
-ANONYMOUS,Anonymous,,"gis","index",,,"READ|CREATE","READ|CREATE|UPDATE",,,,
-ANONYMOUS,Anonymous,,"gis","geocode",,,"READ",,,,,
-ANONYMOUS,Anonymous,,"gis","ldata",,,"READ",,,,,
-ANONYMOUS,Anonymous,,"gis","location",,,"READ",,,,,
-ANONYMOUS,Anonymous,,"gis","proxy",,,"READ",,,,,
-ANONYMOUS,Anonymous,,"pr","person",,,,"READ|CREATE|UPDATE",,,,
-ANONYMOUS,Anonymous,,"pr","contact",,,,"READ|CREATE|UPDATE",,,,
-ANONYMOUS,Anonymous,,"pr","contact_emergency",,,,"READ|CREATE|UPDATE",,,,
-ANONYMOUS,Anonymous,,,,"gis_config",,"READ|CREATE","READ|UPDATE",,,,
-ANONYMOUS,Anonymous,,,,"gis_layer_bing",,"READ",,,,,
-ANONYMOUS,Anonymous,,,,"gis_layer_coordinate",,"READ",,,,,
-ANONYMOUS,Anonymous,,,,"gis_layer_empty",,"READ",,,,,
-ANONYMOUS,Anonymous,,,,"gis_layer_feature",,"READ|CREATE",,,,,
-ANONYMOUS,Anonymous,,,,"gis_layer_geojson",,"READ|CREATE",,,,,
-ANONYMOUS,Anonymous,,,,"gis_layer_georss",,"READ|CREATE",,,,,
-ANONYMOUS,Anonymous,,,,"gis_layer_google",,"READ",,,,,
-ANONYMOUS,Anonymous,,,,"gis_layer_gpx",,"READ|CREATE",,,,,
-ANONYMOUS,Anonymous,,,,"gis_layer_kml",,"READ|CREATE",,,,,
-ANONYMOUS,Anonymous,,,,"gis_layer_openstretmap",,"READ",,,,,
-ANONYMOUS,Anonymous,,,,"gis_layer_theme",,"READ|CREATE",,,,,
-ANONYMOUS,Anonymous,,,,"gis_layer_tms",,"READ|CREATE",,,,,
-ANONYMOUS,Anonymous,,,,"gis_layer_wfs",,"READ|CREATE",,,,,
-ANONYMOUS,Anonymous,,,,"gis_layer_wms",,"READ|CREATE",,,,,
-ANONYMOUS,Anonymous,,,,"gis_layer_xyz",,"READ|CREATE",,,,,
-ANONYMOUS,Anonymous,,,,"hrm_human_resource",,,"READ",,,,
-ANONYMOUS,Anonymous,,,,"hrm_training",,,"READ",,,,
-ANONYMOUS,Anonymous,,,,"pr_address",,,"READ|CREATE|UPDATE",,,,
-ANONYMOUS,Anonymous,,,,"pr_contact",,,"READ|CREATE|UPDATE",,,,
-ANONYMOUS,Anonymous,,,,"pr_contact_emergency",,,"READ|CREATE|UPDATE",,,,
-ANONYMOUS,Anonymous,,,,"pr_education",,,"READ|CREATE|UPDATE",,,,
-ANONYMOUS,Anonymous,,,,"pr_filter",,"READ","READ|CREATE|UPDATE",,,,
-ANONYMOUS,Anonymous,,,,"pr_group_membership",,,"READ",,,,
-ANONYMOUS,Anonymous,,,,"pr_identity",,,"READ|CREATE|UPDATE",,,,
-ANONYMOUS,Anonymous,,,,"pr_image",,,"READ|CREATE|UPDATE",,,,
-ANONYMOUS,Anonymous,,,,"pr_person",,,"READ|UPDATE",,,,
-ANONYMOUS,Anonymous,,,,"pr_physical_description",,,"READ|CREATE|UPDATE",,,,
-ANONYMOUS,Anonymous,,"event",,,,"READ|CREATE|UPDATE","ALL",,,,
-ANONYMOUS,Anonymous,,"org",,,,"READ|CREATE|UPDATE","ALL",,,,
-ANONYMOUS,Anonymous,,"project",,,,"READ|CREATE|UPDATE","ALL",,,,
-ANONYMOUS,Anonymous,,"stats",,,,"READ|CREATE|UPDATE","ALL",,,,
-ANONYMOUS,Anonymous,,"vulnerability",,,,"READ|CREATE|UPDATE","ALL",,,,
-MAP_ADMIN,"Map Admin",,,,"cms_post",,"ALL",,,,,
-MAP_ADMIN,"Map Admin",,,,"gis_layer_arcrest",,"ALL",,,,,
-MAP_ADMIN,"Map Admin",,,,"gis_layer_bing",,"ALL",,,,,
-MAP_ADMIN,"Map Admin",,,,"gis_layer_coordinate",,"ALL",,,,,
-MAP_ADMIN,"Map Admin",,,,"gis_layer_empty",,"ALL",,,,,
-MAP_ADMIN,"Map Admin",,,,"gis_layer_feature",,"ALL",,,,,
-MAP_ADMIN,"Map Admin",,,,"gis_layer_geojson",,"ALL",,,,,
-MAP_ADMIN,"Map Admin",,,,"gis_layer_georss",,"ALL",,,,,
-MAP_ADMIN,"Map Admin",,,,"gis_layer_google",,"ALL",,,,,
-MAP_ADMIN,"Map Admin",,,,"gis_layer_gpx",,"ALL",,,,,
-MAP_ADMIN,"Map Admin",,,,"gis_layer_kml",,"ALL",,,,,
-MAP_ADMIN,"Map Admin",,,,"gis_layer_mgrs",,"ALL",,,,,
-MAP_ADMIN,"Map Admin",,,,"gis_layer_openstretmap",,"ALL",,,,,
-MAP_ADMIN,"Map Admin",,,,"gis_layer_theme",,"ALL",,,,,
-MAP_ADMIN,"Map Admin",,,,"gis_layer_tms",,"ALL",,,,,
-MAP_ADMIN,"Map Admin",,,,"gis_layer_wfs",,"ALL",,,,,
-MAP_ADMIN,"Map Admin",,,,"gis_layer_wms",,"ALL",,,,,
-MAP_ADMIN,"Map Admin",,,,"gis_layer_xyz",,"ALL",,,,,
diff --git a/private/templates/CRMT/Demo/evac_route.csv b/private/templates/CRMT/Demo/evac_route.csv
deleted file mode 100644
index 9e0faeb838..0000000000
--- a/private/templates/CRMT/Demo/evac_route.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-Name,Hazard,Comments,Organisation Group,Address,Postcode,Country,L1,L2,L3,Lat,Lon,Comments
-Evacuation Route,Wild Fires,,Acton & Agua Dulce,"1150 S Olive St, Ste T500",90015,US,California,Los Angeles County,Los Angeles,34.04008962,-118.2615446,
-Evacuation Route,Earthquakes,,Acton & Agua Dulce,11701 Wilshire Blvd #7,90025,US,California,Los Angeles County,Los Angeles,34.04941097,-118.4610231,
-Evacuation Route,Floods,,Culver City,1307 Warren St,90033,US,California,Los Angeles County,Los Angeles,34.05235,-118.220466,
-Evacuation Route,Mud Slides,,Culver City,1500 East Bridge St,90033,US,California,Los Angeles County,Los Angeles,34.053346,-118.219928,
-Evacuation Route,Tornado,,Huntington Park,1530 James M. Wood Blvd,90015,US,California,Los Angeles County,Los Angeles,34.050449,-118.272361,
-Evacuation Route,Tsunami,,Huntington Park,1671 Beverly Blvd,90026,US,California,Los Angeles County,Los Angeles,34.064319,-118.265074,
-Evacuation Route,Heat Wave,,La Crescenta,"221 N. Figueroa St, 5th fl",90012,US,California,Los Angeles County,Los Angeles,34.05921555,-118.2510071,
-Evacuation Route,Chemical Slip,,La Crescenta,357 S Westlake Ave,90057,US,California,Los Angeles County,Los Angeles,34.061518,-118.272079,
-Evacuation Route,Nuclear,,Pico-Union,3721 S La Brea Ave,90016,US,California,Los Angeles County,Los Angeles,34.01970751,-118.3556546,
-Evacuation Route,Wild Fires,,Pico-Union,4665 Willow Brook Ave,90029,US,California,Los Angeles County,Los Angeles,34.089461,-118.293173,
-Evacuation Route,Earthquakes,,Watts,601 E 23rd St,90011,US,California,Los Angeles County,Los Angeles,34.024868,-118.261606,
-Evacuation Route,Floods,,Watts,"707 Wilshire Blvd, 30th Fl",90017,US,California,Los Angeles County,Los Angeles,34.049259,-118.257027,
-Evacuation Route,Mud Slides,,Wilmington,8705 South Vermont Ave,90044,US,California,Los Angeles County,Los Angeles,33.958834,-118.291917,
-Evacuation Route,Tornado,,Wilmington,8963 Reseda Blvd,91324,US,California,Los Angeles County,Los Angeles,34.2328539,-118.5361364,
-Evacuation Route,Tsunami,,Pomona,248 E. Monterey Ave,91767,US,California,Los Angeles County,Pomona,34.060607,-117.746992,
-Evacuation Route,Heat Wave,,Pomona,750 S Park Ave,91766,US,California,Los Angeles County,Pomona,34.05273819,-117.7538605,
\ No newline at end of file
diff --git a/private/templates/CRMT/Demo/import_lms.py b/private/templates/CRMT/Demo/import_lms.py
deleted file mode 100644
index 1a7cae2ab0..0000000000
--- a/private/templates/CRMT/Demo/import_lms.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# Import LMS Facilities
-#
-#
-# run as python web2py.py -S eden -M -R applications/eden/private/templates/CRMT/Demo/import_lms.py
-#
-
-import os
-
-# Don't add these entries into Audit
-settings.security.audit_write = False
-
-# Impersonate as the import user
-table = db.auth_user
-user_id = db(table.email == "lms@cio.lacounty.gov").select().first().id
-auth.s3_impersonate(user_id)
-
-# Don't barf on invalid data
-settings.gis.check_within_parent_boundaries = False
-
-# Allow import of non-std Phone data
-s3db.org_organisation.phone.requires = None
-table = s3db.org_facility
-table.phone1.requires = None
-
-# Don't default the Org
-table.organisation_id.default = None
-
-# Import Orgs
-resource = s3db.resource("org_organisation")
-stylesheet = os.path.join(request.folder, "static", "formats", "s3csv", "org", "organisation.xsl")
-filename = os.path.join(request.folder, "private", "templates", "CRMT", "Demo", "LMS_sample_orgs.csv")
-File = open(filename, "r")
-resource.import_xml(File, format="csv", stylesheet=stylesheet)
-
-# Import Facs
-resource = s3db.resource("org_facility")
-stylesheet = os.path.join(request.folder, "static", "formats", "s3csv", "org", "facility.xsl")
-filename = os.path.join(request.folder, "private", "templates", "CRMT", "Demo", "LMS_sample_facs.csv")
-File = open(filename, "r")
-resource.import_xml(File, format="csv", stylesheet=stylesheet)
-
-# Commit: separate transaction
-db.commit()
diff --git a/private/templates/CRMT/Demo/org_resource.csv b/private/templates/CRMT/Demo/org_resource.csv
deleted file mode 100644
index a5aed335aa..0000000000
--- a/private/templates/CRMT/Demo/org_resource.csv
+++ /dev/null
@@ -1,15 +0,0 @@
-Organisation,Branch,Resource Type,Country,L1,L2,L3,L4,Quantity,Comments
-Los Angeles City Emergency Management Department,,Staff,,,,,,10,
-Los Angeles City Emergency Management Department,,Volunteers,,,,,,100,
-Los Angeles City Emergency Management Department,,Vehicles,,,,,,15,
-Los Angeles County Department of Public Health,,Staff,,,,,,450,
-Los Angeles County Department of Public Health,,Volunteers,,,,,,7000,
-Los Angeles County Department of Public Health,,Vehicles,,,,,,27,
-American Red Cross,,Staff,,,,,,57,
-American Red Cross,,Volunteers,,,,,,10456,
-American Red Cross,,Vehicles,,,,,,45,
-Catholic Charities of Los Angeles,,Staff,,,,,,27,
-Catholic Charities of Los Angeles,,Volunteers,,,,,,3506,
-Catholic Charities of Los Angeles,,Vehicles,,,,,,5,
-Walmart,,Staff,,,,,,10250,
-Walmart,,Vehicles,,,,,,85,
\ No newline at end of file
diff --git a/private/templates/CRMT/Demo/risk.csv b/private/templates/CRMT/Demo/risk.csv
deleted file mode 100644
index a18c7153ac..0000000000
--- a/private/templates/CRMT/Demo/risk.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-Name,Hazard,Description,Organisation Group,Country,L1,L2,L3,Lat,Lon,WKT
-Chemical Factory,Chemical Slip,,Acton & Agua Dulce,US,California,Los Angeles County,Los Angeles,,,"POLYGON((-118.18781603860334 34.47559522945364,-118.18781603860334 34.473047973890914,-118.18026293801756 34.473047973890914,-118.18026293801756 34.47559522945364,-118.18026293801756 34.47545371729615,-118.18781603860334 34.47559522945364))"
-Nuclear Plant,Nuclear,,Acton & Agua Dulce,US,California,Los Angeles County,Los Angeles,,,"POLYGON((-118.31626166390308 34.49692544191405,-118.31651915596306 34.49261031672186,-118.31025351570435 34.49261031672186,-118.310339346397 34.496996179810594,-118.31626166390308 34.49692544191405))"
-Poor Drainage,Floods,,Culver City,US,California,Los Angeles County,Culver City,,,"POLYGON((-118.38797320412145 34.0132779495073,-118.39003314064647 34.008155301632236,-118.39260806130049 34.00402849943097,-118.38934649514111 33.999901496699806,-118.38934649514111 33.99278550386062,-118.37097872780124 33.99719748963475,-118.37475527809862 34.00459772545025,-118.37458361672228 34.011712728779216,-118.37355364845529 34.02110362030827,-118.37698687599999 34.02138817656204,-118.38539828346741 34.019538543862865,-118.38659991311076 34.01768887085815,-118.38797320412145 34.0132779495073))"
-Steep Hills,Mud Slides,,Culver City,US,California,Los Angeles County,Culver City,34.017762364818985,-118.3773466780411,
-Dry plants,Wild Fires,,Huntington Park,US,California,Los Angeles County,Huntington Park,33.97549351065125,-118.20757357623339,
-Bars on Windows,Earthquakes,,Huntington Park,US,California,Los Angeles County,Huntington Park,33.9812586835904,-118.22941748645081,
-Poor Drainage,Floods,,La Crescenta-Montrose,US,California,Los Angeles County,Los Angeles,34.21956492552089,-118.229889555229,
-Steep Hills,Mud Slides,,La Crescenta-Montrose,US,California,Los Angeles County,Los Angeles,34.24369209105038,-118.23126284625768,
-Dry plants,Wild Fires,,Pico-Union,US,California,Los Angeles County,Los Angeles,34.044365296057606,-118.29945532824767,
-Bars on Windows,Earthquakes,,Pico-Union,US,California,Los Angeles County,Los Angeles,34.04536096573445,-118.2865378096267,
-Poor Drainage,Floods,,Watts,US,California,Los Angeles County,Los Angeles,33.941891147161414,-118.2431074812698,
-Steep Hills,Mud Slides,,Watts,US,California,Los Angeles County,Los Angeles,33.94559375295198,-118.228859586971,
-Dry plants,Wild Fires,,Wilmington,US,California,Los Angeles County,Los Angeles,33.79065906771151,-118.25787035967966,
-Bars on Windows,Earthquakes,,Wilmington,US,California,Los Angeles County,Los Angeles,33.78409629499265,-118.23349444415904,
-Poor Drainage,Floods,,Pomona,US,California,Los Angeles County,Pomona,34.0593376979159,-117.71658430605149,
-Steep Hills,Mud Slides,,Pomona,US,California,Los Angeles County,Pomona,34.087349272563145,-117.78713713197736,
diff --git a/private/templates/CRMT/Demo/stats_people.csv b/private/templates/CRMT/Demo/stats_people.csv
deleted file mode 100644
index 22afbbca14..0000000000
--- a/private/templates/CRMT/Demo/stats_people.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-Name,Type,Number,Organisation,Contact First Name,Contact Last Name,Contact Phone,Contact Email,Organisation Group,Address,Postcode,Country,L1,L2,L3,Lat,Lon,WKT,Comments
-LACDPH Community Health Workers,Trained People,10,,John,Smithson,,,Acton & Agua Dulce,"1150 S Olive St, Ste T500",90015,US,California,Los Angeles County,Los Angeles,34.04008962,-118.2615446,,
-Southern Baptist Church Group,Trained People,200,,Sandra,Mitchell,,,Acton & Agua Dulce,11701 Wilshire Blvd #7,90025,US,California,Los Angeles County,Los Angeles,34.04941097,-118.4610231,,
-South Heights High School Volunteers,Trained People,30,,Julius,O'Niel,,,Culver City,1307 Warren St,90033,US,California,Los Angeles County,Los Angeles,34.05235,-118.220466,,
-Culver City CERT Trained,Trained People,350,,Pedro,Railaco,,,Culver City,1500 East Bridge St,90033,US,California,Los Angeles County,Los Angeles,34.053346,-118.219928,,
-Church Group,Trained People,400,,Susan,Bean,,,Huntington Park,1530 James M. Wood Blvd,90015,US,California,Los Angeles County,Los Angeles,34.050449,-118.272361,,
-Hungtington Medical Center,Trained People,60,,Debra,Lockie,,,Huntington Park,1671 Beverly Blvd,90026,US,California,Los Angeles County,Los Angeles,34.064319,-118.265074,,
-La Crescenta Neighborhood Watch,Trained People,500,,We Shin,Xing,,,La Crescenta,"221 N. Figueroa St, 5th fl",90012,US,California,Los Angeles County,Los Angeles,34.05921555,-118.2510071,,
-LACDPH Community Health Worker,Trained People,10,,Maria,Dossantos,,,La Crescenta,357 S Westlake Ave,90057,US,California,Los Angeles County,Los Angeles,34.061518,-118.272079,,
-Pico-Union Business Association,Trained People,200,,Antonia,Macedo,,,Pico-Union,3721 S La Brea Ave,90016,US,California,Los Angeles County,Los Angeles,34.01970751,-118.3556546,,
-Pico-Union High School Volunteers,Trained People,30,,Phung,Tan,,,Pico-Union,4665 Willow Brook Ave,90029,US,California,Los Angeles County,Los Angeles,34.089461,-118.293173,,
-Watts CERT Trained,Trained People,350,,Xavier,Charles,,,Watts,601 E 23rd St,90011,US,California,Los Angeles County,Los Angeles,34.024868,-118.261606,,
-Watts Teacher's Union,Trained People,400,,William,Smith,,,Watts,"707 Wilshire Blvd, 30th Fl",90017,US,California,Los Angeles County,Los Angeles,34.049259,-118.257027,,
-Wilmington Medical Clinic,Trained People,60,,Bo,Bacon,,,Wilmington,8705 South Vermont Ave,90044,US,California,Los Angeles County,Los Angeles,33.958834,-118.291917,,
-Wilmington Neighborhood Watch,Trained People,500,,Ulysses,King,,,Wilmington,8963 Reseda Blvd,91324,US,California,Los Angeles County,Los Angeles,34.2328539,-118.5361364,,
-LACDPH Community Health Worker,Trained People,12,,Sarah,Lee,,,Pomona,248 E. Monterey Ave,91767,US,California,Los Angeles County,Pomona,34.060607,-117.746992,,
-Pomona Woman's League,Trained People,5,,Rachel,Williamson,,,Pomona,750 S Park Ave,91766,US,California,Los Angeles County,Pomona,34.05273819,-117.7538605,,
\ No newline at end of file
diff --git a/private/templates/CRMT/Demo/tasks.cfg b/private/templates/CRMT/Demo/tasks.cfg
deleted file mode 100644
index 73942464d8..0000000000
--- a/private/templates/CRMT/Demo/tasks.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-##########################################################################
-# Add a list of csv file to import into the system
-# the list of import files is a comma separated list as follows:
-# "prefix","tablename","csv file name","stylesheet"
-#
-# The csv file is assumed to be in the same directory as this file
-# The style sheet is assumed to be in either of the following directories:
-#     static/format/s3csv/"prefix"/
-#     static/format/s3csv/
-#     CSV path
-#
-# For details on how to import data into the system see the following:
-#     zzz_1st_run
-#     s3import::S3BulkImporter
-##########################################################################
-# Roles for Demo Server
-#*,import_role,auth_roles_demo.csv
-# -----------------------------------------------------------------------------
-# Dummy Data - assumes import of main file
-# -----------------------------------------------------------------------------
-org,organisation,organisation.csv,organisation.xsl
-*,import_user,users.csv
-#gis,poi,gis_poi.csv,poi.xsl
-org,resource,org_resource.csv,resource.xsl
-*,import_script,import_lms.py
-stats,people,stats_people.csv,people.xsl
-vulnerability,risk,risk.csv,risk.xsl
-project,activity,activity.csv,activity.xsl
-vulnerability,evac_route,evac_route.csv,evac_route.xsl
\ No newline at end of file
diff --git a/private/templates/CRMT/auth_roles.csv b/private/templates/CRMT/auth_roles.csv
deleted file mode 100644
index 1acd9b6bc8..0000000000
--- a/private/templates/CRMT/auth_roles.csv
+++ /dev/null
@@ -1,70 +0,0 @@
-uid,role,description,controller,function,table,entity,uacl,oacl,hidden,system,protected,Notes
-ANONYMOUS,Anonymous,,org,organisation,,,READ|CREATE|UPDATE,,,,,Allow new users to create orgs during registration 
-ANONYMOUS,Anonymous,,,,org_organisation,,READ|CREATE,,,,,Allow new users to create orgs during registration 
-ANONYMOUS,Anonymous,,org,group,,,READ,,,,,Allow display of Coalition Polygons on homepage
-ANONYMOUS,Anonymous,,,,org_group,,READ,,,,,Allow selection of Coalition during Registration
-ANONYMOUS,Anonymous,,cms,page,,,READ,READ,,,,Allow display of Map Layer Metadata
-ANONYMOUS,Anonymous,,,,s3_audit,,READ,,,,,Allow display of Site Activity on Homepage
-AUTHENTICATED,Authenticated,,default,person,,,READ|CREATE|UPDATE,,,,,
-AUTHENTICATED,Authenticated,,default,person,gis_location,,READ|CREATE|UPDATE,,,,,
-AUTHENTICATED,Authenticated,,gis,config,,,READ|CREATE,READ|CREATE|UPDATE,,,,
-AUTHENTICATED,Authenticated,,gis,index,,,READ|CREATE,READ|CREATE|UPDATE,,,,
-AUTHENTICATED,Authenticated,,gis,geocode,,,READ,,,,,
-AUTHENTICATED,Authenticated,,gis,ldata,,,READ,,,,,
-AUTHENTICATED,Authenticated,,gis,location,,,READ,,,,,
-AUTHENTICATED,Authenticated,,gis,proxy,,,READ,,,,,
-AUTHENTICATED,Authenticated,,gis,screenshot,,,READ,,,,,
-AUTHENTICATED,Authenticated,,pr,person,,,READ|CREATE,READ|CREATE|UPDATE,,,,
-AUTHENTICATED,Authenticated,,pr,contact,,,,READ|CREATE|UPDATE,,,,
-AUTHENTICATED,Authenticated,,,,gis_config,,READ|CREATE,READ|CREATE|UPDATE,,,,
-AUTHENTICATED,Authenticated,,,,gis_layer_bing,,READ,,,,,
-AUTHENTICATED,Authenticated,,,,gis_layer_coordinate,,READ,,,,,
-AUTHENTICATED,Authenticated,,,,gis_layer_empty,,READ,,,,,
-AUTHENTICATED,Authenticated,,,,gis_layer_feature,,READ|CREATE,,,,,
-AUTHENTICATED,Authenticated,,,,gis_layer_geojson,,READ|CREATE,,,,,
-AUTHENTICATED,Authenticated,,,,gis_layer_georss,,READ|CREATE,,,,,
-AUTHENTICATED,Authenticated,,,,gis_layer_google,,READ,,,,,
-AUTHENTICATED,Authenticated,,,,gis_layer_gpx,,READ|CREATE,,,,,
-AUTHENTICATED,Authenticated,,,,gis_layer_kml,,READ|CREATE,,,,,
-AUTHENTICATED,Authenticated,,,,gis_layer_openstretmap,,READ,,,,,
-AUTHENTICATED,Authenticated,,,,gis_layer_theme,,READ|CREATE,,,,,
-AUTHENTICATED,Authenticated,,,,gis_layer_tms,,READ|CREATE,,,,,
-AUTHENTICATED,Authenticated,,,,gis_layer_wfs,,READ|CREATE,,,,,
-AUTHENTICATED,Authenticated,,,,gis_layer_wms,,READ|CREATE,,,,,
-AUTHENTICATED,Authenticated,,,,gis_layer_xyz,,READ|CREATE,,,,,
-AUTHENTICATED,Authenticated,,,,hrm_human_resource,,,READ,,,,
-AUTHENTICATED,Authenticated,,,,hrm_training,,,READ,,,,
-AUTHENTICATED,Authenticated,,,,pr_contact,,,READ|CREATE|UPDATE,,,,
-AUTHENTICATED,Authenticated,,,,pr_filter,,READ,READ|CREATE|UPDATE,,,,
-AUTHENTICATED,Authenticated,,,,pr_group_membership,,,READ,,,,
-AUTHENTICATED,Authenticated,,,,pr_image,,READ|CREATE,READ|CREATE|UPDATE,,,,
-AUTHENTICATED,Authenticated,,,,pr_person,,READ|CREATE,READ|UPDATE,,,,
-AUTHENTICATED,Authenticated,,event,,,,READ|CREATE|UPDATE,ALL,,,,
-AUTHENTICATED,Authenticated,,org,,,,READ|CREATE|UPDATE,ALL,,,,
-AUTHENTICATED,Authenticated,,org,organisation,,,READ|CREATE|UPDATE|REVIEW|APPROVE,ALL,,,,When authenticated users create orgs they are auto-approved
-AUTHENTICATED,Authenticated,,,,org_facility,,READ|CREATE|UPDATE,ALL,,,,Needed for Impersonated Import
-AUTHENTICATED,Authenticated,,,,org_facility_type,,READ|CREATE|UPDATE,ALL,,,,Needed for Impersonated Import
-AUTHENTICATED,Authenticated,,,,org_service,,READ|CREATE|UPDATE,ALL,,,,Needed for Impersonated Import
-AUTHENTICATED,Authenticated,,,,org_site_facility_type,,READ|CREATE|UPDATE,ALL,,,,Needed for Impersonated Import
-AUTHENTICATED,Authenticated,,,,org_organisation,,READ|CREATE|UPDATE|REVIEW|APPROVE,ALL,,,,When authenticated users create orgs they are auto-approved
-AUTHENTICATED,Authenticated,,project,,,,READ|CREATE|UPDATE,ALL,,,,
-AUTHENTICATED,Authenticated,,stats,,,,READ|CREATE|UPDATE,ALL,,,,
-AUTHENTICATED,Authenticated,,vulnerability,,,,READ|CREATE|UPDATE,ALL,,,,
-MAP_ADMIN,Map Admin,,,,cms_post,,ALL,,,,,
-MAP_ADMIN,Map Admin,,,,gis_layer_arcrest,,ALL,,,,,
-MAP_ADMIN,Map Admin,,,,gis_layer_bing,,ALL,,,,,
-MAP_ADMIN,Map Admin,,,,gis_layer_coordinate,,ALL,,,,,
-MAP_ADMIN,Map Admin,,,,gis_layer_empty,,ALL,,,,,
-MAP_ADMIN,Map Admin,,,,gis_layer_feature,,ALL,,,,,
-MAP_ADMIN,Map Admin,,,,gis_layer_geojson,,ALL,,,,,
-MAP_ADMIN,Map Admin,,,,gis_layer_georss,,ALL,,,,,
-MAP_ADMIN,Map Admin,,,,gis_layer_google,,ALL,,,,,
-MAP_ADMIN,Map Admin,,,,gis_layer_gpx,,ALL,,,,,
-MAP_ADMIN,Map Admin,,,,gis_layer_kml,,ALL,,,,,
-MAP_ADMIN,Map Admin,,,,gis_layer_mgrs,,ALL,,,,,
-MAP_ADMIN,Map Admin,,,,gis_layer_openstretmap,,ALL,,,,,
-MAP_ADMIN,Map Admin,,,,gis_layer_theme,,ALL,,,,,
-MAP_ADMIN,Map Admin,,,,gis_layer_tms,,ALL,,,,,
-MAP_ADMIN,Map Admin,,,,gis_layer_wfs,,ALL,,,,,
-MAP_ADMIN,Map Admin,,,,gis_layer_wms,,ALL,,,,,
-MAP_ADMIN,Map Admin,,,,gis_layer_xyz,,ALL,,,,,
diff --git a/private/templates/CRMT/cms_post.csv b/private/templates/CRMT/cms_post.csv
deleted file mode 100644
index 75f7a990fd..0000000000
--- a/private/templates/CRMT/cms_post.csv
+++ /dev/null
@@ -1,7 +0,0 @@
-Module,Resource,Name,Body
-org,organisation,Organizations Summary Page Header,"Find the Community Based, Faith Based, Volunteer, Government, Business organizations in your community, including schools,  offices, offices, parks, shops and shelters which contribute to its resilience"
-org,facility,Locations Summary Page Header,"Map places which are important to community resilience such as bridges, water storage tanks, assembly points and flood channels"
-project,activity,Activities Summary Page Header,Track the events which are planned within your community that will help strengthen it in the face of disasters
-stats,people,People Summary Page Header,Identify the different groups of people who live in your community
-vulnerability,evac_route,Evacuation Routes Summary Page Header,Identify the roads and routes to get people to safety in case of certain emergencies
-vulnerability,risk,Risks Summary Page Header,View the environmental factors or situations which pose as dangers to your community
\ No newline at end of file
diff --git a/private/templates/CRMT/config.py b/private/templates/CRMT/config.py
deleted file mode 100644
index 0dcf555e3d..0000000000
--- a/private/templates/CRMT/config.py
+++ /dev/null
@@ -1,2625 +0,0 @@
-# -*- coding: utf-8 -*-
-
-try:
-    # Python 2.7
-    from collections import OrderedDict
-except:
-    # Python 2.6
-    from gluon.contrib.simplejson.ordered_dict import OrderedDict
-
-from gluon import current
-from gluon.html import *
-from gluon.storage import Storage
-
-from s3 import ICON, s3_avatar_represent, S3DataListLayout
-
-T = current.T
-settings = current.deployment_settings
-
-"""
-    Template settings for Community Resilience Mapping Tool
-"""
-
-# -----------------------------------------------------------------------------
-# Pre-Populate
-settings.base.prepopulate = ("CRMT", "default/users", "CRMT/Demo")
-
-settings.base.system_name = T("Community Resilience Mapping Tool")
-settings.base.system_name_short = T("CRMT")
-
-# =============================================================================
-# US Settings
-# -----------------------------------------------------------------------------
-# Uncomment to Hide the language toolbar
-settings.L10n.display_toolbar = False
-# Default timezone for users
-settings.L10n.utc_offset = "UTC -0800"
-# Uncomment these to use US-style dates in English (localisations can still convert to local format)
-settings.L10n.date_format = T("%m-%d-%Y")
-# Start week on Sunday
-settings.L10n.firstDOW = 0
-# Number formats (defaults to ISO 31-0)
-# Decimal separator for numbers (defaults to ,)
-settings.L10n.decimal_separator = "."
-# Thousands separator for numbers (defaults to space)
-settings.L10n.thousands_separator = ","
-# Default Country Code for telephone numbers
-settings.L10n.default_country_code = 1
-# Enable this to change the label for 'Mobile Phone'
-settings.ui.label_mobile_phone = "Cell Phone"
-# Enable this to change the label for 'Postcode'
-settings.ui.label_postcode = "ZIP Code"
-# Uncomment to disable responsive behavior of datatables
-# - Disabled until tested
-settings.ui.datatables_responsive = False
-# PDF to Letter
-settings.base.paper_size = T("Letter")
-
-# =============================================================================
-# System Settings
-# -----------------------------------------------------------------------------
-# Authorization Settings
-settings.auth.registration_requires_approval = True
-settings.auth.registration_requires_verification = False
-settings.auth.registration_requests_organisation = True
-settings.auth.registration_organisation_required = False
-settings.auth.registration_requests_organisation_group = True
-settings.auth.registration_organisation_group_required = False
-settings.auth.registration_requests_site = False
-# Uncomment this to request the Home Phone when a user registers
-settings.auth.registration_requests_home_phone = True
-# Uncomment this to request the Mobile Phone when a user registers
-settings.auth.registration_requests_mobile_phone = True
-
-settings.auth.registration_link_user_to = {"staff": T("Staff")}
-settings.auth.registration_link_user_to_default = "staff"
-
-# Approval emails get sent to all admins
-settings.mail.approver = "ADMIN"
-
-# Record Approval
-settings.auth.record_approval = True
-# If an anonymous user creates a new org when registering then the org will be unapproved until the user is approved
-settings.auth.record_approval_required_for = ("org_organisation",)
-
-# -----------------------------------------------------------------------------
-# Security Policy
-settings.security.policy = 5 # Tables
-settings.security.map = True
-
-# Owner Entity
-settings.auth.person_realm_human_resource_site_then_org = False
-
-# -----------------------------------------------------------------------------
-# Audit
-def audit_write(method, tablename, form, record, representation):
-    if not current.auth.user:
-        # Don't include prepop
-        return False
-    if tablename in ("org_facility",
-                     "org_organisation",
-                     "pr_filter",
-                     "project_activity",
-                     "stats_people",
-                     "vulnerability_evac_route",
-                     "vulnerability_risk",
-                     ):
-        # Perform normal Audit
-        return True
-    elif tablename == "gis_config":
-        if form.vars.get("temp") != "1":
-            # Perform normal Audit
-            return True
-    # Don't Audit non user-visible resources
-    return False
-
-settings.security.audit_write = audit_write
-
-# -----------------------------------------------------------------------------
-# Theme (folder to use for views/layout.html)
-settings.base.theme = "CRMT"
-settings.ui.formstyle_row = "bootstrap"
-settings.ui.formstyle = "bootstrap"
-settings.ui.hide_report_options = False
-settings.ui.update_label = "Update"
-settings.ui.export_formats = ("xls", "xml")
-# Uncomment to use S3MultiSelectWidget on all dropdowns (currently the Auth Registration page & LocationSelectorWidget2 listen to this)
-settings.ui.multiselect_widget = True
-settings.ui.use_button_icons = True
-
-# Set Map to fill the container
-settings.gis.map_width = 1178
-# Set map to be able to open Census Data & still view root labels
-settings.gis.map_height = 816
-
-settings.base.youtube_id = (dict(id = "introduction",
-                                 title = T("Introduction"),
-                                 video_id = "HR-FtR2XkBU" ),
-                            dict(id = "expanding-your-coalition",
-                                 title = T("Expanding Your Coalition"),
-                                 video_id = "HR-FtR2XkBU" ),
-                            dict(id = "mapping-vulnerable-groups",
-                                 title = T("Mapping Vulnerable Groups"),
-                                 video_id = "HR-FtR2XkBU" ),
-                            dict(id = "mapping-hazards",
-                                 title = T("Mapping Hazards"),
-                                 video_id = "HR-FtR2XkBU" ),
-                            dict(id = "managing-trainings",
-                                 title = T("Managing Trainings"),
-                                 video_id = "HR-FtR2XkBU" ),
-                            dict(id = "tracking-outreach",
-                                 title = T("Tracking Outreach"),
-                                 video_id = "HR-FtR2XkBU" ),
-                            )
-
-# -----------------------------------------------------------------------------
-# Menu
-menu = (
-    {"name": T("Organizations"),
-     "c":"org",
-     "f":"organisation",
-     "icon": "icon-sitemap"
-     },
-    {"name": T("Places"),
-     "c":"org",
-     "f":"facility",
-     "icon": "icon-map-marker"
-     },
-    {"name": T("People"),
-     "c":"stats",
-     "f":"people",
-     "icon": "icon-group"
-     },
-    #{"name": T("Incidents"),
-    # "url": URL(c="event", f="incident_report"),
-    # "icon": "icon-warning-sign"
-    # },
-    {"name": T("Hazards"),
-     "c":"vulnerability",
-     "f":"risk",
-     "icon": "icon-bolt"
-     },
-    {"name": T("Activities"),
-     "c":"project",
-     "f":"activity",
-     "icon": "icon-star-empty"
-     },
-    #{"name": T("Organizations"),
-    # "url": URL(c="org", f="organisation"),
-    # "icon": "icon-sitemap"
-    # },
-    #{"name": T("Trained People"),
-    # "url": URL(c="stats", f="trained"),
-    # "icon": "icon-user"
-    # },
-    {"name": T("Evacuation Routes"),
-     "c":"vulnerability",
-     "f":"evac_route",
-     "icon": "icon-road"
-     },
-    )
-
-for item in menu:
-    item["url"] = URL(item["c"], item["f"])
-
-current.response.menu = menu
-
-# -----------------------------------------------------------------------------
-# Summary Pages
-settings.ui.summary = ({"common": True,
-                        "name": "add",
-                        "widgets": [{"method": "create"}],
-                        },
-                       {"common": True,
-                        "name": "cms",
-                        "widgets": [{"method": "cms"}]
-                        },
-                       {"name": "table",
-                        "label": "Table",
-                        "widgets": [{"method": "datatable"}]
-                        },
-                       {"name": "charts",
-                        "label": "Charts",
-                        "widgets": [{"method": "report", "ajax_init": True}]
-                        },
-                       {"name": "map",
-                        "label": "Map",
-                        "widgets": [{"method": "map", "ajax_init": True}],
-                        },
-                       )
-
-settings.search.filter_manager = True
-settings.search.filter_manager_allow_delete = False
-settings.search.filter_manager_save = "Save"
-settings.search.filter_manager_update = "Update"
-
-# -----------------------------------------------------------------------------
-# Filter forms - style for Summary pages
-def filter_formstyle(row_id, label, widget, comment, hidden=False):
-    return DIV(label, widget, comment,
-               _id=row_id,
-               _class="horiz_filter_form")
-
-# -----------------------------------------------------------------------------
-# L10n (Localization) settings
-settings.L10n.languages = OrderedDict([
-    ("en", "English"),
-    ("es", "Español"),
-])
-# Default Language
-settings.L10n.default_language = "en"
-# Number formats (defaults to ISO 31-0)
-# Decimal separator for numbers (defaults to ,)
-settings.L10n.decimal_separator = "."
-# Thousands separator for numbers (defaults to space)
-settings.L10n.thousands_separator = ","
-
-# Restrict the Location Selector to just certain countries
-# NB This can also be over-ridden for specific contexts later
-# e.g. Activities filtered to those of parent Project
-settings.gis.countries = ("US",)
-
-# Uncomment to pass Addresses imported from CSV to a Geocoder to try and automate Lat/Lon
-settings.gis.geocode_imported_addresses = "google"
-
-# Uncomment to Hide the Toolbar from the main Map
-#settings.gis.toolbar = False
-# Uncomment to use CMS to provide Metadata on Map Layers
-settings.gis.layer_metadata = True
-# Uncomment to show Clear Layers tool
-settings.gis.clear_layers = "toolbar"
-# Uncomment to hide the Geolocation control
-settings.gis.geolocate_control = False
-# Uncomment to hide the WMS GetFeatureInfo control
-settings.gis.getfeature_control = False
-# Uncomment to hide Layer Properties tool
-settings.gis.layer_properties = False
-# Uncomment to hide the Base Layers folder in the LayerTree
-#settings.gis.layer_tree_base = False
-# Uncomment to hide the Overlays folder in the LayerTree
-#settings.gis.layer_tree_overlays = False
-# Uncomment to change the label of the Overlays folder in the LayerTree
-settings.gis.label_overlays = "Places"
-# Uncomment to not expand the folders in the LayerTree by default
-settings.gis.layer_tree_expanded = False
-# Uncomment to have custom folders in the LayerTree use Radio Buttons
-settings.gis.layer_tree_radio = True
-settings.gis.layers_label = "Map Layers"
-# Uncomment to display the Map Legend as a floating DIV
-settings.gis.legend = "float"
-# Mouse Position: 'normal', 'mgrs' or None
-settings.gis.mouse_position = None
-# Uncomment to hide the Overview map (doesn't work with Google Maps)
-settings.gis.overview = False
-# Uncomment to hide the permalink control (we have our own saved maps functionality)
-settings.gis.permalink = False
-# Resources which can be directly added to the main map
-settings.gis.poi_create_resources = None
-# Uncomment to rename Overlays in Layer Tree
-#settings.gis.label_overlays = "Community Data"
-# Uncomment to show the Print control:
-# http://eden.sahanafoundation.org/wiki/UserGuidelines/Admin/MapPrinting
-settings.gis.print_button = True
-# Uncomment to hide the Save control, or set to "float"
-settings.gis.save = "float"
-# Uncomment to hide the GeoNames search box
-settings.gis.search_geonames = False
-# GeoNames username
-#settings.gis.geonames_username = "lacrmt"
-
-# Don't simplify Polygons as much to retain their original shape
-settings.gis.simplify_tolerance = 0.0001
-
-# Add Person Widget
-# Uncomment to hide fields in S3AddPersonWidget[2]
-settings.pr.request_dob = False
-settings.pr.request_gender = False
-# Uncomment to show field in S3AddPersonWidget
-settings.pr.request_home_phone = True
-
-# -----------------------------------------------------------------------------
-# Finance settings
-settings.fin.currencies = {
-    "USD" : T("United States Dollars"),
-}
-
-# =============================================================================
-# Module Settings
-
-# -----------------------------------------------------------------------------
-# Human Resource Management
-#
-# Uncomment to allow Staff & Volunteers to be registered without an email address
-settings.hrm.email_required = False
-# Uncomment to show the Organisation name in HR represents
-settings.hrm.show_organisation = True
-# Uncomment to disable Staff experience
-settings.hrm.staff_experience = False
-# Uncomment to disable the use of HR Credentials
-settings.hrm.use_credentials = False
-# Uncomment to disable the use of HR Skills
-settings.hrm.use_skills = False
-# Uncomment to disable the use of HR Teams
-settings.hrm.teams = False
-# Uncomment to have Staff use their Home Address as their base location, with a fallback to their site
-settings.hrm.location_staff = ("person_id", "site_id")
-
-# -----------------------------------------------------------------------------
-# Organisation Registry
-#
-# Make Facility Types Hierarchical
-settings.org.facility_types_hierarchical = True
-# Make Organisation Types Hierarchical
-#settings.org.organisation_types_hierarchical = True
-# Make Organisation Types Multiple
-#settings.org.organisation_types_multiple = True
-# Make Services Hierarchical
-settings.org.services_hierarchical = True
-# Enable the use of Organisation Groups
-settings.org.groups = "Coalition"
-# Set the label for Sites
-settings.org.site_label = "Place"
-
-# -----------------------------------------------------------------------------
-# projects
-#
-# Uncomment this to disable Sectors in projects
-settings.project.sectors = False
-
-# -----------------------------------------------------------------------------
-# Contacts
-#
-def user_coalition(row):
-    """
-        The Coalition of the user
-        - required since Inline Component uses the link table
-    """
-
-    if hasattr(row, "pr_person_user"):
-        row = row.pr_person_user
-    try:
-        user_id = row.user_id
-    except:
-        # not available
-        return current.messages["NONE"]
-
-    db = current.db
-    table = db.auth_user
-    row = db(table.id == user_id).select(table.org_group_id,
-                                         limitby=(0, 1)
-                                         ).first()
-    if row:
-        return current.s3db.org_group_represent(row.org_group_id)
-    else:
-        return current.messages["NONE"]
-
-def customise_pr_person_controller(**attr):
-
-    s3 = current.response.s3
-
-    # Custom PreP
-    standard_prep = s3.prep
-    def custom_prep(r):
-        # Call standard prep
-        if callable(standard_prep):
-            result = standard_prep(r)
-            if not result:
-                return False
-
-        s3db = current.s3db
-        tablename = "pr_person"
-
-        if r.method == "validate":
-            # Can't validate image without the file
-            image_field = s3db.pr_image.image
-            image_field.requires = None
-
-        elif r.interactive or r.representation == "aadata":
-            # Modify list_fields
-            db = current.db
-            field = db.auth_user.org_group_id
-            field.readable = True
-            field.represent = s3db.org_group_represent
-            list_fields = [(current.messages.ORGANISATION, "human_resource.organisation_id"),
-                           (T("Coalition"), "user.org_group_id"),
-                           "first_name",
-                           #"middle_name",
-                           "last_name",
-                           #(T("Job Title"), "human_resource.job_title_id"),
-                           (T("Place"), "human_resource.site_id"),
-                           ]
-            is_logged_in = current.auth.is_logged_in()
-            # Don't include Email/Phone for unauthenticated users
-            if is_logged_in:
-                # Custom filtered component for list_fields/CRUD form
-                s3db.add_components("pr_pentity",
-                                    pr_contact = ({"name": "home",
-                                                   "joinby": "pe_id",
-                                                   "filterby": "contact_method",
-                                                   "filterfor": ["HOME_PHONE"],
-                                                   }),
-                                    )
-                list_fields.extend(((T("Email"), "email.value"),
-                                    (settings.get_ui_label_mobile_phone(), "phone.value"),
-                                    (T("Home Phone"), "home.value"),
-                                    ))
-            s3db.configure(tablename,
-                           list_fields = list_fields,
-                           )
-
-        if r.interactive:
-            if r.controller != "default":
-                # CRUD Strings
-                s3.crud_strings[tablename] = Storage(
-                    label_create = T("Add"),
-                    title_display = T("Contact Details"),
-                    title_list = T("Contact Directory"),
-                    title_update = T("Update Contact Details"),
-                    label_list_button = T("List Contacts"),
-                    label_delete_button = T("Delete Contact"),
-                    msg_record_created = T("Contact added"),
-                    msg_record_modified = T("Contact details updated"),
-                    msg_record_deleted = T("Contact deleted"),
-                    msg_list_empty = T("No Contacts currently registered"))
-
-            # Custom Form (Read/Create/Update)
-            from s3 import S3Represent, S3SQLCustomForm, S3SQLInlineComponent
-            if r.method in ("create", "update"):
-                # Custom Widgets/Validators
-                widgets = True
-            else:
-                widgets = False
-
-            htable = s3db.hrm_human_resource
-            htable.organisation_id.widget = None
-            site_field = htable.site_id
-            site_field.label = T("Place")
-            represent = S3Represent(lookup="org_site")
-            site_field.represent = represent
-            if widgets:
-                from s3 import IS_ONE_OF, S3MultiSelectWidget
-                from s3layouts import S3AddResourceLink
-                htable.organisation_id.widget = S3MultiSelectWidget(multiple=False)
-                site_field.widget = S3MultiSelectWidget(multiple=False)
-                site_field.requires = IS_ONE_OF(db, "org_site.site_id",
-                                                represent,
-                                                orderby = "org_site.name")
-                site_field.comment = S3AddResourceLink(c="org", f="office",
-                                                       vars={"child": "site_id"},
-                                                       label=T("Add New Place"),
-                                                       title=T("Place"),
-                                                       tooltip=T("If you don't see the Place in the list, you can add a new one by clicking link 'Add New Place'."))
-
-            s3db.pr_image.profile.default = True
-            # ImageCrop widget doesn't currently work within an Inline Form
-            from gluon.validators import IS_IMAGE
-            image_field = s3db.pr_image.image
-            image_field.requires = IS_IMAGE()
-            image_field.widget = None
-
-            hr_fields = ["organisation_id",
-                         #"job_title_id",
-                         "site_id",
-                         ]
-            #if widgets:
-            #    # Context from a Profile page?"
-            #    organisation_id = current.request.get_vars.get("(organisation)", None)
-            #    if organisation_id:
-            #        field = s3db.hrm_human_resource.organisation_id
-            #        field.default = organisation_id
-            #        field.readable = field.writable = False
-            #        hr_fields.remove("organisation_id")
-
-            # S3SQLInlineComponent uses the link table, so cannot access org_group_id
-            # => use a readonly virtual field instead
-            from gluon import Field
-            s3db.pr_person_user.org_group_id = Field.Method("org_group_id", user_coalition)
-
-            s3_sql_custom_fields = [
-                    "first_name",
-                    #"middle_name",
-                    "last_name",
-                    S3SQLInlineComponent(
-                        "human_resource",
-                        name = "human_resource",
-                        label = "",
-                        multiple = False,
-                        fields = hr_fields,
-                    ),
-                    S3SQLInlineComponent(
-                        "user",
-                        name = "user",
-                        label = T("Coalition"),
-                        multiple = False,
-                        fields = [],
-                        # Fields needed to load for Virtual Fields
-                        extra_fields = ["user_id"],
-                        virtual_fields = [("", "org_group_id")],
-                    ),
-                    S3SQLInlineComponent(
-                        "image",
-                        name = "image",
-                        label = T("Photo"),
-                        multiple = False,
-                        fields = [("", "image")],
-                        filterby = dict(field = "profile",
-                                        options=[True]
-                                        ),
-                        ),
-                    S3SQLInlineComponent("contact",
-                        name = "email",
-                        label = T("Email"),
-                        multiple = False,
-                        fields = [("", "value")],
-                        filterby = dict(field = "contact_method",
-                                        options = "EMAIL"),
-                        ),
-                    S3SQLInlineComponent("contact",
-                        name = "phone",
-                        label = settings.get_ui_label_mobile_phone(),
-                        multiple = False,
-                        fields = [("", "value")],
-                        filterby = dict(field = "contact_method",
-                                        options = "SMS"),
-                        ),
-                    S3SQLInlineComponent("contact",
-                        name = "home",
-                        label = T("Home Phone"),
-                        multiple = False,
-                        fields = [("", "value")],
-                        filterby = dict(field = "contact_method",
-                                        options = "HOME_PHONE"),
-                        ),
-                    ]
-
-            crud_form = S3SQLCustomForm(*s3_sql_custom_fields)
-
-            # Return to List view after create/update/delete (unless done via Modal)
-            url_next = URL(c="pr", f="person")
-
-            s3db.configure(tablename,
-                           create_next = url_next,
-                           crud_form = crud_form,
-                           delete_next = url_next,
-                           # Don't include a Create form in 'More' popups
-                           #listadd = False if r.method=="datalist" else True,
-                           update_next = url_next,
-                           )
-
-        return True
-    s3.prep = custom_prep
-
-    # Custom postp
-    standard_postp = s3.postp
-    def custom_postp(r, output):
-        # Call standard postp
-        if callable(standard_postp):
-            output = standard_postp(r, output)
-
-        if r.interactive and isinstance(output, dict):
-            output["rheader"] = ""
-            # All users just get "Open"
-            actions = [dict(label=str(T("Open")),
-                            _class="action-btn",
-                            url=URL(c="pr", f="person",
-                                    args=["[id]", "read"]))
-                       ]
-            s3.actions = actions
-            if "form" in output:
-                output["form"].add_class("pr_person")
-            elif "item" in output and hasattr(output["item"], "add_class"):
-                output["item"].add_class("pr_person")
-
-        return output
-    s3.postp = custom_postp
-
-    return attr
-
-settings.customise_pr_person_controller = customise_pr_person_controller
-
-# -----------------------------------------------------------------------------
-def default_coalition_filter(selector, tablename=None):
-    """
-        Default filter for coalitions (callback)
-    """
-
-    auth = current.auth
-    org_group_id = auth.is_logged_in() and auth.user.org_group_id
-    if org_group_id:
-        return org_group_id
-    else:
-        # Filter to all Coalitions
-        gtable = current.s3db.org_group
-        rows = current.db(gtable.deleted == False).select(gtable.id)
-        return [row.id for row in rows]
-
-# -----------------------------------------------------------------------------
-# Activities
-#
-def customise_project_activity_controller(**attr):
-
-    if "summary" in current.request.args:
-        settings.gis.toolbar = False
-        from s3 import s3_set_default_filter
-        s3_set_default_filter("activity_group.group_id",
-                              default_coalition_filter,
-                              tablename = "project_activity")
-
-    # Custom PreP
-    s3 = current.response.s3
-    standard_prep = s3.prep
-    def custom_prep(r):
-        # Call standard prep
-        if callable(standard_prep):
-            result = standard_prep(r)
-            if not result:
-                return False
-
-        s3db = current.s3db
-        tablename = "project_activity"
-        table = s3db[tablename]
-
-        method = r.method
-        representation = r.representation
-        if method == "summary" or representation == "aadata":
-            # Modify list_fields for interactive views
-            list_fields = ["date",
-                           "name",
-                           "activity_activity_type.activity_type_id",
-                           "activity_group.group_id",
-                           (T("Address"), "location_id"),
-                           "location_id$addr_postcode",
-                           "person_id",
-                           (T("Number of People"), "beneficiary.value"),
-                           "comments",
-                           ]
-
-            s3db.configure(tablename,
-                           list_fields = list_fields,
-                           )
-
-        table.location_id.represent = s3db.gis_LocationRepresent(address_only=True)
-        if r.interactive or representation == "json" or \
-                            representation == "plain":
-            # CRUD Strings / Represent
-            s3.crud_strings[tablename].title_update = T("Update Activities")
-            table.date.label = T("Date")
-            table.name.label = T("Activity Name")
-            table.comments.label = T("Description")
-
-            # Custom Form (Read/Create/Update inc embedded Summary)
-            from s3 import S3SQLCustomForm, S3SQLInlineComponent
-
-            table.person_id.comment = None
-
-            bttable = s3db.project_beneficiary_type
-            total = current.db(bttable.name == "Total").select(bttable.parameter_id,
-                                                               limitby=(0, 1)).first()
-            if total:
-                parameter_id = total.parameter_id
-            else:
-                parameter_id = None
-            crud_form = S3SQLCustomForm(
-                "date",
-                "name",
-                S3SQLInlineComponent(
-                    "activity_activity_type",
-                    label = T("Activity Type"),
-                    fields = [("", "activity_type_id")],
-                    multiple = False,
-                ),
-                S3SQLInlineComponent(
-                    "activity_group",
-                    label = T("Coalition"),
-                    fields = [("", "group_id")],
-                    multiple = False,
-                ),
-                "location_id",
-                "person_id",
-                S3SQLInlineComponent(
-                    "activity_organisation",
-                    label = T("Participating Organizations"),
-                    fields = [("", "organisation_id")],
-                ),
-                S3SQLInlineComponent(
-                    "beneficiary",
-                    label = T("Number of People Reached"),
-                    link = False,
-                    multiple = False,
-                    fields = [("", "value")],
-                    filterby = dict(field = "parameter_id",
-                                    options = parameter_id
-                                    ),
-                ),
-                S3SQLInlineComponent(
-                    "document",
-                    name = "file",
-                    label = T("Files"),
-                    fields = [("", "file"),
-                              ],
-                    comment =  DIV(_class="tooltip",
-                                   _title="%s|%s" %
-                                          (T("Files"),
-                                           T("Upload Photos, Promotional Material, Documents or Reports related to the Activity")
-                                           )
-                                   )
-                ),
-                "comments",
-            )
-
-            s3db.configure(tablename,
-                           crud_form = crud_form,
-                           )
-
-            if method in ("summary", "report"):
-                from s3 import S3OptionsFilter, S3DateFilter
-                filter_widgets = [S3OptionsFilter("activity_group.group_id",
-                                                  represent = "%(name)s",
-                                                  header = True,
-                                                  ),
-                                  S3OptionsFilter("activity_activity_type.activity_type_id",
-                                                  # Doesn't allow Translation
-                                                  #represent = "%(name)s",
-                                                  header = True,
-                                                  ),
-                                  S3DateFilter("date",
-                                               label = None,
-                                               hide_time = True,
-                                               input_labels = {"ge": "From", "le": "To"}
-                                               )
-                                  ]
-
-                # @ToDo: Month/Year Lazy virtual fields (like in PM tool)
-                report_fields = ["activity_activity_type.activity_type_id",
-                                 "activity_group.group_id",
-                                 "location_id$L3",
-                                 ]
-
-                report_options = Storage(
-                    rows = report_fields,
-                    cols = [],
-                    fact = [(T("Number of Activities"), "count(name)"),
-                            (T("Number of People"), "sum(beneficiary.value)"),
-                            ],
-                    defaults = Storage(rows="activity_activity_type.activity_type_id",
-                                       #cols="activity_group.group_id",
-                                        fact="count(name)",
-                                       totals=True,
-                                       chart = "barchart:rows",
-                                       table = "collapse",
-                                       )
-                    )
-
-                s3db.configure(tablename,
-                               # Hide Open & Delete dataTable action buttons
-                               deletable = False,
-                               editable = False,
-                               filter_formstyle = filter_formstyle,
-                               filter_widgets = filter_widgets,
-                               report_options = report_options,
-                               )
-
-            if method in ("create", "update", "summary"):
-                # Custom Widgets/Validators
-                from s3 import IS_LOCATION, S3LocationSelector, S3MultiSelectWidget
-
-                s3db.project_activity_activity_type.activity_type_id.widget = S3MultiSelectWidget(multiple=False)
-                s3db.project_activity_group.group_id.widget = S3MultiSelectWidget(multiple=False)
-                s3db.project_activity_organisation.organisation_id.widget = S3MultiSelectWidget(multiple=False)
-
-                field = table.location_id
-                field.label = "" # Gets replaced by widget
-                levels = ("L3",)
-                field.requires = IS_LOCATION()
-                field.widget = S3LocationSelector(levels=levels,
-                                                  hide_lx=False,
-                                                  reverse_lx=True,
-                                                  show_address=True,
-                                                  show_postcode=True,
-                                                  )
-
-        return True
-    s3.prep = custom_prep
-
-    # Remove rheader
-    attr["rheader"] = None
-
-    return attr
-
-settings.customise_project_activity_controller = customise_project_activity_controller
-
-def customise_project_activity_type_controller(**attr):
-
-    from s3 import S3SQLCustomForm
-    current.s3db.configure("project_activity_type",
-                           crud_form = S3SQLCustomForm("name",
-                                                       "comments"),
-                           )
-
-    return attr
-
-settings.customise_project_activity_type_controller = customise_project_activity_type_controller
-
-# -----------------------------------------------------------------------------
-# Organisations
-#
-def org_facility_types(row):
-    """
-        The Types of the Facility
-        - required since we can't have a component within an Inline Component
-        UNUSED
-    """
-
-    if hasattr(row, "org_facility"):
-        row = row.org_facility
-    try:
-        site_id = row.site_id
-    except:
-        # not available
-        return current.messages["NONE"]
-
-    s3db = current.s3db
-    table = s3db.org_facility_type
-    ltable = s3db.org_site_facility_type
-    query = (ltable.site_id == site_id) & \
-            (ltable.facility_type_id == table.id)
-    rows = current.db(query).select(table.name)
-    return ",".join([r.name for r in rows])
-
-# -----------------------------------------------------------------------------
-def org_organisation_postprocess(form):
-    """
-        onaccept for the Custom Form:
-        - replace the name of the Fac with the name of the Org
-    """
-
-    form_vars = form.vars
-    organisation_id = form_vars.get("id", None)
-    name = form_vars.get("name", None)
-    ftable = current.s3db.org_facility
-    current.db(ftable.organisation_id == organisation_id).update(name = name)
-
-# -----------------------------------------------------------------------------
-def customise_org_organisation_controller(**attr):
-
-    # Filter defaults
-    if "summary" in current.request.args:
-        settings.gis.toolbar = False
-        from s3 import s3_set_default_filter
-        s3_set_default_filter("org_group_membership.group_id",
-                              default_coalition_filter,
-                              tablename = "org_organisation")
-
-    # Custom PreP
-    s3 = current.response.s3
-    standard_prep = s3.prep
-
-    def custom_prep(r):
-
-        # Call standard prep
-        if callable(standard_prep):
-            result = standard_prep(r)
-            if not result:
-                return False
-
-        s3db = current.s3db
-        tablename = "org_organisation"
-        table = s3db[tablename]
-
-        method = r.method
-        if method == "validate":
-            # Need to override .requires here too
-            current.s3db.org_facility.location_id.requires = None
-
-        elif method == "profile":
-
-            # Profile page configuration
-            profile_layout = OrganisationProfileLayout()
-            places_widget = dict(label = "Organization's Places",
-                                 label_create = "Add Place",
-                                 type = "datalist",
-                                 tablename = "org_facility",
-                                 context = "organisation",
-                                 list_fields = ["location_id",
-                                                ],
-                                 list_layout = profile_layout,
-                                 )
-
-            s3db.configure(tablename,
-                           profile_cols = 1,
-                           profile_update = "visible",
-                           profile_widgets = [places_widget,
-                                              ],
-                           )
-
-        elif method == "summary" or r.representation == "aadata":
-
-            # Data table configuration
-            list_fields = ["id",
-                           "name",
-                           (T("Coalition Member"), "group_membership.group_id"),
-                           (T("Organization's Places"), "facility.location_id"),
-                           #"facility.location_id$addr_postcode",
-                           (T("Sectors"), "sector_organisation.sector_id"),
-                           (T("Services"), "service_organisation.service_id"),
-                           "phone",
-                           "website",
-                           "comments",
-                           ]
-
-            s3db.configure(tablename,
-                           list_fields = list_fields,
-                           # Hide Open & Delete dataTable action buttons
-                           deletable = False,
-                           editable = False,
-                           )
-
-        if (r.interactive or r.representation == "json") and not r.component:
-
-            # CRUD Strings / Represent
-            s3.crud_strings[tablename].title_update = T("Update Organization")
-            table.logo.readable = table.logo.writable = False
-            table.name.label = T("Organization Name")
-
-            if method in ("summary", "report"):
-
-                # Filter form
-                from s3 import S3OptionsFilter, S3TextFilter, S3HierarchyFilter
-                filter_widgets = [S3TextFilter(["name",
-                                                "group_membership.group_id",
-                                                "sector_organisation.sector_id",
-                                                "service_organisation.service_id",
-                                                "comments"
-                                                ],
-                                                label = T("Search"),
-                                               ),
-                                  S3OptionsFilter("group_membership.group_id",
-                                                  represent = "%(name)s",
-                                                  header = True,
-                                                  ),
-                                  S3OptionsFilter("sector_organisation.sector_id",
-                                                  label = T("Sector"),
-                                                  header = True,
-                                                  ),
-                                  S3HierarchyFilter("service_organisation.service_id",
-                                                    label = T("Service"),
-                                                    header = True,
-                                                    ),
-                                  #S3HierarchyFilter("organisation_organisation_type.organisation_type_id",
-                                  #                  label = T("Type of Organization"),
-                                  #                  #multiple = False,
-                                  #                  )
-                                  ]
-
-                s3.crud_strings.org_organisation.title_report = T("Organization Matrix")
-
-                # Report Options
-                report_fields = [# Only 1 Axis so use singular name
-                                 #"name",
-                                 (T("Coalition Member"), "group_membership.group_id"),
-                                 (T("Sector"), "sector_organisation.sector_id"),
-                                 (T("Service"), "service_organisation.service_id"),
-                                 ]
-
-                report_options = Storage(
-                    rows = report_fields,
-                    cols = [],
-                    fact = [(T("Number of Organizations"), "count(name)")],
-                    defaults = Storage(rows = "sector_organisation.sector_id",
-                                       #cols = "service_organisation.service_id",
-                                       fact = "count(name)",
-                                       totals = True,
-                                       chart = "barchart:rows",
-                                       table = "collapse",
-                                       )
-                    )
-
-                s3db.configure(tablename,
-                               filter_formstyle = filter_formstyle,
-                               filter_widgets = filter_widgets,
-                               report_options = report_options,
-                               # No Map for Organisations
-                               #summary = [s for s in settings.ui.summary if s["name"] != "map"],
-                               )
-
-            # Custom CRUD Form
-            if not current.auth.is_logged_in():
-
-                # Anonymous user creating Org: Keep Simple
-                from s3 import S3SQLCustomForm
-                crud_form = S3SQLCustomForm("name",
-                                            "website",
-                                            "comments",
-                                            )
-                s3db.configure(tablename,
-                               crud_form = crud_form,
-                               )
-
-            elif method in ("read", "create", "update", "summary", "import", "profile"):
-
-                from s3 import S3SQLCustomForm, S3SQLInlineComponent, S3SQLInlineComponentMultiSelectWidget, S3SQLInlineLink
-                form_fields = ["name",
-                               "logo",
-                               S3SQLInlineComponent(
-                                    "group_membership",
-                                    label = T("Coalition Member"),
-                                    fields = [("", "group_id"),
-                                              ("", "status_id"),
-                                              ],
-                                    ),
-                               S3SQLInlineComponentMultiSelectWidget(
-                                    "sector",
-                                    label = T("Sectors"),
-                                    field = "sector_id",
-                                    ),
-                               S3SQLInlineLink(
-                                    "service",
-                                    label = T("Services"),
-                                    field = "service_id",
-                                    leafonly = False,
-                                    widget = "hierarchy",
-                                    ),
-                               S3SQLInlineComponent(
-                                    "resource",
-                                    label = T("Organization's Resources"),
-                                    fields = ["parameter_id",
-                                              "value",
-                                              "comments",
-                                              ],
-                                    ),
-                               "phone",
-                               "website",
-                               S3SQLInlineComponent(
-                                    "contact",
-                                    name = "twitter",
-                                    label = T("Twitter"),
-                                    multiple = False,
-                                    fields = [("", "value")],
-                                    filterby = dict(field = "contact_method",
-                                                    options = "TWITTER"
-                                                    )
-                                    ),
-                               "comments",
-                               ]
-
-                # Allow free-text in Phone
-                table.phone.requires = None
-
-                # Organisation's Resources
-                from s3 import S3MultiSelectWidget
-                s3db.org_resource.parameter_id.widget = S3MultiSelectWidget(multiple=False)
-
-                # Coalition Memberships
-                mtable = s3db.org_group_membership
-                mtable.group_id.widget = S3MultiSelectWidget(multiple=False)
-                #from s3layouts import S3AddResourceLink
-                #mtable.status_id.comment = S3AddResourceLink(c="org",
-                #                                             f="group_membership_status",
-                #                                             vars={"child": "status_id"},
-                #                                             title=T("Add New Status"))
-                mtable.status_id.comment = T("Status of the Organization in the Coalition")
-                mtable.status_id.widget = S3MultiSelectWidget(multiple=False,
-                                                              # NB Has no permissions checks
-                                                              create=dict(c="org",
-                                                                          f="group_membership_status",
-                                                                          label=str(T("Add New Status")),
-                                                                          parent="group_membership",
-                                                                          child="status_id"
-                                                                          ))
-
-                # Organization's Places (create only once profile is ready)
-                #if method in ("create", "summary"):
-                if method != "profile":
-                    form_fields.insert(-1,
-                                       # Not fully ready yet
-                                       S3SQLInlineComponent("facility",
-                                                #label = T("Address"),
-                                                label = T("Organization's Places"),
-                                                fields = [("", "location_id"),
-                                                        ],
-                                                multiple = False,
-                                       ))
-
-                    ftable = s3db.org_facility
-                    ftable.name.default = "TEMP" # replace in form postprocess
-                    field = ftable.location_id
-                    field.label = T("Address")
-                    field.represent = s3db.gis_LocationRepresent(address_only=True)
-                    from s3 import IS_LOCATION, S3LocationSelector
-                    levels = ("L3",)
-                    field.requires = IS_LOCATION()
-                    field.widget = S3LocationSelector(levels=levels,
-                                                      hide_lx=False,
-                                                      reverse_lx=True,
-                                                      show_address=True,
-                                                      show_postcode=True,
-                                                      )
-
-                # Human resource (currently only in read because S3AddPersonWidget
-                # not working inside inline component => consider HRAutoComplete
-                # with AddResourceLink instead?)
-                if r.record and method not in ("update", "profile"):
-
-                    hrtable = s3db.hrm_human_resource
-                    hrtable.person_id.widget = None
-                    hrtable.site_id.label = T("Place")
-
-                    hr_fields = ["person_id",
-                                 "site_id",
-                                 #"job_title_id",
-                                 #"email",
-                                 #"phone",
-                                 ]
-
-                    #if method in ("update", "profile"):
-                    #    # Filter the options for site_id in the organisation
-                    #    # contacts inline component to just the sites of this
-                    #    # organisation
-                    #    from s3 import IS_ONE_OF
-                    #    auth = current.auth
-                    #    realms = auth.permission.permitted_realms("hrm_human_resource",
-                    #                                              method="create")
-                    #    instance_types = auth.org_site_types
-                    #    hrtable.site_id.requires = IS_ONE_OF(current.db, "org_site.site_id",
-                    #                                         label=s3db.org_site_represent,
-                    #                                         orderby="org_site.name",
-                    #                                         filterby="organisation_id",
-                    #                                         filter_opts=(r.id,),
-                    #                                         instance_types=instance_types,
-                    #                                         realms=realms,
-                    #                                         not_filterby="obsolete",
-                    #                                         not_filter_opts=(True,)
-                    #                                         )
-
-                    form_fields.insert(6, S3SQLInlineComponent(
-                        "human_resource",
-                        label = T("Organization's Contacts"),
-                        fields = hr_fields,
-                    ))
-
-                elif r.record:
-                    s3.cancel = r.url(method="read")
-
-                crud_form = S3SQLCustomForm(*form_fields,
-                                            postprocess = org_organisation_postprocess)
-
-                s3db.configure(tablename,
-                               crud_form = crud_form,
-                               )
-
-        return True
-    s3.prep = custom_prep
-
-    # Uncomment this to use the profile page to update organisations:
-    #standard_postp = s3.postp
-    #def custom_postp(r, output):
-    #    # Call standard postp
-    #    if callable(standard_postp):
-    #        output = standard_postp(r, output)
-    #    if r.record and isinstance(output, dict):
-    #        buttons = output.get("buttons")
-    #        if buttons and "edit_btn" in buttons:
-    #            # Override Edit-button (to go to the profile page)
-    #            from s3 import S3CRUD
-    #            buttons["edit_btn"] = S3CRUD.crud_button(
-    #                                        current.messages.UPDATE,
-    #                                        icon="icon-edit",
-    #                                        _href=r.url(method="profile"),
-    #                                        _id="edit-btn",
-    #                                        )
-    #    return output
-    #s3.postp = custom_postp
-
-    # Remove rheader
-    attr["rheader"] = None
-
-    return attr
-
-settings.customise_org_organisation_controller = customise_org_organisation_controller
-
-# -----------------------------------------------------------------------------
-# Coalitions (org_group)
-#
-def customise_org_group_controller(**attr):
-
-    s3 = current.response.s3
-
-    # Custom prep
-    standard_prep = s3.prep
-    def custom_prep(r):
-        # Call standard prep
-        if callable(standard_prep):
-            result = standard_prep(r)
-            if not result:
-                return False
-
-        if r.interactive:
-            from s3 import IS_LOCATION, S3LocationSelector
-            table = current.s3db.org_group
-            table.name.label = T("Coalition Name")
-            field = table.location_id
-            field.label = "" # Gets replaced by widget
-            levels = ("L2",)
-            field.requires = IS_LOCATION()
-            field.widget = S3LocationSelector(levels = levels,
-                                              points = False,
-                                              polygons = True,
-                                              )
-
-        return True
-    s3.prep = custom_prep
-
-    attr["rheader"] = None
-    return attr
-
-settings.customise_org_group_controller = customise_org_group_controller
-
-#-----------------------------------------------------------------------------
-# Places (org_facility)
-#
-def facility_onaccept(form):
-    """
-        Custom onaccept for Imports:
-        * Auto-lookup of Coalition based on LatLon
-    """
-
-    # Check if we already have a Coalition
-    db = current.db
-    s3db = current.s3db
-    site_id = form.vars.site_id
-    ltable = s3db.org_site_org_group
-    exists = db(ltable.site_id == site_id).select(ltable.id, limitby=(0, 1))
-    if not exists:
-        # Have we got a LatLon?
-        location_id = form.vars.location_id
-        if location_id:
-            gtable = db.gis_location
-            location = db(gtable.id == location_id).select(gtable.lat,
-                                                           gtable.lon,
-                                                           limitby=(0, 1)
-                                                           ).first()
-            if location and location.lat is not None \
-                        and location.lon is not None:
-                # Read all the Coalition Polygons
-                ctable = db.org_group
-                query = (ctable.deleted == False) & \
-                        (ctable.location_id == gtable.id)
-                polygons = db(query).select(ctable.id,
-                                            gtable.wkt,
-                                            cache=s3db.cache,
-                                            )
-                match = False
-                from shapely.geometry import point
-                from shapely.wkt import loads as wkt_loads
-                try:
-                    # Enable C-based speedups available from 1.2.10+
-                    from shapely import speedups
-                    speedups.enable()
-                except:
-                    current.log.info("S3GIS",
-                                     "Upgrade Shapely for Performance enhancements")
-                pnt = point.Point(location.lon, location.lat)
-                for p in polygons:
-                    wkt = p[gtable].wkt
-                    if not wkt:
-                        continue
-                    poly = wkt_loads(wkt)
-                    match = pnt.intersects(poly)
-                    if match:
-                        break
-                if match:
-                    group_id = p[ctable].id
-                    ltable.insert(group_id = group_id,
-                                  site_id = site_id,
-                                  )
-                    # Also update the Organisation
-                    stable = db.org_site
-                    site = db(stable.id == site_id).select(stable.organisation_id,
-                                                           limitby = (0, 1)
-                                                           ).first()
-                    if not site:
-                        return
-                    organisation_id = site.organisation_id
-                    ltable = db.org_group_membership
-                    query = (ltable.organisation_id == organisation_id) & \
-                            (ltable.group_id == group_id)
-                    exists = db(query).select(ltable.id,
-                                              limitby=(0, 1))
-                    if not exists:
-                        stable = db.org_group_membership_status
-                        status = db(stable.name == "Located within Coalition").select(stable.id,
-                                                                                      cache = s3db.cache,
-                                                                                      limitby = (0, 1)
-                                                                                      ).first()
-                        if status:
-                            status_id = status.id
-                        else:
-                            # Prepop failed or Status deleted/renamed
-                            status_id = None
-                        ltable.insert(group_id = group_id,
-                                      organisation_id = organisation_id,
-                                      status_id = status_id,
-                                      )
-
-    # Normal onaccept:
-    # Update Affiliation, record ownership and component ownership
-    from s3db.org import S3FacilityModel
-    S3FacilityModel.org_facility_onaccept(form)
-
-# Ensure callback is accessible to CLI Imports as well as those going via Controller
-settings.base.import_callbacks = {"org_facility": {"onaccept": facility_onaccept,
-                                                   },
-                                  }
-
-#-----------------------------------------------------------------------------
-def customise_org_facility_controller(**attr):
-
-    if "summary" in current.request.args:
-        settings.gis.toolbar = False
-        from s3 import s3_set_default_filter
-        s3_set_default_filter("site_org_group.group_id",
-                              default_coalition_filter,
-                              tablename = "org_facility")
-
-    # Custom PreP
-    s3 = current.response.s3
-    standard_prep = s3.prep
-    def custom_prep(r):
-        # Call standard prep
-        if callable(standard_prep):
-            result = standard_prep(r)
-            if not result:
-                return False
-
-        s3db = current.s3db
-        tablename = "org_facility"
-        table = s3db[tablename]
-
-        method = r.method
-        representation = r.representation
-        if method == "summary" or representation == "aadata":
-            # Modify list_fields
-            list_fields = ["name",
-                           (T("Type of Place"), "site_facility_type.facility_type_id"),
-                           "organisation_id",
-                           "site_org_group.group_id",
-                           (T("Address"), "location_id"),
-                           "location_id$addr_postcode",
-                           "contact",
-                           "phone1",
-                           "email",
-                           "comments",
-                           ]
-
-            s3db.configure(tablename,
-                           list_fields = list_fields,
-                           # Override std summary page
-                           summary = settings.ui.summary,
-                           )
-
-        table.location_id.represent = s3db.gis_LocationRepresent(address_only=True)
-        if r.interactive or representation == "json":
-            # CRUD Strings / Represent
-            table.name.label = T("Place Name")
-            table.phone1.label = T("Phone")
-
-            s3.crud_strings[tablename] = Storage(
-                label_create = T("Add Place"),
-                title_display = T("Place Details"),
-                title_list = T("Places"),
-                title_update = T("Update Place"),
-                label_list_button = T("List Places"),
-                label_delete_button = T("Remove Place"),
-                msg_record_created = T("Place added"),
-                msg_record_modified = T("Place updated"),
-                msg_record_deleted = T("Place removed"),
-                msg_list_empty = T("No Places currently recorded"))
-
-            # Custom Form (Read/Create/Update inc embedded Summary)
-            from s3 import S3SQLCustomForm, S3SQLInlineComponent, S3SQLInlineLink
-            if method in ("create", "update", "summary", "import"):
-                # Custom Widgets/Validators
-                from s3 import IS_LOCATION, S3LocationSelector, S3MultiSelectWidget
-
-                # Allow free-text in Phone
-                table.phone1.requires = None
-
-                field = table.location_id
-                field.label = "" # Gets replaced by widget
-                levels = ("L3",)
-                field.requires = IS_LOCATION()
-                field.widget = S3LocationSelector(levels=levels,
-                                                  hide_lx=False,
-                                                  reverse_lx=True,
-                                                  show_address=True,
-                                                  show_postcode=True,
-                                                  )
-
-                table.organisation_id.widget = S3MultiSelectWidget(multiple=False)
-                s3db.org_site_org_group.group_id.widget = S3MultiSelectWidget(multiple=False)
-
-            # Custom Crud Form
-            crud_form = S3SQLCustomForm("name",
-                                        S3SQLInlineLink(
-                                            "facility_type",
-                                            label = T("Type of Place"),
-                                            field = "facility_type_id",
-                                            widget = "hierarchy",
-                                            ),
-                                        "organisation_id",
-                                        S3SQLInlineComponent(
-                                            "site_org_group",
-                                            label = T("Coalition"),
-                                            fields = [("", "group_id")],
-                                            multiple = False,
-                                            ),
-                                        "location_id",
-                                        #S3SQLInlineComponent(
-                                        #    "human_resource",
-                                        #    label = T("Place's Contacts"),
-                                        #    fields = ["person_id",
-                                        #              #"job_title_id",
-                                        #              #"email",
-                                        #              #"phone",
-                                        #              ],
-                                        #),
-                                        # Can't have Components of Components Inline, so just use simple fields
-                                        "contact",
-                                        "phone1",
-                                        "email",
-                                        S3SQLInlineComponent(
-                                            "document",
-                                            name = "file",
-                                            label = T("Files"),
-                                            fields = [("", "file"),
-                                                      #"comments",
-                                                      ],
-                                            ),
-                                        "comments",
-                                        )
-
-            s3db.configure(tablename,
-                           crud_form = crud_form,
-                           )
-
-            if method in ("summary", "report"):
-                from s3 import S3OptionsFilter, S3TextFilter, S3HierarchyFilter
-                filter_widgets = [S3TextFilter(["name",
-                                                "site_org_group.group_id",
-                                                "site_facility_type.facility_type_id",
-                                                "organisation_id",
-                                                "location_id",
-                                                "contact",
-                                                "phone1",
-                                                "email",
-                                                "comments"
-                                                ],
-                                                label = T("Search"),
-                                               ),
-                                  S3OptionsFilter("site_org_group.group_id",
-                                                  represent = "%(name)s",
-                                                  header = True,
-                                                  ),
-                                  S3HierarchyFilter("site_facility_type.facility_type_id",
-                                                    label = T("Type of Place"),
-                                                    ),
-                                  S3OptionsFilter("organisation_id",
-                                                  represent = "%(name)s",
-                                                  header = True,
-                                                  ),
-                                  ]
-
-                report_fields = [#"name",
-                                 (T("Type of Place"), "site_facility_type.facility_type_id"),
-                                 "site_org_group.group_id",
-                                 "location_id$L3",
-                                 "organisation_id",
-                                 ]
-
-                report_options = Storage(
-                    rows = report_fields,
-                    cols = [],
-                    fact = [(T("Number of Places"), "count(name)")],
-                    defaults = Storage(rows = "site_facility_type.facility_type_id",
-                                       #cols = "site_org_group.group_id",
-                                       fact = "count(name)",
-                                       chart = "barchart:rows",
-                                       table = "collapse",
-                                       totals = True,
-                                       )
-                    )
-
-                s3db.configure(tablename,
-                               # Hide Open & Delete dataTable action buttons
-                               editable = False,
-                               deletable = False,
-                               filter_widgets = filter_widgets,
-                               filter_formstyle = filter_formstyle,
-                               report_options = report_options,
-                               )
-
-        elif representation == "plain":
-            # Map Popups
-            table.location_id.label = T("Address")
-            table.location_id.represent = s3db.gis_LocationRepresent(address_only=True)
-            table.organisation_id.comment = ""
-            s3.crud_strings[tablename].title_display = T("Place Details")
-            # Disable Open on Places.
-            # - Not sure why this was done & have now been requested to undo it.
-            #s3db.configure(tablename,
-            #               popup_url = "",
-            #               )
-
-        return True
-    s3.prep = custom_prep
-
-    # Override Custom Map Popup in default PostP
-    s3.postp = None
-
-    # Remove rheader
-    attr["rheader"] = None
-
-    return attr
-
-settings.customise_org_facility_controller = customise_org_facility_controller
-
-# -----------------------------------------------------------------------------
-# People (Stats People)
-#
-def customise_stats_people_controller(**attr):
-
-    if "summary" in current.request.args:
-        settings.gis.toolbar = False
-        from s3 import s3_set_default_filter
-        s3_set_default_filter("people_group.group_id",
-                              default_coalition_filter,
-                              tablename = "stats_people")
-
-    # Custom PreP
-    s3 = current.response.s3
-    standard_prep = s3.prep
-    def custom_prep(r):
-        # Call standard prep
-        if callable(standard_prep):
-            result = standard_prep(r)
-            if not result:
-                return False
-
-        s3db = current.s3db
-        tablename = "stats_people"
-        table = s3db[tablename]
-
-        # Disable name
-        table.name.label = T("Description")
-        #table.name.writable = False
-
-        method = r.method
-        representation = r.representation
-        if method == "summary" or representation == "aadata":
-            # Modify list_fields
-            list_fields = ["id",
-                           "name",
-                           "parameter_id",
-                           "value",
-                           "people_group.group_id",
-                           (T("Address"), "location_id"),
-                           "location_id$addr_postcode",
-                           "person_id",
-                           "comments",
-                           ]
-
-            s3db.configure(tablename,
-                           list_fields = list_fields,
-                           )
-
-        if r.interactive or representation == "json": #or representation == "plain"
-            # CRUD Strings / Represent
-            #table.location_id.represent = s3db.gis_LocationRepresent(address_only=True)
-
-            s3.crud_strings[tablename] = Storage(
-                label_create = T("Add"),
-                title_display = T("People Details"),
-                title_list = T("People"),
-                title_update = T("Update People"),
-                label_list_button = T("List People"),
-                label_delete_button = T("Remove People"),
-                msg_record_created = T("People added"),
-                msg_record_modified = T("People updated"),
-                msg_record_deleted = T("People removed"),
-                msg_list_empty = T("No People currently recorded"))
-
-            # Custom Form (Read/Create/Update inc embedded Summary)
-            from s3 import S3SQLCustomForm, S3SQLInlineComponent
-            if method in ("create", "update", "summary"):
-                # Custom Widgets/Validators
-                from s3 import IS_LOCATION, S3LocationSelector, S3MultiSelectWidget
-
-                table.parameter_id.widget = S3MultiSelectWidget(multiple=False)
-                s3db.stats_people_group.group_id.widget = S3MultiSelectWidget(multiple=False)
-
-                field = table.location_id
-                field.label = "" # Gets replaced by widget
-                levels = ("L3",)
-                field.requires = IS_LOCATION()
-                # Inform S3LocationSelector of the record_id
-                s3.record_id = r.id
-                field.widget = S3LocationSelector(levels = levels,
-                                                  hide_lx = False,
-                                                  polygons = True,
-                                                  color_picker = True,
-                                                  reverse_lx = True,
-                                                  show_postcode = True,
-                                                  #show_map = False,
-                                                  )
-                # L3s only
-                #from s3 import S3Represent, IS_ONE_OF
-                #field.requires = IS_ONE_OF(current.db, "gis_location.id",
-                #                           S3Represent(lookup="gis_location"),
-                #                           sort = True,
-                #                           filterby = "level",
-                #                           filter_opts = ("L3",)
-                #                           )
-                # Don't add new Locations here
-                #field.comment = None
-                # Simple dropdown
-                #field.widget = None
-                #field.label = T("City")
-
-                table.person_id.comment = None
-
-            # Custom Crud Form
-            crud_form = S3SQLCustomForm("name",
-                                        "parameter_id",
-                                        "value",
-                                        S3SQLInlineComponent(
-                                            "people_group",
-                                            label = T("Coalition"),
-                                            fields = [("", "group_id")],
-                                            multiple = False,
-                                            ),
-                                        "location_id",
-                                        "person_id",
-                                        S3SQLInlineComponent(
-                                            "document",
-                                            name = "file",
-                                            label = T("Files"),
-                                            fields = [("", "file"),
-                                                      #"comments",
-                                                      ],
-                                            ),
-                                        "comments",
-                                        postprocess = s3db.gis_style_postprocess,
-                                        )
-
-            s3db.configure(tablename,
-                           crud_form = crud_form,
-                           )
-
-            if method in ("summary", "report"):
-                from s3 import S3OptionsFilter, S3TextFilter
-                filter_widgets = [S3TextFilter(["name",
-                                                "people_group.group_id",
-                                                "parameter_id",
-                                                "organisation_id",
-                                                "location_id",
-                                                "person_id",
-                                                "comments"
-                                                ],
-                                                label = T("Search"),
-                                               ),
-                                  S3OptionsFilter("people_group.group_id",
-                                                  represent = "%(name)s",
-                                                  header = True,
-                                                  ),
-                                  S3OptionsFilter("parameter_id",
-                                                  label = T("Type of People"),
-                                                  header = True,
-                                                  ),
-                                  ]
-
-                report_fields = [#"name",
-                                 "parameter_id",
-                                 "people_group.group_id",
-                                 "location_id$L3",
-                                 ]
-
-                report_options = Storage(
-                    rows=report_fields,
-                    cols=[],
-                    fact=[(T("Groups of People"), "count(id)"),
-                          (T("Number of People"), "sum(value)"),
-                          ],
-                    defaults=Storage(# Only 1 Parameter currently!
-                                     #rows="people.parameter_id",
-                                     rows="people_group.group_id",
-                                     #cols="people_group.group_id",
-                                     fact="sum(value)",
-                                     totals=True,
-                                     chart = "barchart:rows",
-                                     table = "collapse",
-                                     )
-                    )
-
-                s3db.configure(tablename,
-                               # Hide Open & Delete dataTable action buttons
-                               editable = False,
-                               deletable = False,
-                               filter_widgets = filter_widgets,
-                               filter_formstyle = filter_formstyle,
-                               report_options = report_options,
-                               # No Map for People
-                               #summary = [s for s in settings.ui.summary if s["name"] != "map"],
-                               )
-
-            elif r.representation == "plain":
-                # Map Popups
-                table.location_id.label = T("Address")
-
-        return True
-    s3.prep = custom_prep
-
-    return attr
-
-settings.customise_stats_people_controller = customise_stats_people_controller
-
-# -----------------------------------------------------------------------------
-# Evacuation Routes
-#
-def customise_vulnerability_evac_route_controller(**attr):
-
-    if "summary" in current.request.args:
-        settings.gis.toolbar = False
-        from s3 import s3_set_default_filter
-        s3_set_default_filter("evac_route_group.group_id",
-                              default_coalition_filter,
-                              tablename = "vulnerability_evac_route")
-
-    # Custom PreP
-    s3 = current.response.s3
-    standard_prep = s3.prep
-    def custom_prep(r):
-        # Call standard prep
-        if callable(standard_prep):
-            result = standard_prep(r)
-            if not result:
-                return False
-
-        s3db = current.s3db
-        tablename = "vulnerability_evac_route"
-        table = s3db[tablename]
-
-        method = r.method
-        representation = r.representation
-        if method == "summary" or representation == "aadata":
-            # Modify list_fields
-            list_fields = ["id",
-                           "name",
-                           #(T("Hazard Type"), "hazard_id"),
-                           "evac_route_group.group_id",
-                           #"location_id",
-                           "comments",
-                           ]
-
-            s3db.configure(tablename,
-                           list_fields = list_fields,
-                           )
-
-        if r.interactive or representation == "json" or representation == "plain":
-            # CRUD Strings / Represent
-            s3.crud_strings[tablename].title_update = T("Update Evacuation Route")
-
-            table.name.label = T("Description")
-            table.location_id.readable = False
-
-            # Custom Form (Read/Create/Update inc embedded summary)
-            from s3 import S3SQLCustomForm, S3SQLInlineComponent
-            if method in ("create", "update", "summary"):
-                # Custom Widgets/Validators
-                #from s3layouts import S3AddResourceLink
-                from s3 import IS_LOCATION, S3LocationSelector, S3MultiSelectWidget
-
-                s3db.vulnerability_evac_route_group.group_id.widget = S3MultiSelectWidget(multiple=False)
-
-                table.location_id.label = "" # Gets replaced by widget
-                levels = ("L3",)
-                table.location_id.requires = IS_LOCATION()
-                table.location_id.widget = S3LocationSelector(levels=levels,
-                                                              lines=True,
-                                                              )
-
-                #table.hazard_id.comment = S3AddResourceLink(c="vulnerability",
-                #                                            f="hazard",
-                #                                            title=T("Add Hazard Type"))
-
-            # Custom Crud Form
-            crud_form = S3SQLCustomForm(
-                "name",
-                #"hazard_id",
-                S3SQLInlineComponent(
-                    "evac_route_group",
-                    label = T("Coalition"),
-                    fields = [("", "group_id")],
-                    multiple = False,
-                ),
-                "location_id",
-                S3SQLInlineComponent(
-                    "document",
-                    name = "file",
-                    label = T("Files"),
-                    fields = [("", "file"),
-                              #"comments",
-                              ],
-                ),
-                "comments",
-            )
-
-            s3db.configure(tablename,
-                           crud_form = crud_form,
-                           )
-
-            if method in ("summary", "report"):
-                from s3 import S3OptionsFilter, S3TextFilter
-                filter_widgets = [S3TextFilter(["name",
-                                                "evac_route_group.group_id",
-                                                "location_id",
-                                                "comments"
-                                                ],
-                                                label = T("Search"),
-                                               ),
-                                  S3OptionsFilter("evac_route_group.group_id",
-                                                  represent = "%(name)s",
-                                                  header = True,
-                                                  ),
-                                  #S3OptionsFilter("hazard_id",
-                                  #                label = T("Hazard Type"),
-                                  #                header = True,
-                                  #                ),
-                                  ]
-
-                report_fields = [#"name",
-                                 #(T("Hazard Type"),"hazard_id"),
-                                 "evac_route_group.group_id",
-                                 "location_id$L3",
-                                 ]
-
-                report_options = Storage(
-                    rows=report_fields,
-                    cols=[],
-                    fact=[(T("Number of Evacuation Routes"), "count(name)")],
-                    defaults=Storage(rows="evac_route_group.group_id",
-                                     #cols="evac_route.hazard_id",
-                                     fact="count(name)",
-                                     totals=True,
-                                     chart = "barchart:rows",
-                                     table = "collapse",
-                                     )
-                    )
-
-                s3db.configure(tablename,
-                               # Hide Open & Delete dataTable action buttons
-                               editable = False,
-                               deletable = False,
-                               filter_widgets = filter_widgets,
-                               filter_formstyle = filter_formstyle,
-                               report_options = report_options,
-                               )
-
-        return True
-    s3.prep = custom_prep
-
-    return attr
-
-settings.customise_vulnerability_evac_route_controller = customise_vulnerability_evac_route_controller
-
-# -----------------------------------------------------------------------------
-# Hazards (vulnerability_risk)
-#
-def customise_vulnerability_risk_controller(**attr):
-
-    if "summary" in current.request.args:
-        settings.gis.toolbar = False
-        from s3 import s3_set_default_filter
-        s3_set_default_filter("risk_group.group_id",
-                              default_coalition_filter,
-                              tablename = "vulnerability_risk")
-
-    # Custom PreP
-    s3 = current.response.s3
-    standard_prep = s3.prep
-    def custom_prep(r):
-        # Call standard prep
-        if callable(standard_prep):
-            result = standard_prep(r)
-            if not result:
-                return False
-
-        s3db = current.s3db
-        tablename = "vulnerability_risk"
-        table = s3db[tablename]
-
-        method = r.method
-        representation = r.representation
-        if method == "summary" or representation == "aadata":
-            # Modify list_fields
-            list_fields = ["id",
-                           "name",
-                           #(T("Hazard Type"), "hazard_id"),
-                           "risk_group.group_id",
-                           (T("Address"), "location_id"),
-                           "location_id$addr_postcode",
-                           "comments",
-                           ]
-
-            s3db.configure(tablename,
-                           list_fields = list_fields,
-                           )
-
-        table.location_id.represent = s3db.gis_LocationRepresent(address_only=True)
-        if r.interactive or representation == "json" or \
-                            representation == "plain":
-            # CRUD Strings / Represent
-            table.name.label = T("Description")
-
-            s3.crud_strings[tablename] = Storage(
-                label_create = T("Add"),
-                title_display = T("Hazard Details"),
-                title_list = T("Hazards"),
-                title_update = T("Update Hazard"),
-                label_list_button = T("List Hazards"),
-                label_delete_button = T("Remove Hazard"),
-                msg_record_created = T("Hazard added"),
-                msg_record_modified = T("Hazard updated"),
-                msg_record_deleted = T("Hazard removed"),
-                msg_list_empty = T("No Hazards currently recorded"))
-
-            # Custom Form (Read/Create/Update inc embedded summary)
-            from s3 import S3SQLCustomForm, S3SQLInlineComponent
-            if method in ("create", "update", "summary"):
-                # Custom Widgets/Validators
-                from s3 import IS_LOCATION, S3LocationSelector, S3MultiSelectWidget
-
-                s3db.vulnerability_risk_group.group_id.widget = S3MultiSelectWidget(multiple=False)
-
-                field = table.location_id
-                field.label = "" # Gets replaced by widget
-                levels = ("L3",)
-                field.requires = IS_LOCATION()
-                # Inform S3LocationSelector of the record_id
-                s3.record_id = r.id
-                field.widget = S3LocationSelector(levels = levels,
-                                                  hide_lx = False,
-                                                  reverse_lx = True,
-                                                  #points = False,
-                                                  polygons = True,
-                                                  color_picker = True,
-                                                  show_address = True,
-                                                  show_postcode = True,
-                                                  )
-
-            # Custom Crud Form
-            crud_form = S3SQLCustomForm("name",
-                                        #"hazard_id",
-                                        S3SQLInlineComponent(
-                                            "risk_group",
-                                            label = T("Coalition"),
-                                            fields = [("", "group_id")],
-                                            multiple = False,
-                                            ),
-                                        "location_id",
-                                        S3SQLInlineComponent(
-                                            "document",
-                                            name = "file",
-                                            label = T("Files"),
-                                            fields = [("", "file"),
-                                                      #"comments",
-                                                      ],
-                                            ),
-                                        "comments",
-                                        postprocess = s3db.gis_style_postprocess,
-                                        )
-
-            s3db.configure(tablename,
-                           crud_form = crud_form,
-                           )
-
-            if method in ("summary", "report"):
-                # Not needed now that Risk data is moved to WMS
-                # Filter out data not associated with any Coalition
-                #from s3 import FS
-                #group_filter = (FS("group.id") != None)
-                #r.resource.add_filter(group_filter)
-
-                from s3 import S3OptionsFilter, S3TextFilter
-                filter_widgets = [S3TextFilter(["name",
-                                                "risk_group.group_id",
-                                                "location_id",
-                                                "comments"
-                                                ],
-                                                label = T("Search"),
-                                               ),
-                                  S3OptionsFilter("risk_group.group_id",
-                                                  represent = "%(name)s",
-                                                  header = True,
-                                                  ),
-                                  #S3OptionsFilter("hazard_id",
-                                  #                label = T("Hazard Type"),
-                                  #                header = True,
-                                  #                ),
-                                  ]
-
-                report_fields = [#"name",
-                                 #(T("Hazard Type"),"hazard_id"),
-                                 "risk_group.group_id",
-                                 "location_id$L3",
-                                 ]
-
-                report_options = Storage(
-                    rows = report_fields,
-                    cols = [],
-                    fact = [(T("Number of Hazards"), "count(name)")],
-                    defaults = Storage(rows = "risk_group.group_id",
-                                       #cols = "risk.hazard_id",
-                                       fact = "count(name)",
-                                       totals = True,
-                                       chart = "barchart:rows",
-                                       table = "collapse",
-                                       )
-                    )
-
-                s3db.configure(tablename,
-                               # Hide Open & Delete dataTable action buttons
-                               deletable = False,
-                               editable = False,
-                               filter_formstyle = filter_formstyle,
-                               filter_widgets = filter_widgets,
-                               report_options = report_options,
-                               )
-
-        # Not needed now that Risk data is moved to WMS
-        #elif r.representation== "geojson":
-        #    layer = current.request.get_vars.get("layer", None)
-        #    if not layer:
-        #        # Filter out data not associated with any Coalition
-        #        from s3 import FS
-        #        group_filter = (FS("group.id") != None)
-        #        r.resource.add_filter(group_filter)
-
-        return True
-    s3.prep = custom_prep
-
-    attr["rheader"] = None
-
-    return attr
-
-settings.customise_vulnerability_risk_controller = customise_vulnerability_risk_controller
-
-# -----------------------------------------------------------------------------
-# Saved Maps
-#
-def customise_gis_config_controller(**attr):
-
-    # Custom PreP
-    s3 = current.response.s3
-    standard_prep = s3.prep
-    def custom_prep(r):
-        # Call standard prep
-        if callable(standard_prep):
-            result = standard_prep(r)
-            if not result:
-                return False
-
-        if r.interactive:
-            auth = current.auth
-            coalition = auth.user.org_group_id
-            if not coalition:
-                return True
-
-            db = current.db
-            s3db = current.s3db
-            utable = db.auth_user
-            ltable = s3db.pr_person_user
-            table = s3db.gis_config
-            query = (table.deleted == False) & \
-                    (table.pe_id == ltable.pe_id) & \
-                    (ltable.user_id == utable.id) & \
-                    (utable.org_group_id == coalition)
-            rows = db(query).select(ltable.pe_id,
-                                    distinct=True)
-            if rows:
-                coalition_pe_ids = ",".join([str(row.pe_id) for row in rows])
-                from s3 import S3OptionsFilter
-                filter_widgets = [
-                    S3OptionsFilter("pe_id",
-                                    label = "",
-                                    options = {"*": T("All"),
-                                               coalition_pe_ids: T("My Coalition's Maps"),
-                                               auth.user.pe_id: T("My Maps"),
-                                               },
-                                    cols = 3,
-                                    multiple = False,
-                                    )
-                    ]
-                s3db.configure("gis_config",
-                               filter_widgets = filter_widgets,
-                               )
-
-        return True
-    s3.prep = custom_prep
-
-    return attr
-
-settings.customise_gis_config_controller = customise_gis_config_controller
-
-# -----------------------------------------------------------------------------
-# Site Activity Log
-#
-class ActivityLogLayout(S3DataListLayout):
-
-    item_class = ""
-
-    # -------------------------------------------------------------------------
-    def __init__(self):
-        """ Constructor """
-
-        super(ActivityLogLayout, self).__init__()
-
-        self.names = {}
-        self.authors = {}
-
-    # ---------------------------------------------------------------------
-    def prep(self, resource, records):
-
-        # Lookup "name" field for each record if table != pr_filter
-        names = {}
-        authors = {}
-        for record in records:
-            raw = record._row
-            tablename = raw["s3_audit.tablename"]
-            if tablename == "pr_filter":
-                continue
-            if tablename not in names:
-                names[tablename] = {}
-            names[tablename][raw["s3_audit.record_id"]] = ""
-            authors[raw["s3_audit.user_id"]] = (None, None)
-
-        db = current.db
-        s3db = current.s3db
-        for tablename, records in names.items():
-            table = s3db[tablename]
-            if "name" not in table.fields:
-                continue
-            query = table._id.belongs(records)
-            rows = db(query).select(table._id, table.name)
-            for row in rows:
-                names[tablename][row[table._id]] = row[table.name]
-
-        # Lookup avatars and person_id for each author_id
-        ptable = s3db.pr_person
-        ltable = db.pr_person_user
-        query = (ltable.user_id.belongs(authors.keys())) & \
-                (ltable.pe_id == ptable.pe_id)
-        rows = db(query).select(ltable.user_id, ptable.id)
-
-        for row in rows:
-            user_id = row[ltable.user_id]
-            avatar = s3_avatar_represent(user_id,
-                                         _class="media-object",
-                                         # @ToDo: Move to CSS
-                                         _style="width:50px;padding:5px;padding-top:0px;")
-            person_id = row[ptable.id]
-            if person_id:
-                person_url = URL(c="pr", f="person", args=[person_id])
-            else:
-                person_url = "#"
-            authors[user_id] = (avatar, person_url)
-
-        self.authors = authors
-        self.names = names
-        return
-
-    # ---------------------------------------------------------------------
-    def activity_label(self, tablename, method):
-        """
-            Get a label for the activity
-
-            @param tablename: the tablename
-            @param method: the method ("create" or "update")
-        """
-
-        T = current.T
-
-        activity = None
-        if tablename == "pr_filter":
-            if method == "create":
-                activity = T("Saved a Filter")
-            elif method == "update":
-                activity = T("Updated a Filter")
-        elif tablename == "gis_config":
-            if method == "create":
-                activity = T("Saved a Map")
-            elif method == "update":
-                activity = T("Updated a Map")
-        elif tablename == "org_facility":
-            if method == "create":
-                activity = T("Added a Place")
-            elif method == "update":
-                activity = T("Edited a Place")
-        elif tablename == "org_organisation":
-            if method == "create":
-                activity = T("Added an Organization")
-            elif method == "update":
-                activity = T("Edited an Organization")
-        elif tablename == "project_activity":
-            if method == "create":
-                activity = T("Added an Activity")
-            elif method == "update":
-                activity = T("Edited an Activity")
-        elif tablename == "stats_people":
-            if method == "create":
-                activity = T("Added People")
-            elif method == "update":
-                activity = T("Edited People")
-        elif tablename == "vulnerability_evac_route":
-            if method == "create":
-                activity = T("Added an Evacuation Route")
-            elif method == "update":
-                activity = T("Edited an Evacuation Route")
-        elif tablename == "vulnerability_risk":
-            if method == "create":
-                activity = T("Added a Hazard")
-            elif method == "update":
-                activity = T("Edited a Hazard")
-        return activity
-
-    # ---------------------------------------------------------------------
-    def render_body(self, list_id, item_id, resource, rfields, record):
-        """
-            Render the card body
-
-            @param list_id: the HTML ID of the list
-            @param item_id: the HTML ID of the item
-            @param resource: the S3Resource to render
-            @param rfields: the S3ResourceFields to render
-            @param record: the record as dict
-        """
-
-        raw = record._row
-        author = record["s3_audit.user_id"]
-        timestmp = record["s3_audit.timestmp"]
-        author_id = raw["s3_audit.user_id"]
-        method = raw["s3_audit.method"]
-        tablename = raw["s3_audit.tablename"]
-        record_id = raw["s3_audit.record_id"]
-
-        T = current.T
-
-        if tablename == "pr_filter":
-            label = T("Saved Filters")
-            url = URL(c="default", f="index", args=["filters"])
-        elif tablename == "gis_config":
-            label = self.names[tablename][record_id]
-            url = URL(c="gis", f="index", vars={"config": record_id})
-        else:
-            label = self.names[tablename][record_id]
-            c, f = tablename.split("_", 1)
-            url = URL(c=c, f=f, args=[record_id, "read"])
-
-        body = P(self.activity_label(tablename, method),
-                 BR(),
-                 A(label, _href=url),
-                 )
-
-        avatar, person_url = self.authors[author_id]
-        author = A(author, _href=person_url)
-        avatar = A(avatar, _href=person_url, _class="pull-left")
-
-        # Render the item
-        item = DIV(avatar,
-                   DIV(H5(author,
-                          _class="media-heading",
-                          ),
-                       P(timestmp, _class="activity-timestmp"),
-                       body,
-                       _class="media-body",
-                       ),
-                   _class="media",
-                   )
-
-        return item
-
-# For access from custom controllers (e.g. homepage)
-current.response.s3.render_log = ActivityLogLayout()
-
-# -----------------------------------------------------------------------------
-def customise_s3_audit_controller(**attr):
-
-    from s3 import s3_auth_user_represent_name, FS, S3OptionsFilter, S3DateFilter
-    current.db.s3_audit.user_id.represent = s3_auth_user_represent_name
-
-    T = current.T
-    tablename = "s3_audit"
-
-    s3 = current.response.s3
-    s3.filter = (FS("~.method") != "delete")
-    s3.crud_strings[tablename] = {
-        "title_list": T("Activity Log"),
-    }
-
-    USER = T("User")
-    filter_widgets = [S3OptionsFilter("user_id",
-                                      label = USER,
-                                      ),
-                      S3OptionsFilter("tablename"),
-                      S3OptionsFilter("method"),
-                      S3DateFilter("timestmp",
-                                   label = None,
-                                   hide_time = True,
-                                   input_labels = {"ge": "From", "le": "To"},
-                                   ),
-                      ]
-
-    report_fields = ["tablename", "method", (USER, "user_id")]
-    report_options = Storage(
-            rows = report_fields,
-            cols = report_fields,
-            fact = [(T("Number of Records"), "count(id)"),
-                    (T("Number of Tables"), "count(tablename)"),
-                    ],
-            defaults = Storage(rows = "tablename",
-                               cols = "method",
-                               fact = "count(id)",
-                               chart = "breakdown:rows",
-                               table = "collapse",
-                               totals = True,
-                               )
-                )
-    current.s3db.configure(tablename,
-                           filter_widgets = filter_widgets,
-                           filter_formstyle = filter_formstyle,
-                           insertable = False,
-                           list_fields = ["id",
-                                          (T("Date/Time"), "timestmp"),
-                                          (T("User"), "user_id"),
-                                          "method",
-                                          "tablename",
-                                          (T("Record ID"), "record_id"),
-                                          ],
-                           list_layout = s3.render_log,
-                           orderby = "s3_audit.timestmp desc",
-                           report_options = report_options,
-                           summary = [{"name": "table",
-                                       "label": "Table",
-                                       "widgets": [{"method": "datatable"}]
-                                       },
-                                      {"name": "charts",
-                                       "label": "Charts",
-                                       "widgets": [{"method": "report", "ajax_init": True}]
-                                       },
-                                      ],
-                           )
-
-    return attr
-
-settings.customise_s3_audit_controller = customise_s3_audit_controller
-
-# =============================================================================
-class OrganisationProfileLayout(S3DataListLayout):
-    """ DataList layout for Organisation Profile """
-
-    # -------------------------------------------------------------------------
-    def __init__(self, profile="org_organisation"):
-        """ Constructor """
-
-        super(OrganisationProfileLayout, self).__init__(profile=profile)
-
-    # -------------------------------------------------------------------------
-    def render_header(self, list_id, item_id, resource, rfields, record):
-        """
-            Render the card header
-
-            @param list_id: the HTML ID of the list
-            @param item_id: the HTML ID of the item
-            @param resource: the S3Resource to render
-            @param rfields: the S3ResourceFields to render
-            @param record: the record as dict
-        """
-
-        toolbox = self.render_toolbox(list_id, resource, record)
-
-        tablename = resource.tablename
-        if tablename == "org_facility":
-            icon = ICON("globe")
-            title = record["org_facility.location_id"]
-        else:
-            icon = None
-            title = ""
-
-        return DIV(icon,
-                   SPAN(" %s" % title, _class="card-title"),
-                   toolbox,
-                   _class="card-header",
-                   )
-
-    # ---------------------------------------------------------------------
-    def render_body(self, list_id, item_id, resource, rfields, record):
-        """
-            Render the card body
-
-            @param list_id: the HTML ID of the list
-            @param item_id: the HTML ID of the item
-            @param resource: the S3Resource to render
-            @param rfields: the S3ResourceFields to render
-            @param record: the record as dict
-        """
-
-        # No body in this layout so far (org_facility is header-only)
-        return None
-
-    # -------------------------------------------------------------------------
-    def render_toolbox(self, list_id, resource, record):
-        """
-            Render the toolbox
-
-            @param list_id: the HTML ID of the list
-            @param resource: the S3Resource to render
-            @param record: the record as dict
-        """
-
-        table = resource.table
-        tablename = resource.tablename
-        record_id = record[str(resource._id)]
-
-        open_url = update_url = None
-        if tablename == "org_facility":
-            update_url = URL(f="facility",
-                             args=[record_id, "update.popup"],
-                             vars={"refresh": list_id,
-                                   "record": record_id,
-                                   "profile": self.profile,
-                                   },
-                             )
-
-        has_permission = current.auth.s3_has_permission
-
-        from s3 import S3Method
-        crud_string = S3Method.crud_string
-
-        toolbox = DIV(_class="edit-bar fright")
-
-        if update_url and \
-           has_permission("update", table,
-                          record_id=record_id, c="org", f="facility"):
-            btn = A(ICON("edit"), #(" ", _class="icon icon-edit"),
-                    _href=update_url,
-                    _class="s3_modal",
-                    _title=crud_string(tablename, "title_update"))
-            toolbox.append(btn)
-
-        elif open_url:
-            btn = A(ICON("file-alt"), #(" ", _class="icon icon-file-alt"),
-                    _href=open_url,
-                    _title=crud_string(tablename, "title_display"))
-            toolbox.append(btn)
-
-        if has_permission("delete", table,
-                          record_id=record_id, c="org", f="facility"):
-            btn = A(ICON("delete"), #(" ", _class="icon icon-trash"),
-                    _class="dl-item-delete",
-                    _title=crud_string(tablename, "label_delete_button"))
-            toolbox.append(btn)
-
-        return toolbox
-
-# =============================================================================
-# Template Modules
-# Comment/uncomment modules here to disable/enable them
-settings.modules = OrderedDict([
-    # Core modules which shouldn't be disabled
-    ("default", Storage(
-        name_nice = T("Home"),
-        restricted = False, # Use ACLs to control access to this module
-        access = None,      # All Users (inc Anonymous) can see this module in the default menu & access the controller
-        module_type = None  # This item is not shown in the menu
-    )),
-    ("admin", Storage(
-        name_nice = T("Administration"),
-        #description = "Site Administration",
-        restricted = True,
-        access = "|1|",     # Only Administrators can see this module in the default menu & access the controller
-        module_type = None  # This item is handled separately for the menu
-    )),
-    ("appadmin", Storage(
-        name_nice = T("Administration"),
-        #description = "Site Administration",
-        restricted = True,
-        module_type = None  # No Menu
-    )),
-    ("errors", Storage(
-        name_nice = T("Ticket Viewer"),
-        #description = "Needed for Breadcrumbs",
-        restricted = False,
-        module_type = None  # No Menu
-    )),
-    ("sync", Storage(
-        name_nice = T("Synchronization"),
-        #description = "Synchronization",
-        restricted = True,
-        access = "|1|",     # Only Administrators can see this module in the default menu & access the controller
-        module_type = None  # This item is handled separately for the menu
-    )),
-    ("translate", Storage(
-        name_nice = T("Translation Functionality"),
-        #description = "Selective translation of strings based on module.",
-        module_type = None,
-    )),
-    ("gis", Storage(
-        name_nice = T("Map"),
-        #description = "Situation Awareness & Geospatial Analysis",
-        restricted = True,
-        module_type = 1,     # 1st item in the menu
-    )),
-    ("pr", Storage(
-        name_nice = T("Person Registry"),
-        #description = "Central point to record details on People",
-        restricted = True,
-        access = "|1|",     # Only Administrators can see this module in the default menu (access to controller is possible to all still)
-        module_type = None
-    )),
-    ("org", Storage(
-        name_nice = T("Organizations"),
-        #description = 'Lists "who is doing what & where". Allows relief agencies to coordinate their activities',
-        restricted = True,
-        module_type = None
-    )),
-    # All modules below here should be possible to disable safely
-    ("hrm", Storage(
-        name_nice = T("Staff"),
-        #description = "Human Resources Management",
-        restricted = True,
-        module_type = None,
-    )),
-    ("cms", Storage(
-        name_nice = T("Content Management"),
-        restricted = True,
-        module_type = None,
-    )),
-    ("doc", Storage(
-        name_nice = T("Documents"),
-        #description = "A library of digital resources, such as photos, documents and reports",
-        restricted = True,
-        module_type = None,
-    )),
-    ("msg", Storage(
-        name_nice = T("Messaging"),
-        #description = "Sends & Receives Alerts via Email & SMS",
-        restricted = True,
-        # The user-visible functionality of this module isn't normally required. Rather it's main purpose is to be accessed from other modules.
-        module_type = None,
-    )),
-    #("event", Storage(
-    #    name_nice = T("Events"),
-    #    #description = "Events",
-    #    restricted = True,
-    #    module_type = None
-    #)),
-    ("project", Storage(
-        name_nice = T("Projects"),
-        restricted = True,
-        module_type = None
-    )),
-    ("stats", Storage(
-        name_nice = T("Statistics"),
-        restricted = True,
-        module_type = None
-    )),
-    ("vulnerability", Storage(
-        name_nice = T("Vulnerability"),
-        restricted = True,
-        module_type = None
-    )),
-    #("water", Storage(
-    #    name_nice = T("Water"),
-    #    restricted = True,
-    #    module_type = None
-    #)),
-])
diff --git a/private/templates/CRMT/controllers.py b/private/templates/CRMT/controllers.py
deleted file mode 100644
index 3e88481387..0000000000
--- a/private/templates/CRMT/controllers.py
+++ /dev/null
@@ -1,404 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from urllib import urlencode
-
-try:
-    import json # try stdlib (Python 2.6)
-except ImportError:
-    try:
-        import simplejson as json # try external module
-    except:
-        import gluon.contrib.simplejson as json # fallback to pure-Python module
-
-from gluon import current, URL
-from gluon.html import *
-#from gluon.storage import Storage
-
-from s3 import ICON, S3FilterForm, S3FilterString, S3OptionsFilter, FS, S3URLQuery, S3Summary, s3_auth_user_represent_name, S3CustomController
-
-THEME = "CRMT"
-
-# =============================================================================
-class index(S3CustomController):
-    """ Custom Home Page """
-
-    def __call__(self):
-
-        T = current.T
-        db = current.db
-        s3db = current.s3db
-        request = current.request
-        response = current.response
-        s3 = response.s3
-
-        output = {}
-        output["title"] = response.title = current.deployment_settings.get_system_name()
-
-        # Map
-        auth = current.auth
-        is_logged_in = auth.is_logged_in()
-        callback = None
-        if is_logged_in:
-            # Show the User's Coalition's Polygon
-            org_group_id = auth.user.org_group_id
-            if org_group_id:
-                # Lookup Coalition Name
-                table = s3db.org_group
-                row = db(table.id == org_group_id).select(table.name,
-                                                          limitby=(0, 1)
-                                                          ).first()
-                if row:
-                    callback = '''S3.gis.show_map();
-var layer,layers=S3.gis.maps.default_map.layers;
-for(var i=0,len=layers.length;i<len;i++){
- layer=layers[i];
- if(layer.name=='%s'){layer.setVisibility(true)}}''' % row.name
-        if not callback:
-            # Show all Coalition Polygons
-            callback = '''S3.gis.show_map();
-var layer,layers=S3.gis.maps.default_map.layers;
-for(var i=0,len=layers.length;i<len;i++){
- layer=layers[i];
- if(layer.name=='All Coalitions'){layer.setVisibility(true)}}
-'''
-        gis = current.gis
-        config = gis.get_config()
-        config.zoom = 8
-        map = gis.show_map(width=770,
-                           height=295,
-                           callback=callback,
-                           catalogue_layers=True,
-                           collapsed=True,
-                           save=False,
-                           )
-        output["map"] = map
-
-        # Description of available data
-        from s3db.cms import S3CMS
-        for item in response.menu:
-            item["cms"] = S3CMS.resource_content(module = item["c"], 
-                                                 resource = item["f"])
-
-        # Site Activity Log
-        resource = s3db.resource("s3_audit")
-        resource.add_filter(FS("~.method") != "delete")
-        orderby = "s3_audit.timestmp desc"
-        list_fields = ["id",
-                       "method",
-                       "timestmp",
-                       "user_id",
-                       "tablename",
-                       "record_id",
-                       ]
-        #current.deployment_settings.ui.customise_s3_audit()
-        db.s3_audit.user_id.represent = s3_auth_user_represent_name
-        list_id = "log"
-        datalist, numrows, ids = resource.datalist(fields=list_fields,
-                                                   start=None,
-                                                   limit=4,
-                                                   list_id=list_id,
-                                                   orderby=orderby,
-                                                   layout=s3.render_log)
-
-        # Placeholder
-        filter_form = DIV(_class="filter_form")
-        if numrows == 0:
-            # Empty table or just no match?
-            from s3 import S3CRUD
-            table = resource.table
-            if "deleted" in table:
-                available_records = db(table.deleted != True)
-            else:
-                available_records = db(table._id > 0)
-            if available_records.select(table._id,
-                                        limitby=(0, 1)).first():
-                msg = DIV(S3CRUD.crud_string(resource.tablename,
-                                             "msg_no_match"),
-                          _class="empty")
-            else:
-                msg = DIV(S3CRUD.crud_string(resource.tablename,
-                                             "msg_list_empty"),
-                          _class="empty")
-            data = msg
-        else:
-            # Render the list
-            ajaxurl = URL(c="default", f="audit", args="datalist_f.dl")
-            popup_url = URL(c="default", f="audit", args="datalist.popup")
-            dl = datalist.html(ajaxurl=ajaxurl,
-                               pagesize=4,
-                               popup_url=popup_url,
-                               popup_title=T("Updates"),
-                               )
-            data = dl
-
-            if is_logged_in and org_group_id:
-                # Add a Filter
-                filter_widgets = [S3OptionsFilter("user_id$org_group_id",
-                                                  label = "",
-                                                  # Can't just use "" as this is then omitted from rendering
-                                                  options = {"*": T("All"),
-                                                             org_group_id: T("My Community"),
-                                                             },
-                                                  cols = 2,
-                                                  multiple = False,
-                                                  ),
-                                  ]
-
-                filter_submit_url = URL(c="default", f="index")
-                filter_ajax_url = URL(c="default", f="audit", args=["filter.options"])
-                filter_form = S3FilterForm(filter_widgets,
-                                           filter_manager = False,
-                                           formstyle = filter_formstyle,
-                                           clear = False,
-                                           submit = True,
-                                           ajax = True,
-                                           url = filter_submit_url,
-                                           ajaxurl = filter_ajax_url,
-                                           _class = "filter-form",
-                                           _id = "%s-filter-form" % list_id
-                                           )
-                filter_form = filter_form.html(resource,
-                                               request.get_vars,
-                                               target=list_id,
-                                               )
-
-        output["updates"] = data
-        output["filter_form"] = filter_form
-
-        # Add JavaScript
-        appname = request.application
-        debug = s3.debug
-        scripts_append = s3.scripts.append
-        if debug:
-            # Infinite Scroll doesn't make sense here, but currently required by dataLists.js
-            scripts_append("/%s/static/scripts/jquery.infinitescroll.js" % appname)
-            scripts_append("/%s/static/scripts/jquery.viewport.js" % appname)
-            scripts_append("/%s/static/scripts/S3/s3.dataLists.js" % appname)
-        else:
-            scripts_append("/%s/static/scripts/S3/s3.dataLists.min.js" % appname)
-
-        self._view(THEME, "index.html")
-        return output
-
-# =============================================================================
-def filter_formstyle(row_id, label, widget, comment, hidden=False):
-    """
-        Custom Formstyle for FilterForm
-
-        @param row_id: HTML id for the row
-        @param label: the label
-        @param widget: the form widget
-        @param comment: the comment
-        @param hidden: whether the row should initially be hidden or not
-    """
-
-    if hidden:
-        _class = "advanced hide"
-    else:
-        _class= ""
-
-    if label:
-        return DIV(label, widget, _id=row_id, _class=_class)
-    else:
-        return DIV(widget, _id=row_id, _class=_class)
-
-# =============================================================================
-class filters(S3CustomController):
-    """ Custom controller to manage saved filters """
-
-    def __call__(self):
-        """ Main entry point """
-
-        # Authorization (user must be logged in)
-        auth = current.auth
-        permissions = auth.permission
-        if not auth.user:
-            permissions.fail()
-
-        fmt = permissions.format
-
-        if current.request.env.request_method == "POST" and fmt != "dl":
-            return self.update()
-
-        pe_id = auth.user.pe_id
-        s3 = current.response.s3
-
-        # Filter
-        f = FS("pe_id") == pe_id
-        s3.filter = f
-
-        # List Fields
-        current.s3db.configure("pr_filter",
-                               list_fields = ["title",
-                                              "resource",
-                                              "url",
-                                              "query"],
-                               list_layout = self.render_filter,
-                               orderby = "resource")
-
-        # Page length
-        s3.dl_pagelength = 10
-
-        # Data list
-        current.request.args = ["datalist.%s" % fmt]
-        output = current.rest_controller("pr", "filter",
-                                         list_ajaxurl = URL(f="index",
-                                                            args="filters.dl"))
-
-        # Title and view
-        T = current.T
-        if fmt != "dl":
-            output["title"] = T("Saved Filters")
-            self._view(THEME, "filters.html")
-
-        # Script for inline-editing of filter title
-        options = {"cssclass": "jeditable-input",
-                   "tooltip": str(T("Click to edit"))}
-        script = '''$('.jeditable').editable('%s',%s)''' % \
-                 (URL(args="filters"), json.dumps(options))
-        s3.jquery_ready.append(script)
-        return output
-
-    # -------------------------------------------------------------------------
-    @classmethod
-    def render_filter(cls, list_id, item_id, resource, rfields, record):
-        """
-            Custom dataList item renderer for 'Saved Filters'
-
-            @param list_id: the HTML ID of the list
-            @param item_id: the HTML ID of the item
-            @param resource: the S3Resource to render
-            @param rfields: the S3ResourceFields to render
-            @param record: the record as dict
-        """
-
-        record_id = record["pr_filter.id"]
-        item_class = "thumbnail"
-
-        raw = record._row
-        resource_name = raw["pr_filter.resource"]
-        resource = current.s3db.resource(resource_name)
-
-        T = current.T
-
-        # Resource title
-        crud_strings = current.response.s3.crud_strings.get(resource.tablename)
-        if crud_strings:
-            resource_name = crud_strings.title_list
-        else:
-            resource_name = string.capwords(resource.name, "_")
-
-        # Filter title
-        title = record["pr_filter.title"]
-
-        # Filter Query and Summary URLs
-        fstring = S3FilterString(resource, raw["pr_filter.query"])
-        query = fstring.represent()
-        links = cls.summary_urls(resource,
-                                 raw["pr_filter.url"],
-                                 fstring.get_vars)
-
-        actions = []
-        if links:
-            if "map" in links:
-                actions.append(A(ICON("globe"),
-                                 _title=T("Open Map"),
-                                 _href=links["map"]))
-            if "table" in links:
-                actions.append(A(ICON("list"),
-                                 _title=T("Open Table"),
-                                 _href=links["table"]))
-            if "chart" in links:
-                actions.append(A(ICON("list"),
-                                 _title=T("Open Chart"),
-                                 _href=links["chart"]))
-
-        # Render the item
-        item = DIV(DIV(DIV(actions,
-                           _class="action-bar fleft"),
-                       SPAN(T("%(resource)s Filter") % \
-                            dict(resource=resource_name),
-                            _class="card-title"),
-                        DIV(A(ICON("delete"),
-                              _title=T("Delete this Filter"),
-                              _class="dl-item-delete"),
-                            _class="edit-bar fright"),
-                       _class="card-header"),
-                   DIV(DIV(H5(title,
-                              _id="filter-title-%s" % record_id,
-                              _class="media-heading jeditable"),
-                           DIV(query),
-                           _class="media-body"),
-                       _class="media"),
-                   _class=item_class,
-                   _id=item_id)
-
-        return item
-
-    # -------------------------------------------------------------------------
-    def update(self):
-        """ Simple ajax method to update a saved filter title """
-
-        post_vars = current.request.post_vars
-
-        record_id = post_vars["id"].rsplit("-", 1)[-1]
-        new_title = post_vars["value"]
-
-        if new_title:
-            ftable = current.s3db.pr_filter
-            success = current.db(ftable.id==record_id) \
-                             .update(title=new_title)
-        else:
-            success = False
-
-        if success:
-            return new_title
-        else:
-            raise HTTP(400)
-
-    # -------------------------------------------------------------------------
-    @staticmethod
-    def summary_urls(resource, url, filters):
-        """
-            Construct the summary tabs URLs for a saved filter.
-
-            @param resource: the S3Resource
-            @param url: the filter page URL
-            @param filters: the filter GET vars
-        """
-
-        links = {}
-
-        if not url:
-            return links
-
-        get_vars = S3URLQuery.parse_url(url)
-        get_vars.pop("t", None)
-        get_vars.pop("w", None)
-        get_vars.update(filters)
-
-        list_vars = []
-        for (k, v) in get_vars.items():
-            if v is None:
-                continue
-            values = v if type(v) is list else [v]
-            for value in values:
-                if value is not None:
-                    list_vars.append((k, value))
-        base_url = url.split("?", 1)[0]
-
-        summary_config = S3Summary._get_config(resource)
-        tab_idx = 0
-        for section in summary_config:
-
-            if section.get("common"):
-                continue
-            section_id = section["name"]
-
-            tab_vars = list_vars + [("t", str(tab_idx))]
-            links[section["name"]] = "%s?%s" % (base_url, urlencode(tab_vars))
-            tab_idx += 1
-
-        return links
-
-# END =========================================================================
diff --git a/private/templates/CRMT/css.cfg b/private/templates/CRMT/css.cfg
deleted file mode 100644
index 63bda44f04..0000000000
--- a/private/templates/CRMT/css.cfg
+++ /dev/null
@@ -1,45 +0,0 @@
-../themes/default/footer.css
-../themes/bootstrap/menu_top.css
-../themes/default/widgets.css
-../themes/default/shortcut.css
-../themes/bootstrap/layout.css
-plugins/jquery.cluetip.css
-plugins/jquery.dataTables.css
-#plugins/jquery.dataTables.responsive.css
-ui/core.css
-#ui/accordion.css
-ui/autocomplete.css
-ui/button.css
-ui/datepicker.css
-ui/dialog.css
-#ui/draggable.css
-ui/menu.css
-#ui/progressbar.css
-ui/resizable.css
-ui/selectmenu.css
-ui/slider.css
-#ui/sortable.css
-#ui/spinner.css
-ui/tabs.css
-#ui/tooltip.css
-ui/fgtimepicker.css
-ui/multiselect.css
-ui/timepicker-addon.css
-bootstrap/jquery-ui-1.10.3.custom.css
-../themes/bootstrap/icons.css
-../themes/bootstrap/style.css
-../themes/bootstrap/cards.css
-../themes/bootstrap/filter.css
-../themes/bootstrap/profile.css
-gis/style.css
-../themes/default/gis.css
-../themes/bootstrap/map.css
-../themes/default/mobile.css
-../themes/default/print.css
-../themes/default/report.css
-d3/nv.d3.css
-../themes/CRMT/menu.css
-../themes/CRMT/gis.css
-../themes/CRMT/style.css
-../themes/CRMT/homepage.css
-# Final line required for parsing
diff --git a/private/templates/CRMT/facility.csv b/private/templates/CRMT/facility.csv
deleted file mode 100644
index db832dbd62..0000000000
--- a/private/templates/CRMT/facility.csv
+++ /dev/null
@@ -1,107 +0,0 @@
-Name,Organisation,Type,Country,Address,Postcode,L1,L2,L3,L4,Lat,Lon,Phone1,Phone2
-California Southern Baptist Convention,California Southern Baptist Convention Disaster Relief,Church,US,678 East Shaw Ave,93710,California,Fresno County,Fresno,,36.808787,-119.774975,(559) 229-9533,
-Guadalupe Community Center,Catholic Charities of Los Angeles,Office,US,21600 Hart St,91303,California,Los Angeles County,Los Angeles,Canoga Park,34.197381,-118.600415,(818) 340-2050,
-Oasis Community Center,Catholic Charities of Los Angeles,Office,US,2045 San Gabriel Ave,90810,California,Los Angeles County,Carson,,33.792884,-118.223955,(562) 480-2166,
-San Juan Diego Center,Catholic Charities of Los Angeles,Office,US,4171 North Taylor Ave,91731,California,Los Angeles County,El Monte,,34.07711867,-118.0364227,(626) 575-7652,
-Immigration and Refugee Services,Catholic Charities of Los Angeles,Office,US,4322 San Fernando Road,91204,California,Los Angeles County,Glendale,,34.13146,-118.261418,(818) 502-2002,
-Glendale Community Center,Catholic Charities of Los Angeles,Office,US,4322 San Fernando Road,91204,California,Los Angeles County,Glendale,,34.13146,-118.261418,(818) 409-3080,
-Refugee Resettlement Program,Catholic Charities of Los Angeles,Office,US,4322 San Fernando Road,91204,California,Los Angeles County,Glendale,,34.13146,-118.261418,(818) 409-0057,
-Community Outreach Services,Catholic Charities of Los Angeles,Office,US,16009 Cypress Ave,91706,California,Los Angeles County,Irwindale,,34.096092,-117.933627,(626) 338-5057,
-St. Margaret's Center,Catholic Charities of Los Angeles,Church,US,10217 Inglewood Ave,90304,California,Los Angeles County,Lennox,,33.943534,-118.361357,(310) 672-2208,
-Elizabeth Ann Seton Residence,Catholic Charities of Los Angeles,Office,US,123 East 14th St.,90813,California,Los Angeles County,Long Beach,,33.783935,-118.192004,(562) 233-5985,
-Gatekeeper Project,Catholic Charities of Los Angeles,Office,US,123 East 14th St.,90813,California,Los Angeles County,Long Beach,,33.783935,-118.192004,(562) 480-2506 ,
-Long Beach Community Services Center,Catholic Charities of Los Angeles,Office,US,123 East 14th St.,90813,California,Los Angeles County,Long Beach,,33.783935,-118.192004,(562) 591-1351,
-Project Achieve,Catholic Charities of Los Angeles,Office,US,123 East 14th St.,90813,California,Los Angeles County,Long Beach,,33.783935,-118.192004,(562) 218-9864,
-"Adeste Child Care Program, Metro Area, Regional Administration",Catholic Charities of Los Angeles,Office,US,601 E 23rd St,90011,California,Los Angeles County,Los Angeles,,34.024868,-118.261606,(213) 748-5346,
-Adeste Child Care Program San Gabriel Regional Administration,Catholic Charities of Los Angeles,Office,US,1307 Warren St,90033,California,Los Angeles County,Los Angeles,,34.05235,-118.220466,(323) 264-4981,
-Angel's Flight MY CLUB Program,Catholic Charities of Los Angeles,Office,US,8705 South Vermont Ave,90044,California,Los Angeles County,Los Angeles,,33.958834,-118.291917,(213) 413-2311,(800) 833-2499
-Art of Parenting,Catholic Charities of Los Angeles,Office,US,1500 East Bridge St,90033,California,Los Angeles County,Los Angeles,,34.053346,-118.219928,(323) 263-4651,
-Brownson House,Catholic Charities of Los Angeles,Office,US,1307 Warren St,90033,California,Los Angeles County,Los Angeles,,34.05235,-118.220466,(323) 264-8700,(323) 264-8701
-Catholic Youth Organization (CYO),Catholic Charities of Los Angeles,Office,US,1530 James M. Wood Blvd,90015,California,Los Angeles County,Los Angeles,,34.050449,-118.272361,(213) 251-3454,
-Continuous Quality Improvement,Catholic Charities of Los Angeles,Office,US,1530 James M. Wood Blvd,90015,California,Los Angeles County,Los Angeles,,34.050449,-118.272361,(213) 251-3459,
-Esperanza Immigrant Rights Project,Catholic Charities of Los Angeles,Office,US,1530 James M. Wood Blvd,90015,California,Los Angeles County,Los Angeles,,34.050449,-118.272361,(213) 251-4505,
-Immigration Services,Catholic Charities of Los Angeles,Office,US,1530 James M. Wood Blvd,90015,California,Los Angeles County,Los Angeles,,34.050449,-118.272361,(213) 251-3411,
-Refugee Resettlement Program,Catholic Charities of Los Angeles,Office,US,1530 James M. Wood Blvd,90015,California,Los Angeles County,Los Angeles,,34.050449,-118.272361,(213) 251-3460,
-St Mary's Center,Catholic Charities of Los Angeles,Office,US,4665 Willow Brook Ave,90029,California,Los Angeles County,Los Angeles,,34.089461,-118.293173,(323) 662-4391,
-Catholic Charities of Los Angeles,Catholic Charities of Los Angeles,Office,US,1530 James M. Wood Blvd,90015,California,Los Angeles County,Los Angeles,,34.050449,-118.272361,(213) 251-3400,
-Adeste Child Care Program San Pedro Regional Administration,Catholic Charities of Los Angeles,Office,US,5014 Passons Blvd,90660,California,Los Angeles County,Pico Rivera,,33.998218,-118.078131,(562) 480-2482,
-Pico Rivera Resource Center,Catholic Charities of Los Angeles,Office,US,5014 Passons Blvd,90660,California,Los Angeles County,Pico Rivera,,33.998218,-118.078131,(562) 949-0937,
-Pomona Community Services,Catholic Charities of Los Angeles,Office,US,248 E. Monterey Ave,91767,California,Los Angeles County,Pomona,,34.060607,-117.746992,(909) 629-0472,
-Counseling Services,Catholic Charities of Los Angeles,Office,US,"461 W 6th St, Ste 202",90731,California,Los Angeles County,Los Angeles,San Pedro,33.738762,-118.287023,(310) 831-7111,
-Loaves & Fishes,Catholic Charities of Los Angeles,Office,US,14640 Keswick St,91405,California,Los Angeles County,Los Angeles,Van Nuys,34.210266,-118.450963,(818) 997-0943,
-"Adeste Child Care Program, Western Area Regional Administration",Catholic Charities of Los Angeles,Office,US,211 3rd Ave,90291,California,Los Angeles County,Los Angeles,Venice,33.998202,-118.477345,(310) 392-8701,
-Counseling Services,Catholic Charities of Los Angeles,Clinic,US,211 3rd Ave,90291,California,Los Angeles County,Los Angeles,Venice,33.998202,-118.477345,(310) 399-1351,
-St. Robert's Center,Catholic Charities of Los Angeles,Office,US,211 3rd Ave,90291,California,Los Angeles County,Los Angeles,Venice,33.998202,-118.477345,(310) 392-8701,
-Family Development Network,Catholic Charities of Los Angeles,Office,US,1115 Mahar Ave,90744,California,Los Angeles County,Los Angeles,Wilmington,33.785597,-118.246457,(310) 834-7265,
-Mahar House Community Center,Catholic Charities of Los Angeles,Office,US,1115 Mahar Ave,90744,California,Los Angeles County,Los Angeles,Wilmington,33.785597,-118.246457,(310) 834-7265,
-The Forum,Faithful Central Bible Church,Office,US,3900 W Manchester Blvd,90305,California,Los Angeles County,Inglewood,,33.959952,-118.343314,(310) 330-7300,
-The Tabernacle,Faithful Central Bible Church,Office,US,321 N Eucalyptus Ave,90301,California,Los Angeles County,Inglewood,,33.966166,-118.35941,,
-The Trinity Building,Faithful Central Bible Church,Office,US,333 W Florence Ave,90301,California,Los Angeles County,Inglewood,,33.965533,-118.360769,(310) 330-8000,(800) 377-9782
-The Living Room,Faithful Central Bible Church,Office,US,400 W Florence Ave,90301,California,Los Angeles County,Inglewood,,33.965597,-118.361871,,
-LA Regional Food Bank,LA Regional Food Bank,Food Bank,US,1734 E 41st St,90057,California,Los Angeles County,Los Angeles,,34.00782776,-118.2420807,(323) 234-3030 ,
-Ascension Lutheran Church ,Lutheran Social Services of the Southwest,Office,US,5820 West Blvd,90043,California,Los Angeles County,Los Angeles,,33.9883136,-118.335141,(323) 299-0729,
-Banking On Our Future,"Operation HOPE, Inc.",Office,US,"707 Wilshire Blvd, 30th Fl",90017,California,Los Angeles County,Los Angeles,,34.049259,-118.257027,(213) 489-7511,(213) 891-2900
-HOPE Financial Literacy Empowerment Center,"Operation HOPE, Inc.",Office,US,3721 S La Brea Ave,90016,California,Los Angeles County,Los Angeles,,34.01970751,-118.3556546,(323) 290-2405,(323) 290-2415
-Northwest Los Angeles Service Center,Tzu Chi Foundation,Office,US,8963 Reseda Blvd,91324,California,Los Angeles County,Los Angeles,Northridge,34.2328539,-118.5361364,(818) 727-7689,
-Orange County Service Center,Tzu Chi Foundation,Office,US,2851 Pullman St,92705,California,Orange County,Santa Ana,,33.70680618,-117.850174,(949) 833-0822,
-South Los Angeles Service Center,Tzu Chi Foundation,Office,US,2315 Pacific Coast Hwy,90717,California,Los Angeles County,Lomita,,33.79002762,-118.3232269,(310) 326-2659,
-West Los Angeles Service Center,Tzu Chi Foundation,Office,US,11701 Wilshire Blvd #7,90025,California,Los Angeles County,Los Angeles,,34.04941097,-118.4610231,(310) 473-5188,
-United Way Los Angeles,United Way - Los Angeles,Office,US,"1150 S Olive St, Ste T500",90015,California,Los Angeles County,Los Angeles,,34.04008962,-118.2615446,(213) 808-6220,
-United Way Harbor Area,United Way - Los Angeles,Office,US,3515 Linden Ave,90807,California,Los Angeles County,Long Beach,,33.82057953,-118.1869049,(562) 472-2140,
-Volunteer Center of Los Angeles,Volunteer Center of Los Angeles,Office,US,8134 Van Nuys Blvd #200,91402,California,Los Angeles County,Los Angeles,Panorama City,34.21899414,-118.4482269,,
-Emergency Operations Center,Los Angeles City Emergency Management Department,Office,US,500 E Temple St,90012,California,Los Angeles County,Los Angeles,,34.05046105,-118.2358423,,
-Los Angeles City Department of Animal Services,Los Angeles City Department of Animal Services,Office,US,"221 N. Figueroa St, 5th fl",90012,California,Los Angeles County,Los Angeles,,34.05921555,-118.2510071,(888) 452-7381,
-Antelope Valley Public Health Center,Los Angeles County Department of Public Health,Clinic,US,335-B East Ave K-6,93535,California,Los Angeles County,Lancaster,,34.76269913,-118.0916519,(661) 723-4526,
-Central Public Health Center,Los Angeles County Department of Public Health,Clinic,US,241 N. Figueroa St,90012,California,Los Angeles County,Los Angeles,,34.05890599,-118.2505167,(213) 240-8204,
-Curtis-Tucker Public Health Center,Los Angeles County Department of Public Health,Clinic,US,123 W Manchester Blvd,90301,California,Los Angeles County,Inglewood,,33.96243286,-118.3563919,(310) 419-5325,
-Glendale Public Health Center,Los Angeles County Department of Public Health,Clinic,US,501 N Glendale Ave,91206,California,Los Angeles County,Glendale,,34.15312576,-118.2443237,(818) 500-5750,
-Hollywood/Wilshire Public Health Center,Los Angeles County Department of Public Health,Clinic,US,5205 Melrose Ave,90038,California,Los Angeles County,Los Angeles,,34.08392715,-118.3141022,(323) 769-7800,
-"Martin Luther King, Jr. Center for Public Health",Los Angeles County Department of Public Health,Clinic,US,11833 South Wilmington Ave,90059,California,Los Angeles County,Los Angeles,,33.925072,-118.239357,(323) 568-8100,
-Monrovia Public Health Center,Los Angeles County Department of Public Health,Clinic,US,330 W Maple Ave,91016,California,Los Angeles County,Monrovia,,34.14141476,-118.0059797,(626) 256-1600,
-North Hollywood Public Health Center,Los Angeles County Department of Public Health,Clinic,US,5300 Tujunga Ave,91601,California,Los Angeles County,Los Angeles,North Hollywood,34.16729736,-118.3783951,(818) 766-3982,
-Pacoima Public Health Center,Los Angeles County Department of Public Health,Clinic,US,13300 Van Nuys Blvd,91331,California,Los Angeles County,Los Angeles,Pacoima,34.26496506,-118.4228287,(818) 896-1903,
-Pomona Public Health Center,Los Angeles County Department of Public Health,Clinic,US,750 S Park Ave,91766,California,Los Angeles County,Pomona,,34.05273819,-117.7538605,(909) 868-0235,
-Ruth-Temple Public Health Center,Los Angeles County Department of Public Health,Clinic,US,3834 S Western Ave,90062,California,Los Angeles County,Los Angeles,,34.01665878,-118.308548,(323) 730-3507,
-Simms/Mann Health and Wellness Center,Los Angeles County Department of Public Health,Clinic,US,"2509 Pico Blvd, Rm 325",90405,California,Los Angeles County,Santa Monica,,34.02332687,-118.4633713,(310) 998-3203,
-Torrance Public Health Center,Los Angeles County Department of Public Health,Clinic,US,710 Del Amo Blvd,90502,California,Los Angeles County,West Carson,,33.84633,-118.28606,(310) 354-2300,
-Whittier Public Health Center,Los Angeles County Department of Public Health,Clinic,US,7643 S Painter Ave,90602,California,Los Angeles County,Whittier,,33.97212245,-118.032734,(562) 464-5350,
-Los Angeles County Department of Social Services,Los Angeles County Department of Social Services,Office,US,12860 Crossroads Pkwy South,91746,California,Los Angeles County,Industry,,34.02873315,-118.0239384,(562) 908-8400,
-Los Angeles County Emergency Management Office,Los Angeles County Emergency Management Office,Office,US,"500 W Temple St, Ste 493",90012,California,Los Angeles County,Los Angeles,,34.05654907,-118.2462997,(213) 974-1411,
-Incident Command Post,Los Angeles City Emergency Management Department,Office,US,,,California,Los Angeles County,Los Angeles,,33.94813093,-118.3967473,,
-"Chapter Headquarters, West District Office",American Red Cross of Greater Los Angeles,Office,US,11355 Ohio Avenue,90025,California,Los Angeles County,Los Angeles,,34.048073,-118.452446,(310) 445-9900,
-Central East District Office,American Red Cross of Greater Los Angeles,Office,US,2227 S. Atlantic Blvd,90040,California,Los Angeles County,Los Angeles,,34.005764,-118.163742,(323) 780-7660,
-Koreatown/Wilshire District Office,American Red Cross of Greater Los Angeles,Office,US,"501 Shatto Place, Suite 100",90020,California,Los Angeles County,Los Angeles,,34.065144,-118.289932,(213) 351-6765,
-Arcadia Chapter,American Red Cross of Greater Los Angeles,Office,US,376 W Huntington Dr,91007,California,Los Angeles County,Arcadia,,34.131714,-118.044418,(626) 447-2193,
-East San Fernando Valley District Office,American Red Cross of Greater Los Angeles,Office,US,731 N. Hollywood Way,91505,California,Los Angeles County,Burbank,,34.163639,-118.345268,(818) 842-5295,
-West San Fernando Valley District Office,American Red Cross of Greater Los Angeles,Office,US,6800 Owensmouth Ave,91303,California,Los Angeles County,Los Angeles,Canoga Park,34.193779,-118.601501,(818) 593-3500,
-Claremont Chapter,American Red Cross of Greater Los Angeles,Office,US,2065 N Indian Hill Blvd,91711,California,Los Angeles County,Claremont,,34.121128,-117.720657,(909) 624-0074,
-Glendale-Crescenta Valley,American Red Cross of Greater Los Angeles,Office,US,1501 S. Brand Blvd,91204,California,Los Angeles County,Glendale,,34.127495,-118.255173,(818) 243-3121,
-South East District Office,American Red Cross of Greater Los Angeles,Office,US,9800 S. La Cienega Blvd,90301,California,Los Angeles County,Inglewood,,33.9478,-118.370049,(310) 642-0230,
-Antelope Valley Chapter,American Red Cross of Greater Los Angeles,Office,US,2715 E Ave P,93550,California,Los Angeles County,Palmdale,,34.602222,-118.077789,(661) 267-0650,
-San Gabriel Pomona Valley Chapter,American Red Cross of Greater Los Angeles,Office,US,430 Madeline Dr,91105,California,Los Angeles County,Pasadena,,34.126476,-118.159615,(626) 799-0841,
-Santa Clarita Valley District Office,American Red Cross of Greater Los Angeles,Office,US,"23838 Valencia Blvd, Suite 120",91355,California,Los Angeles County,Santa Clarita,,34.413586,-118.551575,(661) 259-1805,
-Santa Monica Chapter,American Red Cross of Greater Los Angeles,Office,US,1450 11th St,90401,California,Los Angeles County,Santa Monica,,34.0205,-118.48755,(310) 394-3773,
-South Bay District Office,American Red Cross of Greater Los Angeles,Office,US,"1995 W. 190th Street, Suite 100",90504,Californi,Los Angeles County,Torrance,,33.8596,-118.313,(310) 225-2900,
-St. Mary's Center,Catholic Charities of Los Angeles,Office,US,4665 Willow Brook Ave,90029,California,Los Angeles County,Los Angeles,,34.089461,-118.293173,(323) 662-4391,
-Angel's Flight Runaway & Homeless Youth Services,Catholic Charities of Los Angeles,Clinic,US,357 S Westlake Ave,90057,California,Los Angeles County,Los Angeles,,34.061518,-118.272079,(213) 413-2311,(800) 833-2499
-Good Shepherd Center for Homeless Women and Children,Catholic Charities of Los Angeles,Clinic,US,1671 Beverly Blvd,90026,California,Los Angeles County,Los Angeles,,34.064319,-118.265074,(213) 235-1460,
-El Santo Nino Community Center,Catholic Charities of Los Angeles,Office,US,601 E 23rd St,90011,California,Los Angeles County,Los Angeles,,34.024868,-118.261606,(213) 748-5246,
-Temporary Skilled Worker Center,Catholic Charities of Los Angeles,Office,US,1190 S Flower St,91502,California,Los Angeles County,Burbank,,34.170277,-118.301488,(818) 566-7148,
-Capinteria Community Services,Catholic Charities of Los Angeles,Office,US,941 Walnut St,93013,California,Santa Barbara County,Carpinteria,,34.396921,-119.517031,(805) 684-8621,
-Lompoc Community Services,Catholic Charities of Los Angeles,Office,US,903 East Chestnut Ave,93436,California,Santa Barbara County,Lompoc,,34.642148,-120.447498,(805) 736-4886,
-Lompoc Food Pantry,Catholic Charities of Los Angeles,Office,US,903 East Chestnut Ave,93436,California,Santa Barbara County,Lompoc,,34.642148,-120.447498,(805) 736-4886,
-Counseling Services,Catholic Charities of Los Angeles,Clinic,US,609 East Haley St,93103,California,Santa Barbara County,Santa Barbara,,34.423369,-119.688546,(805) 965-7045,
-Santa Barbara Community Services,Catholic Charities of Los Angeles,Office,US,609 East Haley St,93103,California,Santa Barbara County,Santa Barbara,,34.423369,-119.688546,(805) 965-7045,
-Thrifty Shopper at Catholic Charities (Thrift Store),Catholic Charities of Los Angeles,Office,US,609 East Haley St,93103,California,Santa Barbara County,Santa Barbara,,34.423369,-119.688546,(805) 966-9659,
-Cuyama Valley Community Services,Catholic Charities of Los Angeles,Office,US,607 West Main St,93454,California,Santa Barbara County,Santa Maria,,34.953208,-120.442719,(805) 922-2059,
-Guadalupe Community Services,Catholic Charities of Los Angeles,Office,US,607 West Main St,93454,California,Santa Barbara County,Santa Maria,,34.953208,-120.442719,(805) 922-2059,
-Santa Maria Community Services,Catholic Charities of Los Angeles,Office,US,607 West Main St,93454,California,Santa Barbara County,Santa Maria,,34.953208,-120.442719,(805) 922-2059,
-Thrifty Shopper at Catholic Charities (Thrift Store),Catholic Charities of Los Angeles,Office,US,605 West Main St,93454,California,Santa Barbara County,Santa Maria,,34.953208,-120.442678,(805) 922-4174,
-Older Adult Services and Intervention System (OASIS) Camarillo,Catholic Charities of Los Angeles,Office,US,2532 Ventura Blvd,93010,California,Ventura County,Camarillo,,34.216168,-119.035777,(805) 987-2083,
-"Older Adult Services and Intervention System, Fillmore/Piru",Catholic Charities of Los Angeles,Office,US,1048 West Ventura St,93016,California,Ventura County,Fillmore,,34.08226,-118.031696,(805) 794-5929,
-Moorpark Community Services,Catholic Charities of Los Angeles,Office,US,609 Fitch Ave,93021,California,Ventura County,Moorpark,,34.284058,-118.873006,(805) 529-0720,
-Older Adult Services and Intervention System (OASIS) Moorpark,Catholic Charities of Los Angeles,Office,US,609 Fitch Ave,93021,California,Ventura County,Moorpark,,34.284058,-118.873006,(805) 794-5929,
-Oxnard Community Services,Catholic Charities of Los Angeles,Office,US,502 North A St,93030,California,Ventura County,Oxnard,,34.207017,-119.178491,(805) 485-2900,
-Older Adult Services and Intervention System (OASIS) Santa Paula,Catholic Charities of Los Angeles,Office,US,427 North Oak St,93061,California,Ventura County,Santa Paula,,34.360545,-119.059482,(805) 794-5929,
-Adeste Child Care Program Ventura County Regional Administration,Catholic Charities of Los Angeles,Office,US,"303 North Ventura Ave, Ste B",93001,California,Ventura County,Ventura,,34.28471,-119.299823,(805) 643-4760,
-Ventura Community Services Center,Catholic Charities of Los Angeles,Office,US,"303 North Ventura Ave, Ste C",93001,California,Ventura County,Ventura,,34.28471,-119.299823,(805) 643-4693,
diff --git a/private/templates/CRMT/gis_config.csv b/private/templates/CRMT/gis_config.csv
deleted file mode 100644
index 702380f370..0000000000
--- a/private/templates/CRMT/gis_config.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-UUID,Name,Default Country,Default L1,Default L2,Zoom,Lat,Lon,Projection,LatMin,LatMax,LonMin,LonMax,Geocoder,Marker
-SITE_DEFAULT,Default,US,California,Los Angeles County,9,34.026689,-118.210315,900913,18.923882,71.365814,-179.141998,179.777466,True,marker_red
diff --git a/private/templates/CRMT/gis_layer_feature.csv b/private/templates/CRMT/gis_layer_feature.csv
deleted file mode 100644
index 482bc12454..0000000000
--- a/private/templates/CRMT/gis_layer_feature.csv
+++ /dev/null
@@ -1,36 +0,0 @@
-Name,Description,Controller,Function,Marker,GPS Marker,Popup Format,Attributes,Filter,Default,Individual,Style,Folder,Visible,Enabled,Cluster Distance,Cluster Threshold,Refresh,Opacity
-Training (Community Data),,project,activity,activity,,{name},name,activity_type.name=Training,True,,,Activities,False,,30,,,
-Outreach (Community Data),,project,activity,activity,,{name},name,activity_type.name=Outreach,,,,Activities,False,,30,,,
-Meetings (Community Data),,project,activity,activity,,{name},name,activity_type.name=Meetings,,,,Activities,False,,30,,,
-Community Events (Community Data),,project,activity,activity,,{name},name,activity_type.name=Community Events,,,,Activities,False,,30,,,
-Evacuation Routes (Community Data),,vulnerability,evac_route,evac_route,,{name},name,,,,,Evacuation,False,,30,,,
-Organizations,used for Summary View,org,organisation,organization,Building,{name} (T('Organization')),name,,True,,,,False,False,30,,,
-Places,used for Summary View,org,facility,facility,Building,{name} (T('Place')),name,,True,,,,False,False,30,,,
-Arts and Recreation (Community Data),,org,facility,arts,Building,{name} (T('Place')),name,facility_type.name__typeof=Arts and Recreation,,,,,False,,30,,,
-Arts and Recreation (Community Data),,org,organisation,arts,Building,{name} (T('Organization')),name,service.name__typeof=Arts and Recreation,,,,Organizations,False,,30,,,
-Communications (Community Data),,org,facility,communications,Building,{name} (T('Place')),name,facility_type.name__typeof=Communications,True,,,,False,,30,,,
-Communications (Community Data),,org,organisation,communications,Building,{name} (T('Organization')),name,service.name__typeof=Communications,True,,,Organizations,False,,30,,,
-Community Groups (Community Data),,org,organisation,people,Building,{name} (T('Organization')),name,service.name__typeof=Community Groups,,,,Organizations,False,,30,,,
-Education (Community Data),,org,facility,education,Building,{name} (T('Place')),name,facility_type.name__typeof=Education,,,,,False,,30,,,
-Education (Community Data),,org,organisation,education,Building,{name} (T('Organization')),name,service.name__typeof=Education,,,,Organizations,False,,30,,,
-Emergency Response (Community Data),,org,organisation,emergency,Building,{name} (T('Organization')),name,service.name__typeof=Emergency Response,,,,Organizations,False,,30,,,
-Environment (Community Data),,org,facility,environment,Building,{name} (T('Place')),name,facility_type.name__typeof=Environment,,,,,False,,30,,,
-Environment (Community Data),,org,organisation,environment,Building,{name} (T('Organization')),name,service.name__typeof=Environment,,,,Organizations,False,,30,,,
-Government (Community Data),,org,organisation,government,Building,{name} (T('Organization')),name,service.name__typeof=Government,,,,Organizations,False,,30,,,
-Health and Mental Health (Community Data),,org,organisation,health,Building,{name} (T('Organization')),name,service.name__typeof=Health and Mental Health,,,,Organizations,False,,30,,,
-Municipal Services (Community Data),,org,organisation,municipal_services,Building,{name} (T('Organization')),name,service.name__typeof=Municipal Services,,,,Organizations,False,,30,,,
-Physical Features (Community Data),,org,facility,mountain,Building,{name} (T('Place')),name,facility_type.name__typeof=Physical Features,,,,,False,,30,,,
-Postal (Community Data),,org,organisation,post,Building,{name} (T('Organization')),name,service.name__typeof=Postal,,,,Organizations,False,,30,,,
-Private Industry (Community Data),,org,organisation,industry,Building,{name} (T('Organization')),name,service.name__typeof=Private Industry,,,,Organizations,False,,30,,,
-Public Safety (Community Data),,org,organisation,emergency,Building,{name} (T('Organization')),name,service.name__typeof=Public Safety,,,,Organizations,False,,30,,,
-Social Services (Community Data),,org,organisation,people,Building,{name} (T('Organization')),name,service.name__typeof=Social Services,,,,Organizations,False,,30,,,
-Transportation (Community Data),,org,facility,transport,Building,{name} (T('Place')),name,facility_type.name__typeof=Transportation&facility_type.name__ne=Alternative Fuel,,,,,False,,30,,,
-Transportation (Community Data),,org,organisation,transport,Building,{name} (T('Organization')),name,service.name__typeof=Transportation,,,,Organizations,False,,30,,,
-Debris Basins (Community Data),,org,facility,debris,,{name} (T('Debris Basin')),name,facility_type.name=Debris Basin,,,,,False,,30,,,
-Flood Channel / Street Intersections (Community Data),,org,facility,manhole,,{facility_type.name},facility_type.name,facility_type.name=Flood Channel / Street Intersection,,,,,False,,30,,,
-Water Storage Tanks (Community Data),,org,facility,water_tank,,{facility_type.name},facility_type.name,facility_type.name=Water Storage Tank,,,,,False,,30,,,
-People (Community Data),,pr,person,trained,,{first_name} {last_name},"first_name,last_name",,True,,,People,False,,30,,,
-Trained People (Community Data),,stats,people,people,,{name},name,~.parameter_id$name=Trained People&~.location_id$gis_feature_type=1,True,,,People,False,,30,,,
-Team Zones (Community Data),,stats,people,,,{name},name,~.parameter_id$name=Trained People&~.location_id$gis_feature_type__ne=1,,True,"{'fill':'ffffff','fillOpacity':0.01,'stroke':'006633'}",People,False,,,0,,0.9
-Hazards (Community Data),,vulnerability,risk,risk,Danger Area,{name} (T('Hazard')),name,~.location_id$gis_feature_type=1,True,,,Hazards,False,,,0,,
-Hazard Areas (Community Data),,vulnerability,risk,,Danger Area,{name} (T('Hazard')),name,~.location_id$gis_feature_type__ne=1,,True,"{'fill':'ff0000','fillOpacity':0.5}",Hazards,False,,,0,,0.9
diff --git a/private/templates/CRMT/gis_layer_feature_coalitions.csv b/private/templates/CRMT/gis_layer_feature_coalitions.csv
deleted file mode 100644
index 0b6e36d692..0000000000
--- a/private/templates/CRMT/gis_layer_feature_coalitions.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-Name,Controller,Function,Filter,Popup Format,Attributes,Style,Opacity,Folder,Visible,Enabled,Cluster Threshold,Refresh
-All Coalitions,org,group,,{name},name,"{'fill':'FFFFFF','fillOpacity':0.01,'stroke':'000000'}",0.9,Coalitions,False,True,0,0
-Acton & Agua Dulce,org,group,~.name=Acton %26 Agua Dulce,Acton & Agua Dulce,,"{'fill':'FFFFFF','fillOpacity':0.01,'stroke':'000000'}",0.9,Coalitions,False,True,0,0
-Culver City,org,group,~.name=Culver City,Culver City,,"{'fill':'FFFFFF','fillOpacity':0.01,'stroke':'000000'}",0.9,Coalitions,False,True,0,0
-Huntington Park,org,group,~.name=Huntington Park,Huntington Park,,"{'fill':'FFFFFF','fillOpacity':0.01,'stroke':'000000'}",0.9,Coalitions,False,True,0,0
-La Crescenta-Montrose,org,group,~.name=La Crescenta-Montrose,La Crescenta-Montrose,,"{'fill':'FFFFFF','fillOpacity':0.01,'stroke':'000000'}",0.9,Coalitions,False,True,0,0
-Pico-Union,org,group,~.name=Pico-Union,Pico-Union,,"{'fill':'FFFFFF','fillOpacity':0.01,'stroke':'000000'}",0.9,Coalitions,False,True,0,0
-Pomona,org,group,~.name=Pomona,Pomona,,"{'fill':'FFFFFF','fillOpacity':0.01,'stroke':'000000'}",0.9,Coalitions,False,True,0,0
-Watts,org,group,~.name=Watts,Watts,,"{'fill':'FFFFFF','fillOpacity':0.01,'stroke':'000000'}",0.9,Coalitions,False,True,0,0
-Wilmington,org,group,~.name=Wilmington,Wilmington,,"{'fill':'FFFFFF','fillOpacity':0.01,'stroke':'000000'}",0.9,Coalitions,False,True,0,0
diff --git a/private/templates/CRMT/gis_layer_wms.csv b/private/templates/CRMT/gis_layer_wms.csv
deleted file mode 100644
index eeab098760..0000000000
--- a/private/templates/CRMT/gis_layer_wms.csv
+++ /dev/null
@@ -1,51 +0,0 @@
-Name,Description,Source Name,Source URL,URL,Layers,Folder,Enabled,Visible,Base,Transparent,Opacity,Format,Queryable,LegendURL,Tiled,Map,Metadata
-Population,"Population: DP0010001. Zooms 9-11: Tract level, Zooms 12+: Block Group level",2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,PopulationZoomVariable,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-Population Density,"Population per square mile of land: DP0010001/ALAND10 * 2,589,988. Zooms 9-11: Tract level, Zooms 12+: Block Group level",2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,PopulationDensityZoomVariable,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-Age < 5,Percentage of population aged under 5: DP0010002/DP0010001,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,age5,Census Data/Age,True,False,False,True,0.4,image/png,True,,True,,
-Age 5-19,Percentage of population aged between 5 and 19: DP0010003+DP0010004+DP0010005/DP0010001,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,age519,Census Data/Age,True,False,False,True,0.4,image/png,True,,True,,
-Age 20-39,Percentage of population aged between 20 and 39: DP0010006+DP0010007+DP0010008+DP0010009/DP0010001,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,age2039,Census Data/Age,True,False,False,True,0.4,image/png,True,,True,,
-Age 40-64,Percentage of population aged between 40 and 64: DP0010010+DP0010011+DP0010012+DP0010013+DP0010014/DP0010001,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,age4064,Census Data/Age,True,False,False,True,0.4,image/png,True,,True,,
-Age 65-79,Percentage of population aged between 65 and 79: DP0010015+DP0010016+DP0010017/DP0010001,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,age6579,Census Data/Age,True,False,False,True,0.4,image/png,True,,True,,
-Age > 80,Percentage of population aged over 80: DP0010018+DP0010019/DP0010001,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,age80,Census Data/Age,True,False,False,True,0.4,image/png,True,,True,,
-Alone,Percentage of households which have somone living alone: DP0130011/DP0130001,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,alone,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-Alone > 65,Percentage of households which have somone living alone who is aged over 65: DP0130013+DP0130015/DP0130001,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,alone_65,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-American Indian or Alaskan,Percentage of population which is American Indian or Alaskan native and not Hispanic or Latino: DP0110013/DP0110001,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,native,Census Data/Ethnicity,True,False,False,True,0.4,image/png,True,,True,,
-Asian non-Hispanic,Percentage of population which is Asian and not Hispanic or Latino: DP0110014/DP0110001,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,asian,Census Data/Ethnicity,True,False,False,True,0.4,image/png,True,,True,,
-Black non-Hispanic,Percentage of population which is Black or African American and not Hispanic or Latino: DP0110012/DP0110001,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,black,Census Data/Ethnicity,True,False,False,True,0.4,image/png,True,,True,,
-Children < 18,Percentage of family households which have children under 18: DP0130003/DP0130002,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,children,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-Citizenship,"Percentage of population which is not a US Citizen: 1-year summary files, B05001006/B05001001",American Community Survey 2011,http://www2.census.gov/acs2011_1yr/summaryfile/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,B05001,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-Disabled,"Percentage of civilian non-institutionalized population which has a Disability: 1-year summary files, C18101004+C18101007+C18101010+C18101014+C18101017+C18101020/C18101001",American Community Survey 2011,http://www2.census.gov/acs2011_1yr/summaryfile/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,B18101,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-Educational Attainment,"Percentage of population over 25 without a degree: 1-year summary files, C15003002+C15003003+C15003004+C15003005+C15003006+C15003007+C15003008+C15003009+C15003010+C15003011+C15003012+C15003013/C15003001",American Community Survey 2011,http://www2.census.gov/acs2011_1yr/summaryfile/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,B15003,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-English Fluency,"Percentage of population over 5 which Speak English less than 'very well': 1-year summary files, C16005006+C16005009+C16005012+C16005015+C16005020+C16005023+C16005026+C16005029/C16005001",American Community Survey 2011,http://www2.census.gov/acs2011_1yr/summaryfile/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,C16005,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-Foreign-born,"Percentage of population which is foreign-born: 1-year summary files, B05002013/B05002001",American Community Survey 2011,http://www2.census.gov/acs2011_1yr/summaryfile/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,B05002,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-Health Insurance,"Percentage of civilian non-institutionalized population which has no health insurance: 1-year summary files, C27001005+C27001008+C27001011+C27001015+C27001018+C27001021/C27001001",American Community Survey 2011,http://www2.census.gov/acs2011_1yr/summaryfile/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,B27001,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-Hawaiian or Pacific Islander,Percentage of population which is Native Hawaiian or Pacific Islander and not Latino: DP0110015/DP0110001,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,pacific,Census Data/Ethnicity,True,False,False,True,0.4,image/png,True,,True,,
-Hispanic or Latino,Percentage of population which is Hispanic or Latino: DP0110002/DP0110001,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,hispanic,Census Data/Ethnicity,True,False,False,True,0.4,image/png,True,,True,,
-Income under 25k,"Percentage of households with an Income In The Past 12 Months of less than 25,000 (2011 Inflation-Adjusted) Dollars: 1-year summary files, C19001002+C19001003+C19001004/C19001001",American Community Survey 2011,http://www2.census.gov/acs2011_1yr/summaryfile/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,B19001,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-Institutionalized Population,Percentage of population which is institutionalized: DP0120015/DP0120001,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,institutionalised_population,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-Male Median Age,Male Median Age: DP0020002,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,dp0020002,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-Female Median Age,Female Median Age: DP0020003,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,dp0020003,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-Owner-occupied Housing Units,Percentage of occupied housing units which are owner-occupied: DP0210002/DP0210001,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,owner_occupied_housing_units,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-Public assistance/Food stamps,"Percentage of households which were in receipt of Public Assistance Income Or Food Stamps/Snap in the Past 12 Months: 1-year summary files, B19058002/B19058001",American Community Survey 2011,http://www2.census.gov/acs2011_1yr/summaryfile/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,B19058,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-Single Parent,Percentage of households which have a single parent: DP0130006+DP0130008/DP0130001,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,single_parent,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-Vacant Housing Units,Percentage of housing units which are vacant: DP0180003/DP0180001,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,vacant_housing_units,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-Vehicle Ownership,"Percentage of households which don't have access to a vehicle: 1-year summary files, B08201002/B08201001",American Community Survey 2011,http://www2.census.gov/acs2011_1yr/summaryfile/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,B08201,Census Data,True,False,False,True,0.4,image/png,True,,True,,
-White non-Hispanic,Percentage of population which is White and not Hispanic or Latino: DP0110011/DP0110001,2010 Census,http://www.census.gov/2010census/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,white,Census Data/Ethnicity,True,False,False,True,0.4,image/png,True,,True,,
-Flood Zones,FEMA FIRM (Flood Insurance Rate Maps) from 2013-04-16,FEMA Flood Zones,http://dpw.lacounty.gov/wmd/floodzone/,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,flood,Hazards,True,False,False,True,0.4,image/png,True,,True,,"<p dir='ltr' style='line-height:1.15;margin-top:0pt;margin-bottom:0pt;'><strong>MAP NAME</strong>: FEMA Flood Zones<br /><br /><strong>MAP SOURCE</strong>: FEMA FIRM (Flood Insurance Rate Maps)<br /><br /><strong>WHEN DID WE ADD THIS MAP?</strong>: 4-16-2013<br /><br /><strong>COULD THERE BE AN UPDATE?</strong>: FEMA may change these maps, but usually only once a decade or less often.&nbsp; FEMA updates the flood maps from time to time, for two main reasons. The flooding can change as people alter a landscape with paved roads, buildings, drainage systems.&nbsp; Experts can improve their flood estimates when they get new, improved information about ground elevation.<br /><br /><strong>WHAT DOES THIS MAP SHOW ME?</strong><br />This map shows areas that could flood in a long or intense storm. There are three layers.<br />&ldquo;More likely&rdquo; flood zones have a 1% chance of flooding in any year. This may not sound like a high chance, but these are areas that flood often enough that the government requires flood insurance and Los Angeles County building permits have special requirements.<br />&ldquo;Less likely&rdquo; flood zones have a 0.2% chance of flooding in any year. It is hard to know what to do with a percentage like this. The important points are:<br />* the 1% zones flood more often that the 0.2% zones<br />* floods in the 0.2% zones tend to be larger and more severe<br /><br /><strong>TO LEARN MORE ABOUT THIS KIND OF MAP</strong>:<br />Go to the FEMA Flood Insurance Rate Map (FIRM) website: <a href='http://www.fema.gov/floodplain-management/flood-insurance-rate-map-firm'>http://www.fema.gov/floodplain-management/flood-insurance-rate-map-firm</a><br /><br /><strong>DATA SOURCE</strong><br /><a href='http://dpw.lacounty.gov/wmd/floodzone/'>http://dpw.lacounty.gov/wmd/floodzone/</a></p>"
-Landslide Susceptibility,,California Geological Survey,ftp://ftp.consrv.ca.gov/pub/dmg/rgmp/MS58/Susdata.zip,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,laco_suscep,Hazards,True,False,False,True,0.4,image/png,True,,True,,
-Tsunami Indundation,Potential Tsunami Indundation Area,California Geological Survey,http://www.quake.ca.gov/gmaps/WH/tsunamimaps.htm,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,tsunami,Hazards,True,False,False,True,0.4,image/png,True,,True,,
-"Northridge, 1994",Actual Earthquake,USGS,http://earthquake.usgs.gov/earthquakes/shakemap/sc/shake/Northridge,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,northridge,Hazards/Earthquake Historical Events,True,False,False,True,0.4,image/png,True,,True,,
-"San Fernando, 1971",Actual Earthquake,USGS,http://earthquake.usgs.gov/earthquakes/shakemap/sc/shake/San_Fernando,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,san_fernando,Hazards/Earthquake Historical Events,True,False,False,True,0.4,image/png,True,,True,,
-"Whittier Narrows, 1987",Actual Earthquake,USGS,http://earthquake.usgs.gov/earthquakes/shakemap/sc/shake/Whittier_Narrows,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,whittier_narrows,Hazards/Earthquake Historical Events,True,False,False,True,0.4,image/png,True,,True,,
-"Sierra Madre, 1991",Actual Earthquake,USGS,http://earthquake.usgs.gov/earthquakes/shakemap/sc/shake/Sierra_Madre,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,sierra_madre,Hazards/Earthquake Historical Events,True,False,False,True,0.4,image/png,True,,True,,
-"Diamond Bar, 2008",Actual Earthquake,USGS,http://earthquake.usgs.gov/earthquakes/shakemap/sc/shake/14383980,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,diamondbar,Hazards/Earthquake Historical Events,True,False,False,True,0.4,image/png,True,,True,,
-M 6.7 on Verdugo Fault,Scenario,USGS,http://earthquake.usgs.gov/earthquakes/shakemap/sc/shake/Verdugo6.7_se,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,verdugo67,Hazards/Earthquake Scenarios,True,False,False,True,0.4,image/png,True,,True,,
-M 7.2 aftershock of ShakeOut Earthquake,Scenario,USGS,http://earthquake.usgs.gov/earthquakes/shakemap/sc/shake/ShakeOut2_AS2_se,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,shakeout2_as2,Hazards/Earthquake Scenarios,True,False,False,True,0.4,image/png,True,,True,,
-M 7.8 ShakeOut Earthquake,Scenario,USGS,http://earthquake.usgs.gov/earthquakes/shakemap/sc/shake/shakeout2_full_se,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,shakeout2,Hazards/Earthquake Scenarios,True,False,False,True,0.4,image/png,True,,True,,
-M 7.1 on Puente Hills fault,Scenario,USGS,http://earthquake.usgs.gov/earthquakes/shakemap/sc/shake/Puente_Hills_se,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,puente_hills,Hazards/Earthquake Scenarios,True,False,False,True,0.4,image/png,True,,True,,
-M 6.5 on Raymond fault,Scenario,USGS,http://earthquake.usgs.gov/earthquakes/shakemap/sc/shake/Raymond6.5_se,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,raymond65,Hazards/Earthquake Scenarios,True,False,False,True,0.4,image/png,True,,True,,
-M 6.8 on Whittier fault,Scenario,USGS,http://earthquake.usgs.gov/earthquakes/shakemap/sc/shake/Whittier6.8_se,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,whittier68,Hazards/Earthquake Scenarios,True,False,False,True,0.4,image/png,True,,True,,
-M 7.8 repeat of 1857 earthquake on San Andreas fault,Scenario,USGS,http://earthquake.usgs.gov/earthquakes/shakemap/sc/shake/1857_se,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,sanandreas78,Hazards/Earthquake Scenarios,True,False,False,True,0.4,image/png,True,,True,,
-M 7.1 on Palos Verdes fault,Scenario,USGS,http://earthquake.usgs.gov/earthquakes/shakemap/sc/shake/Palos_Verdes7.1_se,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,:palos_verdes71,Hazards/Earthquake Scenarios,True,False,False,True,0.4,image/png,True,,True,,
-M 6.9 on Newport-Inglewood fault,Scenario,USGS,http://earthquake.usgs.gov/earthquakes/shakemap/sc/shake/Newport_Inglewood6.9_se,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,newport_inglewood69,Hazards/Earthquake Scenarios,True,False,False,True,0.4,image/png,True,,True,,
-M 6.6 on Santa Monica fault,Scenario,USGS,http://earthquake.usgs.gov/earthquakes/shakemap/sc/shake/StaMonica6.6_se,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wms,stamonica66,Hazards/Earthquake Scenarios,True,False,False,True,0.4,image/png,True,,True,,
\ No newline at end of file
diff --git a/private/templates/CRMT/gis_marker.csv b/private/templates/CRMT/gis_marker.csv
deleted file mode 100644
index 5cb12e9cbe..0000000000
--- a/private/templates/CRMT/gis_marker.csv
+++ /dev/null
@@ -1,26 +0,0 @@
-Name,Height,Width,Image
-marker_red,34,20,"marker_red.png"
-activity,34,22,"CRMT/Activity.png"
-arts,34,22,"CRMT/Arts.png"
-communications,34,22,"CRMT/Communications.png"
-debris,34,22,"CRMT/Debris.png"
-education,34,22,"CRMT/Education.png"
-emergency,34,22,"CRMT/Emergency.png"
-environment,34,22,"CRMT/Environment.png"
-evac_route,34,22,"CRMT/Evac_Route.png"
-facility,34,22,"CRMT/Facility.png"
-government,34,22,"CRMT/Government.png"
-health,34,22,"CRMT/Health.png"
-incident,34,22,"CRMT/Incident.png"
-industry,34,22,"CRMT/Industry.png"
-manhole,34,22,"CRMT/Manhole.png"
-mountain,34,22,"CRMT/Mountain.png"
-municipal_services,34,22,"CRMT/Municipal_Services.png"
-organization,34,22,"CRMT/Organization.png"
-people,34,22,"CRMT/People.png"
-post,34,22,"CRMT/Post.png"
-risk,34,22,"CRMT/Risk.png"
-trained,34,22,"CRMT/Trained.png"
-transport,34,22,"CRMT/Transport.png"
-water,34,22,"CRMT/Water.png"
-water_tank,34,22,"CRMT/Water_Tank.png"
\ No newline at end of file
diff --git a/private/templates/CRMT/gis_poi_type.csv b/private/templates/CRMT/gis_poi_type.csv
deleted file mode 100644
index a9d2c966c6..0000000000
--- a/private/templates/CRMT/gis_poi_type.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-Name,Marker
-Debris Basin,debris
-"Flood Channel / Street Intersection",manhole
-"Member's Home",facility
-Water Storage Tank,water_tank
\ No newline at end of file
diff --git a/private/templates/CRMT/hazard.csv b/private/templates/CRMT/hazard.csv
deleted file mode 100644
index cc802208b0..0000000000
--- a/private/templates/CRMT/hazard.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-Name
-Wild Fires
-Earthquakes
-Floods
-Mud Slides
-Tornado
-Tsunami
-Heat Wave
-Chemical Slip
-Nuclear
\ No newline at end of file
diff --git a/private/templates/CRMT/incident_report.csv b/private/templates/CRMT/incident_report.csv
deleted file mode 100644
index 058c5beba2..0000000000
--- a/private/templates/CRMT/incident_report.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-Name,Type,Date,Reported By First Name,Reported By Last Name,Reported By Phone,Reported By Email,Organisation Group,Address,Postcode,Country,L1,L2,L3,Lat,Lon,Comments
-On General Store,Broken Windows,,John,Smithson,,,Acton & Agua Dulce,"1150 S Olive St, Ste T500",90015,US,California,Los Angeles County,Los Angeles,34.04008962,-118.2615446,
-Drive by shooting ,Gang Violence,,Sandra,Mitchell,,,Acton & Agua Dulce,11701 Wilshire Blvd #7,90025,US,California,Los Angeles County,Los Angeles,34.04941097,-118.4610231,
-Tagging on fence,Grafitti,,Julius,O'Niel,,,Culver City,1307 Warren St,90033,US,California,Los Angeles County,Los Angeles,34.05235,-118.220466,
-Small Fire across 3 properties,Fires,,Pedro,Railaco,,,Culver City,1500 East Bridge St,90033,US,California,Los Angeles County,Los Angeles,34.053346,-118.219928,
-On Apartment ,Broken Windows,,Susan,Bean,,,Huntington Park,1530 James M. Wood Blvd,90015,US,California,Los Angeles County,Los Angeles,34.050449,-118.272361,
-2 men Fighting ,Gang Violence,,Debra,Lockie,,,Huntington Park,1671 Beverly Blvd,90026,US,California,Los Angeles County,Los Angeles,34.064319,-118.265074,
-On stores,Grafitti,,We Shin,Xing,,,La Crescenta-Montrose,"221 N. Figueroa St, 5th fl",90012,US,California,Los Angeles County,Los Angeles,34.05921555,-118.2510071,
-House Fire,Fires,,Maria,Dossantos,,,La Crescenta-Montrose,357 S Westlake Ave,90057,US,California,Los Angeles County,Los Angeles,34.061518,-118.272079,
-On General Store,Broken Windows,,Antonia,Macedo,,,Pico-Union,3721 S La Brea Ave,90016,US,California,Los Angeles County,Los Angeles,34.01970751,-118.3556546,
-Drive by shooting ,Gang Violence,,Phung,Tan,,,Pico-Union,4665 Willow Brook Ave,90029,US,California,Los Angeles County,Los Angeles,34.089461,-118.293173,
-Tagging on fence,Grafitti,,Xavier,Charles,,,Watts,601 E 23rd St,90011,US,California,Los Angeles County,Los Angeles,34.024868,-118.261606,
-Small Fire across 3 properties,Fires,,William,Smith,,,Watts,"707 Wilshire Blvd, 30th Fl",90017,US,California,Los Angeles County,Los Angeles,34.049259,-118.257027,
-On Apartment ,Broken Windows,,Bo,Bacon,,,Wilmington,8705 South Vermont Ave,90044,US,California,Los Angeles County,Los Angeles,33.958834,-118.291917,
-2 men Fighting ,Gang Violence,,Ulysses,King,,,Wilmington,8963 Reseda Blvd,91324,US,California,Los Angeles County,Los Angeles,34.2328539,-118.5361364,
-On stores,Grafitti,,Sarah,Lee,,,Pomona,248 E. Monterey Ave,91767,US,California,Los Angeles County,Pomona,34.060607,-117.746992,
-House Fire,Fires,,Rachel,Williamson,,,Pomona,750 S Park Ave,91766,US,California,Los Angeles County,Pomona,34.05273819,-117.7538605,
\ No newline at end of file
diff --git a/private/templates/CRMT/org_group.csv b/private/templates/CRMT/org_group.csv
deleted file mode 100644
index a38a15ef76..0000000000
--- a/private/templates/CRMT/org_group.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-Name
-Acton & Agua Dulce
-Culver City
-Huntington Park
-La Crescenta-Montrose
-Pico-Union
-Pomona
-Watts
-Wilmington
\ No newline at end of file
diff --git a/private/templates/CRMT/stats_people_type.csv b/private/templates/CRMT/stats_people_type.csv
deleted file mode 100644
index a69100517e..0000000000
--- a/private/templates/CRMT/stats_people_type.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-Name
-Trained People
\ No newline at end of file
diff --git a/private/templates/CRMT/tasks.cfg b/private/templates/CRMT/tasks.cfg
deleted file mode 100644
index e0420d9b23..0000000000
--- a/private/templates/CRMT/tasks.cfg
+++ /dev/null
@@ -1,75 +0,0 @@
-##########################################################################
-# Add a list of csv file to import into the system
-# the list of import files is a comma separated list as follows:
-# "prefix","tablename","csv file name","stylesheet"
-#
-# The csv file is assumed to be in the same directory as this file
-# The style sheet is assumed to be in either of the following directories:
-#     static/format/s3csv/"prefix"/
-#     static/format/s3csv/
-#     CSV path
-#
-# For details on how to import data into the system see the following:
-#     zzz_1st_run
-#     s3import::S3BulkImporter
-##########################################################################
-# Roles
-*,import_role,auth_roles.csv
-# -----------------------------------------------------------------------------
-# GIS
-#  Projections
-gis,projection,default/gis_projection.csv,projection.xsl
-#  Markers
-gis,marker,gis_marker.csv,marker.xsl
-# GIS Locations
-*,import_remote_csv,,"http://aidiq.com/eden/static/prepop/USA_L0.zip",gis,location,location.xsl
-gis,location,locations/US_L1.csv,location.xsl
-gis,location,locations/California_L2.csv,location.xsl
-*,import_remote_csv,,"http://aidiq.com/eden/static/prepop/LA_L2.zip",gis,location,location.xsl
-*,import_remote_csv,,"http://aidiq.com/eden/static/prepop/LA_L3.zip",gis,location,location.xsl
-#gis,location,locations/LA_L4.csv,location.xsl
-# GIS Config (refers to Locations & Organisations)
-gis,config,gis_config.csv,config.xsl
-gis,hierarchy,locations/US_gis_hierarchy.csv,hierarchy.xsl
-#  Layers
-gis,layer_feature,gis_layer_feature.csv,layer_feature.xsl
-# Done by WMS instead
-#gis,layer_feature,gis_layer_feature_census.csv,layer_feature.xsl
-#gis,layer_feature,gis_layer_feature_hazards.csv,layer_feature.xsl
-gis,layer_config,gis_layer_openstreetmap.csv,layer_openstreetmap.xsl
-#gis,layer_config,default/gis_layer_openweathermap.csv,layer_openweathermap.xsl
-#gis,layer_config,default/gis_layer_bing.csv,layer_bing.xsl
-#gis,layer_config,default/gis_layer_empty.csv,layer_empty.xsl
-gis,layer_config,gis_layer_google.csv,layer_google.xsl
-gis,layer_kml,gis_layer_kml.csv,layer_kml.xsl
-#gis,layer_config,default/gis_layer_tms.csv,layer_tms.xsl
-gis,layer_wfs,gis_layer_wfs.csv,layer_wfs.xsl
-gis,layer_config,gis_layer_wms.csv,layer_wms.xsl
-gis,layer_config,gis_layer_coordinate.csv,layer_coordinate.xsl
-
-# Now done via WMS
-#*,import_remote_csv,,"http://aidiq.com/eden/static/prepop/la_tsunami_risk.zip",vulnerability,risk,risk.xsl
-*,import_remote_csv,,"http://aidiq.com/eden/static/prepop/la_coalitions.zip",org,group,group.xsl
-gis,layer_feature,gis_layer_feature_coalitions.csv,layer_feature.xsl
-
-# -----------------------------------------------------------------------------
-# Resource Descriptions
-cms,post,cms_post.csv,post.xsl
-# -----------------------------------------------------------------------------
-# Types
-gis,poi_type,gis_poi_type.csv,poi_type.xsl
-project,activity_type,activity_type.csv,activity_type.xsl
-stats,demographic,stats_demographic.csv,demographic.xsl
-stats,people_type,stats_people_type.csv,people_type.xsl
-vulnerability,hazard,hazard.csv,hazard.xsl
-org,group_membership_status,org_group_membership_status.csv,group_membership_status.xsl
-# Comes in the Coalitions earlier
-#org,group,org_group.csv,group.xsl
-org,sector,org_sector.csv,sector.xsl
-org,service,org_service.csv,service.xsl
-#org,facility_type,facility_type.csv,facility_type.xsl
-
-# Stats (take a long time)
-#*,import_remote_csv,,"http://aidiq.com/eden/static/prepop/tl_2011_06_tract_LA_WGS84.zip",gis,location,location.xsl
-#*,import_remote_csv,,"http://aidiq.com/eden/static/prepop/tl_2011_06_tract_LA.zip",stats,demographic_data,demographic_data.xsl
-# END =========================================================================
\ No newline at end of file
diff --git a/private/templates/CRMT/views/_create.html b/private/templates/CRMT/views/_create.html
deleted file mode 100644
index 8fa5be3be3..0000000000
--- a/private/templates/CRMT/views/_create.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{{try:}}{{=H2(A(title_list,
-          _href = URL(args="summary")),
-          " ",
-          ICON("icon-chevron-right"),
-          " ",
-          T("Add")
-        )}}{{except:}}{{pass}}
-<div id='rheader'>
-{{try:}}{{=XML(rheader)}}
-</div>
-<div id='component'>
-{{except:}}
-</div>
-<div>
-{{pass}}
- {{include "key.html"}}
- <div class='form-container form-horizontal'>
- {{try:}}{{=form}}{{except:}}{{pass}}
- <a href='{{=URL(args="summary")}}' class='btn btn-danger cancel' type='button'>
-  {{=T("Cancel")}}
- </a>
- </div>
-</div>
diff --git a/private/templates/CRMT/views/_display.html b/private/templates/CRMT/views/_display.html
deleted file mode 100755
index 37f108c092..0000000000
--- a/private/templates/CRMT/views/_display.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{{try:}}{{=H2(A(title_list,
-                _href = URL(args="summary")),
-              " ",
-              ICON("icon-chevron-right"),
-              " ",
-              T("Details")
-              )}}{{except:}}{{pass}}
-<div id='rheader'>
-{{try:}}{{=rheader}}
-</div>
-<div id='component'>
-{{except:}}
-</div>
-<div>
-{{pass}}
- {{try:}}{{=H3(subtitle)}}{{except:}}{{pass}}
- {{try:}}{{=buttons["edit_btn"]}}{{except:}}{{pass}}
- {{try:}}{{=deduplicate}}{{except:}}{{pass}}
- {{include "last_update.html"}}
- {{try:}}{{include}}
- {{except:}}{{pass}}
- <div id='map'></div>
- <div class='item-container'>
-  {{try:}}{{=item}}{{except:}}{{pass}}
- </div>
- {{try:}}{{=buttons["delete_btn"]}}{{except:}}{{pass}}
-</div>
-{{if s3.rfooter:}}<div id='rfooter'>{{=XML(s3.rfooter)}}</div>{{pass}}
diff --git a/private/templates/CRMT/views/_summary.html b/private/templates/CRMT/views/_summary.html
deleted file mode 100644
index 0cc1fa2f83..0000000000
--- a/private/templates/CRMT/views/_summary.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{{try:}}{{=H2(title, _class="summary")}}{{except:}}{{pass}}
-<div id='summary-common'>
-{{try:}}{{for section in common:}}{{=section}}{{pass}}{{except:}}{{pass}}
-</div>
-<div id='summary-tabs'>
- <div id='summary-tab-headers'>
-  {{try:}}{{=tabs}}{{except:}}{{pass}}
- </div>
- <div id='summary-sections'>
-  {{try:}}{{for section in sections:}}{{=section}}{{pass}}{{except:}}{{pass}}
- </div>
- <div id='filter-form' class='form-container'>
-  <label id='filter-form-title'>
-   {{=T("Filter")}}
-  </label>
-  {{try:}}{{=filter_form}}{{except:}}{{pass}}
- </div>
-</div>
-{{include "dataTables.html"}}
diff --git a/private/templates/CRMT/views/_update.html b/private/templates/CRMT/views/_update.html
deleted file mode 100644
index d86f4568e3..0000000000
--- a/private/templates/CRMT/views/_update.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{{try:}}{{=H2(A(title_list,
-                _href = URL(args="summary")),
-              " ",
-              ICON("icon-chevron-right"),
-              " ",
-              T("Update")
-              )}}{{except:}}{{pass}}
-<div id='rheader'>
-{{try:}}{{=XML(rheader)}}
- </div>
- <div id='component'>
-{{except:}}
-</div>
- {{pass}}
-{{try:}}{{=H3(subtitle)}}{{except:}}{{pass}}
-{{try:}}{{=buttons["delete_btn"]}}{{except:}}{{pass}}
-{{try:}}{{=deduplicate}}{{except:}}{{pass}}
-<div id='map'></div>
-{{include "last_update.html"}}
-{{include "key.html"}}
-<div class='form-container'>
-{{try:}}{{=form}}{{except:}}{{pass}}
-</div>
-{{if s3.rfooter:}}<div id='rfooter'>{{=XML(s3.rfooter)}}</div>{{pass}}
diff --git a/private/templates/CRMT/views/filters.html b/private/templates/CRMT/views/filters.html
deleted file mode 100644
index 29e5527478..0000000000
--- a/private/templates/CRMT/views/filters.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{{extend "layout.html"}}
-{{try:}}{{=H2(title)}}{{except:}}{{pass}}
-{{try:}}{{if list_filter_form:}}
-<div id='list-filter' class='form-container'>
-{{=list_filter_form}}
-</div>
-{{pass}}
-{{except:}}{{pass}}
-<div id='dl-container'>
-{{=items}}
-</div>
-{{include "dataLists.html"}}
diff --git a/private/templates/CRMT/views/index.html b/private/templates/CRMT/views/index.html
deleted file mode 100644
index 5087965174..0000000000
--- a/private/templates/CRMT/views/index.html
+++ /dev/null
@@ -1,57 +0,0 @@
-{{extend "layout.html"}}{{theme=response.s3.theme}}
-<div class='banner'>
-  <img class='banner' src='/{{=appname}}/static/themes/{{=theme}}/img/LA.jpg' alt='Banner'/>
-  <div class='banner-btns'>
-    <a class='btn' href='/{{=appname}}/default/video'><i class='icon-youtube-play'></i> {{=T("Video Tutorials")}}</a>
-    {{if not auth.is_logged_in():}}
-    <a class='btn' href='/{{=appname}}/default/user/register'><i class='icon-check'></i> {{=T("Register")}}</a>
-    <a class='btn' href='/{{=appname}}/default/user/login'><i class='icon-signin'></i> {{=T("Login")}}</a>
-    {{pass}}
-  </div>
-  <div class='title'>
-    <h1>Sahana</h1>
-    <h2>{{=settings.get_system_name()}}</h2>
-  </div>
-</div>
-<div class='row'>
- <div class='span8'>
-  <div class='row'>
-   <div class='span4'>
-    <div class='intro'>
-     <h3>Understand Your </br>Community's Resilience</h3>
-     <p>Make maps and charts to picture and understand your community's resilience.</p>
-    </div>
-   </div>
-   <div class='span4'>
-    <div class='updates'>
-     <h3>Updates</h3>
-     {{=filter_form}}
-     {{=updates}}
-    </div>
-   </div>
-  </div>
-  <div class='row'>
-   <a class='btn map-btn' href='/{{=appname}}/gis/index'><i class='icon-globe'></i> {{=T("Make a Map")}}</a>
-   <div class='span8 map'>
-    {{=XML(map)}}
-   </div>
-  </div>
- </div>
- <div class='span4'>
-  <div class='community-data'>
-   <h3>All Your Data In One Place</h3>
-   <p>Manage data about the  resources, hazards and activities which affect your community resilience.</p>
-   {{for opt in response.menu:}}
-    <a href='{{=opt["url"]}}/summary'>
-     <i class='{{=opt["icon"]}}'></i> {{=opt["name"]}}
-    </a>     {{=opt["cms"]}}
-       <!--  
-       <a href='{{=opt["url"]}}/summary' class="btn btn-info btn-large menu" type="button">
-        <i class='{{=opt["icon"]}}'></i> {{=opt["name"]}}
-       </a>
-       <a href='{{=opt["url"]}}/create' class="btn btn-info btn-large create" type="button"><i class='icon-plus'></i></a>
-        -->
-   {{pass}}
-  </div>
- </div>
-</div>
diff --git a/private/templates/CRMT/views/layout.html b/private/templates/CRMT/views/layout.html
deleted file mode 100644
index 9123372dfc..0000000000
--- a/private/templates/CRMT/views/layout.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="{{=T.accepted_language or "en"}}">{{# class="no-js" needed for modernizr }}
-<head>{{theme=response.s3.theme}}
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-{{# Always force latest IE rendering engine (even in intranet) & Chrome Frame }}
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-<title>Sahana - {{try:}}{{=title}}{{except:}}{{=response.title or settings.get_system_name_short()}}{{pass}}</title>
-{{if response.refresh:}}{{=XML(response.refresh)}}{{pass}}
-{{# http://dev.w3.org/html5/markup/meta.name.html }}
-<meta name="application-name" content="{{=appname}}" />
-{{# Set your site up with Google: http://google.com/webmasters }}
-{{# <meta name="google-site-verification" content="" /> }}
-{{a="""<!--  Mobile Viewport Fix
- j.mp/mobileviewport & davidbcalhoun.com/2010/viewport-metatag
- device-width: Occupy full width of the screen in its current orientation
- initial-scale = 1.0 retains dimensions instead of zooming out if page height > device height
- maximum-scale = 1.0 retains dimensions instead of zooming in if page width < device width
---> """}}
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
-<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
-<!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" />
-<![endif]-->
-{{# Place favicon.ico and apple-touch-icon.png in the root of your domain and delete these references }}
-<link rel="shortcut icon" href="/{{=appname}}/static/favicon.ico" type="image/x-icon" />
-{{# <link rel="apple-touch-icon" href="/=appname/static/favicon.png" /> }}
-{{# All JavaScript at the bottom, except for Modernizr which enables HTML5 elements & feature detects }}{{# This kills the map in IE8: VML.js }}
-{{#<script src="/=appname/static/scripts/modernizr.min.js"></script>}}
-{{for sheet in s3.external_stylesheets:}}
- <link href="{{=sheet}}" rel="stylesheet" type="text/css" />
-{{pass}}
-{{for sheet in s3.stylesheets:}}
- <link href="/{{=appname}}/static/styles/{{=sheet}}" rel="stylesheet" type="text/css" />
-{{pass}}
-{{include "bootstrap_css.html"}}
-{{if s3.debug:}}{{=s3base.s3_include_debug_css()}}{{else:}}
- {{# Built by /static/scripts/tools/build.sahana.py }}
- <link href="/{{=appname}}/static/themes/{{=theme}}/eden.min.css" rel="stylesheet" type="text/css" />
-{{pass}}
-<!--[if IE]>
- <link rel="stylesheet" type="text/css" href="/{{=appname}}/static/themes/{{=theme}}/ie.css"></link>
-<![endif]-->
-{{include "scripts_top.html"}}
-</head>
-{{try:}}
- {{if r.representation == "popup":}}{{representation = "popup"}}
- {{elif r.representation == "iframe":}}{{representation = "iframe"}}
- {{else:}}{{representation = ""}}{{pass}}
-{{except:}}{{representation = ""}}{{pass}}
-{{if representation == "popup":}}
- <body class='popup'>
- {{if response.flash or response.confirmation:}}{{include "layout_popup.html"}}
- {{else:}}{{include}}{{pass}}
- {{if s3.debug:}}{{s3.scripts.append(URL(c="static", f="scripts", args=["S3", "s3.popup.js"]))}}
- {{else:}}{{s3.scripts.append(URL(c="static", f="scripts", args=["S3", "s3.popup.min.js"]))}}{{pass}}
-{{elif representation == "iframe":}}
- {{include "layout_iframe.html"}}
- {{include}}
-{{else:}}
-<body data-spy='scroll'>
-<div class='navbar navbar-fixed-top'>
- <div class='navbar-inner'>
-  <div class='container'>
-   <button type='button' class='btn btn-navbar' data-toggle='collapse' data-target='.nav-collapse'>
-    <span class='icon-bar'></span>
-    <span class='icon-bar'></span>
-    <span class='icon-bar'></span>
-   </button>
-   <div class='nav-collapse collapse'>
-    <ul class='nav'>
-     <li><a class='home' href='/{{=appname}}/default/index'><img src='/{{=appname}}/static/img/sahanalarge_14.png' alt='Sahana'/></a></li>
-     <li><a class='map' href='/{{=appname}}/gis/index'><i class='icon-globe'></i> {{=T("Make a Map")}}</a></li>
-     <li class='dropdown'> <a href='#' class='dropdown-toggle top-level community-data-menu' data-toggle='dropdown'><i class='icon-folder-open-alt'></i> {{=T("Explore Community Data")}}<b class='caret'></b></a>
-      <ul class='dropdown-menu community-data-menu' role='menu' aria-labelledby='profiles'>
-       {{for opt in response.menu:}}
-        <li role='menuitem'>
-         <a href='{{=opt["url"]}}/summary' tabindex='-1' class='menu-item'> <i class='{{=opt["icon"]}}'></i> {{=opt["name"]}}</a>
-         <!-- <a href='{{=opt["url"]}}/create' tabindex='-1' class='menu-item create'> <i class='icon-plus'></i></a>  -->
-        </li>
-       {{pass}}
-      </ul>
-     </li>
-    </ul>
-    <ul class='nav pull-right'>
-     {{if auth.is_logged_in():}}
-     <li class='dropdown'><a href='#' class='dropdown-toggle' data-toggle='dropdown'><i class='icon-cog'></i><b class='caret'></b></a>
-      <ul class='dropdown-menu'>
-       {{if auth.s3_has_role("ADMIN"):}}
-       <li><a href='/{{=appname}}/admin/user'><i class='icon-cogs'></i> {{=T("Admin")}}</a></li>
-       {{pass}}
-       <li><a href='/{{=appname}}/pr/person'><i class='icon-list'></i> {{=T("Contact People")}}</a></li>
-       <li class='divider'></li>
-       <li><a href='/{{=appname}}/default/person'><i class='icon-user'></i> {{=auth.user.email}}</a></li>
-       <li><a href='/{{=appname}}/default/index/filters'><i class='icon-filter'></i> {{=T("Saved Filters")}}</a></li>
-       <li><a href='/{{=appname}}/gis/config'><i class='icon-globe'></i> {{=T("Saved Maps")}}</a></li>
-       <li><a href='/{{=appname}}/default/user/change_password'><i class='icon-lock'></i> {{=T("Change Password")}}</a></li>
-       <li><a href='/{{=appname}}/default/user/logout'><i class='icon-off'></i> {{=T("Logout")}}</a></li>
-       <!--<li><a href='/{{=appname}}/default/user/register'><i class='icon-check'></i> {{=T("Register")}}</a></li>-->
-      </ul>
-     </li>
-     {{else:}}{{if request.controller == "default" and request.function == "user" or "login" in request.args:}} {{else:}}
-     <li class='dropdown'><a href='#' class='dropdown-toggle' data-toggle='dropdown'><i class='icon-signin'></i><b class='caret'></b></a>
-      <ul class='dropdown-menu'>
-      {{=auth.login(inline=True,
-                    lost_pw_link=False,
-                    next=URL(c=request.controller,
-                             f=request.function,
-                             args=request.args,
-                             vars=request.get_vars))}}
-      </ul>
-     </li>
-     {{pass}}{{pass}}
-     <li class='dropdown'><a href='#' class='dropdown-toggle' data-toggle='dropdown'><i class='icon-comment-alt'></i><b class='caret'></b></a>
-      <ul class='dropdown-menu'>
-       {{get_vars = request.get_vars}}
-       {{language = response.s3.language}}
-       {{icon = {"en":"icon-check"}.get(language, "icon-check-empty")}}
-       {{lang_vars = dict(_language="en")}}{{for var in get_vars:}}{{if var != "_language":}}{{lang_vars[var] = get_vars[var]}}{{pass}}{{pass}}
-       <li><a href='{{=URL(args=request.args, vars=lang_vars)}}'><i class='{{=icon}}'></i> English</a></li>
-       {{icon = {"es":"icon-check"}.get(language, "icon-check-empty")}}
-       {{lang_vars = dict(_language="es")}}{{for var in get_vars:}}{{if var != "_language":}}{{lang_vars[var] = get_vars[var]}}{{pass}}{{pass}}
-       <li><a href='{{=URL(args=request.args, vars=lang_vars)}}'><i class='{{=icon}}'></i> Español</a></li>
-      </ul>
-     </li>
-     <li class='dropdown'><a href='#' class='dropdown-toggle' data-toggle='dropdown'><i class='icon-question-sign'></i><b class='caret'></b></a>
-      <ul class='dropdown-menu'>
-        <li><a href='/{{=appname}}/default/video'><i class='icon-youtube-play'></i> {{=T("Video Tutorials")}}</a></li>
-        <li><a href='http://lacrmt.sahanafoundation.org/eden/static/themes/CRMT/SahanaUserManual.pdf'><i class='icon-book'></i> {{=T("User Manual")}}</a></li>
-      </ul>
-     </li>
-    </ul>
-   </div>
-  </div>
- </div>
-</div>
-<div class='container'>
- <div id='alert-space'>
-  {{if response.error:}}<div class='alert alert-error'><button type='button' class='close' data-dismiss='alert'>×</button>{{=response.error}}</div>{{pass}}
-  {{if response.warning:}}<div class='alert alert-warning'><button type='button' class='close' data-dismiss='alert'>×</button>{{=response.warning}}</div>{{pass}}
-  {{if response.information:}}<div class='alert alert-info'><button type='button' class='close' data-dismiss='alert'>×</button>{{=response.information}}</div>{{pass}}
-  {{if response.confirmation:}}<div class='alert alert-success'><button type='button' class='close' data-dismiss='alert'>×</button>{{=response.confirmation}}</div>{{pass}}
-  {{if response.flash:}}<div class='alert alert-success'><button type='button' class='close' data-dismiss='alert'>×</button>{{=response.flash}}</div>{{pass}}
- </div>
- {{include}}
-</div>
-<div id='footer'>
- {{include "../private/templates/%s/views/footer.html" % response.s3.theme}}
- {{if s3.debug:}}{{=s3.toolbar()}}{{pass}}
-</div>
-{{pass}}
-{{include "bootstrap_js.html"}}
-{{include "scripts.html"}}
-</body>
-</html>
\ No newline at end of file
diff --git a/private/templates/CRMT/views/login.html b/private/templates/CRMT/views/login.html
deleted file mode 100644
index f38e821d99..0000000000
--- a/private/templates/CRMT/views/login.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{{extend "layout.html"}}
-{{=form}}
\ No newline at end of file
diff --git a/private/templates/CRMT2/Demo/LMS_sample_orgs.csv b/private/templates/CRMT2/Demo/LMS_sample_orgs.csv
deleted file mode 100644
index e7b00b79cb..0000000000
--- a/private/templates/CRMT2/Demo/LMS_sample_orgs.csv
+++ /dev/null
@@ -1,148 +0,0 @@
-Organisation,Comments,Service,SubService,SubSubService,Phone,Website
-LA County Sanitation Districts,The Districts provide sanitation services for Los Angeles County.,Environment,Hazardous Waste Disposal,,"FAX (562) 699-5422, Main Office Administrative (562) 699-7411, Service/Intake and Administration (562) 908-4288, Household Hazardous Waste Information Only (800) 238-0172, Household Hazardous Waste Hotline/Talkline/Warmline (800) 238-0173, L.A. area Ser",www.lacsd.org
-LA County Sheriff's Department,"The department provides correctional programs, disaster services, environmental services, holiday assistance, law enforcement services, substance abuse services and youth services for the unincorporated areas of Los Angeles County and contracting cities.",Environment,Hazardous Waste Disposal,,"Service/Intake (909) 450-2700, Service/Intake (909) 599-1261, Non-Emergency Service/Intake (626) 332-1184",www.lasd.org
-LA County Sheriff's Department,"The department provides correctional programs, disaster services, environmental services, holiday assistance, law enforcement services, substance abuse services and youth services for the unincorporated areas of Los Angeles County and contracting cities.",Environment,Hazardous Waste Disposal,,Service/Intake and Administration (323) 820-6700,www.lasd.org
-California Department of Community Services & Development,The program provides financial assistance to low-income households in Los Angeles County.,Environment,Conservation Programs,,"HEAP Application Requests Service/Intake (888) 351-4061, Information Only (562) 264-3900",www.csd.ca.gov
-California Department of Community Services & Development,The program provides financial assistance to low-income households in Los Angeles County.,Environment,Conservation Programs,,"FAX (818) 894-1329, test number Administration (818) 555-1234, Home Energy Assistance Program Service/Intake (818) 891-4148, Community Enhancement Weatherization Application Service/Intake (818) 895-8529, Home Energy Assistance Program Service/Intake (81",www.csd.ca.gov
-Computech for Humanity,"Monday through Friday, 9:00am to 5:00pm.",Environment,Recycling,,"FAX (818) 230-5182, Service/Intake and Administration (818) 762-4498",www.computechforhumanity.org
-City of Los Angeles Bureau of Sanitation,The program provides sanitation and recycling services for hazardous waste materials to the people of Los Angeles County.,Environment,Hazardous Waste Disposal,,Customer Service - 800-98-TOXIC Service/Intake (800) 988-6942,www.lacitysan.org/solid_resources/special/hhw/safe_centers/index.htm
-City of Los Angeles Bureau of Sanitation,The program provides sanitation and recycling services for hazardous waste materials to the people of Los Angeles County.,Environment,Recycling,,Customer Service - 800-98-TOXIC Service/Intake (800) 988-6942,www.lacitysan.org/solid_resources/special/hhw/safe_centers/index.htm
-People Who Care Youth Center,The center provides family life education and youth services for people who live in South Los Angeles.,Arts and Recreation,Recreation Centers,,"Service/Intake (323) 778-8905, FAX (323) 778-9060",www.pwcyc.org
-California Aquatic Therapy and Wellness Center,The agency provides aquatic therapy and hydrotherapeutic exercise classes for people who have physical or mental disabilities and people who are elderly.,Arts and Recreation,Recreation Programs,,"Service/Intake (310) 537-2224, FAX (310) 537-2255",www.caaquatictherapy.com
-Koreatown Youth & Community Center,"The agency provides business services, child care, conservation, counseling services, housing services, and youth services to residents of Koreatown.",Arts and Recreation,Recreation Programs,,"FAX (213) 927-0017, Service/Intake and Administration (213) 365-7400, Property Management Co. Administrative (213) 482-1600, Property Management Co. Service/Intake (213) 482-1600",www.kyccla.org
-Salvation Army,The agency provides counseling services and recreational programs for people who live in central Los Angeles.,Arts and Recreation,Recreation Programs,,Service/Intake (213) 896-9178,www.salvationarmy-socal.org
-Salvation Army,The agency provides pastoral counseling services and recreational programs for people in the Hollywood area.,Arts and Recreation,Recreation Programs,,"General Information Service/Intake and Administration (323) 960-0640, Weingart Youth Center - After School Program Service/Intake (323) 960-0643",www.salvationarmy-socal.org
-Beach Cities Health District,"The agency provides health services to individuals age 0 to 65 and services for older adults age 60 and older or disabled adults age 18 and older, who live in the Beach Cities of Manhattan Beach, Redondo Beach and Hermosa Beach.",Arts and Recreation,Recreation Programs,,"Service/Intake and Administration (310) 374-3426, Senior exercise programs Information Only (310) 347-3426, FAX (310) 374-1242",www.bchd.org
-Asian Youth Center,"The agency provides health services and youth services for youth and young adults, age 6 to 18, in the San Gabriel Valley and from satellites in Los Angeles and Lancaster.",Arts and Recreation,Recreation Centers,,"Case/Care Management for Pregnant and Postpartum Women Service/Intake (626) 731-1161, Service/Intake and Administration (626) 309-0622, FAX (626) 309-0717",www.asianyouthcenter.org
-City of Baldwin Park Department of Recreation and Community Services,"The Baldwin Park Recreation and Community Services Department provides counseling services, emergency food, health services, personal goods, services for older adults, transportation and youth services for people who live in Baldwin Park including specia",Arts and Recreation,Recreation Programs,,"Service/Intake (626) 813-5245, Senior Center number ext. 323 Service/Intake (626) 813-5245 Ext.323",www.baldwinpark.com
-City of Baldwin Park Department of Recreation and Community Services,"The Baldwin Park Recreation and Community Services Department provides counseling services, emergency food, health services, personal goods, services for older adults, transportation and youth services for people who live in Baldwin Park including specia",Arts and Recreation,Recreation Centers,,"Service/Intake (626) 813-5245, Senior Center number ext. 323 Service/Intake (626) 813-5245 Ext.323",www.baldwinpark.com
-City of Claremont Senior Services,"The center provides advocacy, cooling center, health services, housing services, nutrition services, and services for older adults, age 55 and older, and for people who live in the City of Claremont.",Arts and Recreation,Recreation Programs,,"Senior HelpLine/Housing Info Service/Intake (909) 625-4600, Service/Intake (909) 399-5488, FAX (909) 621-7320",www.ci.claremont.ca.us
-City of Burbank Redevelopment Agency,The Housing Authority provides housing services in the City of Burbank.,Social Services,Housing Assistance and Information,,"FAX (818) 238-5159, Service/Intake (818) 238-5160",www.burbankca.org/redevelopment/housing/
-City of Burbank Redevelopment Agency,The Housing Authority provides housing services in the City of Burbank.,Social Services,Public Housing,,"FAX (818) 238-5159, Service/Intake (818) 238-5160",www.burbankca.org/redevelopment/housing/
-Institute For Multicultural Counseling and Education Services Inc,"The institute provides counseling services, domestic violence services, education services, and legal services for people who live in Los Angeles County.",Social Services,Domestic Violence Services,,"FAX (213) 383-4803, Service/Intake and Administration (213) 381-1250",imces.org
-Institute For Multicultural Counseling and Education Services Inc,"The institute provides counseling services, domestic violence services, education services, and legal services for people who live in Los Angeles County.",Social Services,Domestic Violence Services,,"Service/Intake (818) 240-4311, FAX (818) 240-4318",imces.org
-LA County Superior Court ,"The Juvenile Dependency Court, a part of the Superior Court, has jurisdiction over cases which involve minors who may be victims of abuse or neglect.",Social Services,Adoption,,"Court Clerks Office Service/Intake and Administration (323) 526-6645, Administrative (323) 526-6610, Adoptions Unit - Records Service/Intake (323) 526-6343, DCFS Court Liaison Service/Intake (323) 526-6790, 211 L A Project, Lyz Melendez Service/Intake",www.lasuperiorcourt.org
-LA County Superior Court ,"The Juvenile Dependency Court, a part of the Superior Court, has jurisdiction over cases which involve minors who may be victims of abuse or neglect.",Social Services,Adoption,,Dependency Court Clerk Service/Intake (661) 945-6447,www.lasuperiorcourt.org
-Assistance League,"The league provides financial assistance, health services, library services and thrift shops for people who live in the Whittier area.",Social Services,Payment Assistance,,Service/Intake (562) 693-6533,whittier.assistanceleague.org/dcontact.cfm
-Bargain Bin Thrift Store,"The league provides financial assistance, health services, library services and thrift shops for people who live in the Whittier area.",Social Services,Thrift Shops,,Service/Intake (562) 698-7012,whittier.assistanceleague.org/dcontact.cfm
-LA County Department of Public Health,The agency provides public safety services to individuals in Los Angeles County.,Social Services,Public Information Services,,"Child Passenger Safety Seat Inspections Service/Intake (866) 732-8243, Administrative (213) 351-7888, FAX (213) 351-2713",www.publichealth.lacounty.gov/IVPP
-St. Francis Medical Center,"The medical center provides child abuse services, health education, hospital services, WIA programs, and youth services for people of all ages who live in Southeast Los Angeles County.",Social Services,Job Training,,"Service/Intake (800) 603-9355, Service/Intake and Administration (310) 900-8050",www.stfrancismedicalcenter.com
-People Who Care Youth Center,The center provides family life education and youth services for people who live in South Los Angeles.,Education,Guidance and Tutoring Programs,,"Service/Intake (323) 778-8905, FAX (323) 778-9060",www.pwcyc.org
-Vista Del Mar Child and Family Services,"The center provides counseling services for children, adolescents, and young adults age zero to 25 and their families who live primarily, in the West Los Angeles area.",Education,Adult Education,,"Service/Intake (310) 204-1666 Ext.356, Intake Service/Intake (310) 204-1666 Ext.407, Service Service/Intake (310) 204-1666 Ext.356",
-Toberman Neighborhood Center,"The agency provides advocacy, counseling services, emergency food, holiday assistance, personal goods, recreational programs, substance abuse services, utility bill assistance, volunteer opportunities and youth services.",Education,Early Childhood Education and Head Start,,"FAX (310) 832-6712, Service/Intake and Administration (310) 832-1145",www.toberman.org
-Bienvenidos Children's Center,"The agency provides child abuse services, family support services, foster care services, health services, and substance abuse services for families throughout the San Gabriel Valley.",Education,Special Curriculum Schools and Programs,,"FAX (323) 726-9789, Service/Intake (323) 726-9790, CARE Central Intake/Assessment Service/Intake (323) 726-9777",www.bienvenidos.org
-Para Los Niños,"The agency provides child care, child abuse services, counseling services, family life education, school readiness for children, ages 0 to 5, and youth services to families who live in the Los Angeles area, including downtown Los Angeles, East Los Angele",Education,Early Childhood Education and Head Start,,Service/Intake (213) 413-1466,www.paralosninos.org
-Para Los Niños,"The agency provides child care, child abuse services, counseling services, family life education, school readiness for children, ages 0 to 5, and youth services to families who live in the Los Angeles area, including downtown Los Angeles, East Los Angele",Education,Guidance and Tutoring Programs,,"Service/Intake (213) 623-3942 Ext.222, Service/Intake (213) 623-3942 Ext.227",www.paralosninos.org
-El Nido Family Centers,The agency provides counseling services and family life education for youth and their families in Los Angeles.,Education,Early Childhood Education and Head Start,,"FAX (323) 753-1222, Service/Intake (323) 971-7360",www.elnidofamilycenters.org
-New Directions for Youth,"The agency provides counseling services, education services and youth services for people in the San Fernando, Santa Clarita, and Antelope Valleys.",Education,Adult Education,,"Service/Intake (818) 503-6330, FAX (818) 982-6339",www.ndfy.org
-Kheper Life Enrichment Institute,"The agency provides counseling, domestic violence services, family life education, substance abuse services and youth services in Los Angeles County.",Education,Guidance and Tutoring Programs,,"FAX (323) 750-7540, Service/Intake and Administration (323) 750-7550",
-MEND Poverty,"The agency provides education services, emergency food, employment services, health services, holiday assistance, household goods, and personal goods for low-income people who live in the northeast part of the San Fernando Valley.",Education,Adult Education,,"FAX (818) 897-0128, Service/Intake (818) 896-0246, Dental Clinic Direct Line Service/Intake (818) 686-7355, Information Only (818) 897-2443, Front Desk Service/Intake and Administration (818) 686-7300",www.mendpoverty.org
-US Postal Service,,Postal,Post Offices,,,www.usps.com
-US Postal Service,,Postal,USPS Bulk Mail Centers,,,
-DHL,,Postal,DHL Locations,Drop Box,,
-DHL,,Postal,DHL Locations,DHL Staffed Facility,,
-DHL,,Postal,DHL Locations,,,
-DHL,,Postal,DHL Locations,Drop Off Facility,,
-Federal Express,,Postal,Federal Express Locations,Self-Service,,
-Federal Express,,Postal,Federal Express Locations,Authorized Ship Center,,
-Federal Express,,Postal,Federal Express Locations,Fed Ex Staffed,,
-US Postal Service,,Postal,Post Offices,,,
-Yellow Transportation Incorporated,,Postal,Private Non Retail Shipping Locations,,,
-Roadway Incorporated,,Postal,Private Non Retail Shipping Locations,,,
-ABF Freight System,,Postal,Private Non Retail Shipping Locations,,,
-DHL,,Postal,Private Non Retail Shipping Locations,,,
-Federal Express,,Postal,Private Non Retail Shipping Locations,,,
-Con-Way Freight,,Postal,Private Non Retail Shipping Locations,,,
-UPS,,Postal,Private Non Retail Shipping Locations,,,
-UPS,,Postal,UPS Locations,,,
-Glendora Mini-Bus,"The Agency Provides Employment Services, Health Services, Information and Referral, Recreational Programs, Services for Older Adults and Transportation For People of All Ages Who Live, Primarily in Glendora.",Transportation,Transit Systems,,,www.ci.glendora.ca.us/departments-services/parks-recreation-senior-services/transportation-glendora-mini-bus
-Healthlink Medi-Van,"The Agency Provides Transportation For People in Southern California. Services include Disabled Transportation and Senior Ride Programs. There are Age, Disability and Income Restrictions for Services.",Transportation,Transit Systems,,,www.hlmv.com
-Gardena Special Transit,"The Agency Provides Transportation Services for Adults, Age 60 and Older and for Disabled People of any Age who Reside in the Agency's Designated Service Area.",Transportation,Transit Systems,,,www.ci.gardena.ca.us/government/Transportation
-LA Metro,The Agency Provides Transportation Services for Residents of Los Angeles County.,Transportation,Transit Systems,,,www.metro.net
-Foothill Transit,The Agency Provides Transportation Services for Residents of Los Angeles County. There are no Geographic Restrictions,Transportation,Transit Systems,,,www.foothilltransit.org
-Big Blue Bus,"The Bus Line Provides Public Transportation for People in the City of Santa Monica, the West Los Angeles area, Downtown Los Angeles, the Los Angeles International Airport, and the Metro Green Line Station.",Transportation,Transit Systems,,,www.bigbluebus.com
-Norwalk Transit System,The Department Provides Public Transportation Services for People with Disabilities of all Ages. Geographic Restrictions apply for some services.,Transportation,Transit Systems,,,www.ci.norwalk.ca.us
-Santa Clarita Transit,The Program Provides Transportation for Residents in the City of Santa Clarita.,Transportation,Transit Systems,,,www.santa-clarita.com/cityhall/field/transit/
-Burbank Transportation Service,The Program Provides Transportation for Seniors Age 60 and Older and for People of any Age who have Disabilities and Live in the City of Burbank. Local Transportation also includes Shuttle Services for Burbank Residents.,Transportation,Transit Systems,,,www.ci.burbank.ca.us
-LADOT Transit Services - Cityride,This is a Transportation Service for Residents of the City of Los Angeles.,Transportation,Transit Systems,,,www.ladottransit.com/other/cityride
-Residential Program,"Case Management, Crisis Intervention, Full Service Partnership, Medication Support, Mental Health Services, Psych Testing, Therapeutic Behavioral Services (Tbs)<Br>Languages Spoken: English",Health and Mental Health,Mental Health Programs,,(661) 942-5749,
-Jewish Family Service of Los Angeles,"Case Management, Medication Support, Mental Health Services",Health and Mental Health,Mental Health Counseling,,562490-7600,
-Foothill Family Services,"Case Management, Mental Health Promotion, Crisis Intervention, Medication Support, Mental Health Services, Psych Testing",Health and Mental Health,Mental Health Counseling,,(626) 395-7100,
-Fuller Psychological and Family Services,"Day Treatment, Full Service Partnership, Medication Support, Mental Health Services, Psych Testing, Residential",Health and Mental Health,Mental Health Counseling,,(213) 252-2100,
-Olive Vista,"Medication Support, Mental Health Services<Br>Languages Spoken: English, Spanish",Health and Mental Health,Mental Health Programs,,(661) 259-9439,
-Visiting Nurses Association,The agency provides end of life services and in-home health services for people in the San Fernando and San Gabriel Valleys and parts of Los Angeles.,Health and Mental Health,Health Clinics,,"Service/Intake and Administration (626) 568-2588, FAX (626) 568-2590",www.vnahhs.com
-Valley Trauma Counseling Center ,The center provides sexual assault services and family support services primarily for survivors of all interpersonal violence who live in the San Fernando Valley and Santa Clarita Valley,Health and Mental Health,Mental Health Programs,,"24 hours/7days Service/Intake and Hotline (818) 886-0453, Administrative (818) 756-5330, FAX (818) 756-5443",www.csun.edu/vtc
-Planned Parenthood - Pasadena and San Gabriel Valley,The agency provides family planning services for people of all ages in Los Angeles County.,Health and Mental Health,Health Clinics,,"Administrative (626) 794-5737, Appointments Service/Intake (626) 798-0706",www.pppasadena.org
-Planned Parenthood - Pasadena and San Gabriel Valley,The agency provides family planning services for people of all ages in Los Angeles County.,Health and Mental Health,Health Education and Counseling,,"Administrative (626) 794-5737, Appointments Service/Intake (626) 798-0706",www.pppasadena.org
-Planned Parenthood - Pasadena and San Gabriel Valley,The agency provides family planning services for people of all ages in Los Angeles County.,Health and Mental Health,Health Screening and Testing,,"Administrative (626) 794-5737, Appointments Service/Intake (626) 798-0706",www.pppasadena.org
-Los Angeles International Internet Exchange (LAIIX),,Communications,Internet Exchange Points,,718-355-2500,www.laiix.net
-Mae West,,Communications,Internet Exchange Points,,213-627-0874,www.mae.net/fac/mae-west.htm
-Switch and Data/PAIX,,Communications,Internet Exchange Points,,815-207-7700,www.switchanddata.com
-Pacific Wave,,Communications,Internet Exchange Points,,888-722-9283,www.pacificwave.net
-Pacific Wave,,Communications,Internet Exchange Points,,888-722-9283,www.pacificwave.net
-Any2 Packet Exchange Los Angeles,,Communications,Internet Exchange Points,,213-327-1223,www.onewilshire.com/meet_me_room/any2.htm
-United Online/Net Zero,,Communications,Internet Service Providers,,800-560-7429,www.netzero.net
-Agenda Media Services,,Communications,Internet Service Providers,,818-990-5343,www.agenda.net
-Am6 Networks,,Communications,Internet Service Providers,,877-743-3266,www.am6.net
-Antelecom,,Communications,Internet Service Providers,,661-726-3516,www.antelecom.net
-Boingo Wireless,,Communications,Internet Service Providers,,310-586-5180,www.boingo.com
-Family Planning Associates Medical Group,The agency administers clinics which provide family planning services for women age 12 years and older who live in Los Angeles County.,Government,Government Offices,,"After 5pm, Tuesday - Saturday Service/Intake (800) 821-1318, Service/Intake and Administration (562) 862-5121, FAX (562) 426-4227, Appointments Service/Intake (877) 883-7264",www.fpamg.net
-El Nido Family Centers,The agency provides counseling services and family life education for youth and their families in Los Angeles.,Government,Government Offices,,"Service/Intake and Administration (818) 830-3646, FAX (818) 891-6547",www.elnidofamilycenters.org
-Children's Hospital Los Angeles,The agency provides health services and homeless support services for youth age 12 to 24 in the Hollywood area.,Government,Government Offices,,"Administrative (323) 361-2390, Appointments Service/Intake (323) 653-1990, Medi-Cal, HMO and Patients under 21 Service/Intake (323) 337-1775",www.childrenshospitalla.org/site/c.ipINKTOAJsG/b.4452451/
-American Health Services,"The agency provides health services, mental health services and substance abuse services for people of all ages who live in the Los Angeles County area.",Government,Government Offices,,"Administrative (661) 254-6630, FAX (661) 254-6644, Suboxone Detox Services/Drug Testing Services Service/Intake (877) 557-7826",www.americanhealthservices.org
-LA County Department of Mental Health,The department provides mental health services for people in Los Angeles County.,Government,Government Offices,,"Medi-Cal Professionals Unit Service/Intake (213) 738-2466, Training Division Administrative (213) 251-6854, Access Line and PMRT After Hours/Weekends Service/Intake and Hotline (800) 854-7771, ACCESS Line and PMRT After Hours/Weekends TDD (562) 651-2549,",dmh.co.la.ca.us
-"LA County Public Health - Maternal, Child, & Adolescent Health",The program provides health services for low-income pregnant women who are Medi-Cal recipients and live in Los Angeles County.,Government,Government Offices,,Administrative (213) 639-6419,www.publichealth.lacounty.gov/mch
-LA County Commission For Children and Families,Advises The Board of Supervisors In Areas of Child Welfare and Family Policy.,Government,County Offices,,(213) 974-1558 (Primary),lachildrenscommission.org
-LA County Civil Service Commission,An Independent Administrative Appeals Body Established By The Los Angeles County Charter To Provide Impartial and Fair Application of The Los Angeles County Civil Service Rules.,Government,County Offices,,(213) 974-2411 (Primary),civilservice.lacountycommissions.info
-LA County - Department of Health Services,"Coordinates The County's Medical 9-1-1 System, Which Includes Fire Departments, Law Enforcement Agencies, Ambulance Companies, and Hospitals.",Government,County Offices,,(323) 890-7500 (Primary),ladhs.org/ems
-LA County Public Health - Environmental Health,"Inspects More Than 71,000 Licensed Housing Sites (Five Or More Units) and Responds To More Than 17,000 Complaints Per Year To Ensure That Residential Housing Is Safe, Sanitary and Fit For Human Habitation.",Government,County Offices,,(626) 430-5200 (Primary)<br>(888) 700-9995 (Hotline),ph.lacounty.gov/eh
-Tzu Chi Foundation,The foundation provides disaster services in the United States and internationally; and health services for low-income Los Angeles County residents.,Emergency Response,Emergency and Disaster Offices,,"Main Intake Service/Intake (626) 636-8700, FAX (626) 281-5303, Service/Intake (626) 281-3383",www.tzuchi.org
-LA County Department of Health Services,"The unit provides disaster services and inpatient mental health services for adults in the Antelope, Santa Clarita and San Fernando Valleys.",Emergency Response,Emergency and Disaster Offices,,"Administrative (818) 364-3001, Hospital Operator Information Only (818) 364-1555, Access Line and PMRT After Hours/Weekends Service/Intake (800) 854-7771, Psychiatric Service/Intake Service/Intake (800) 854-7771",www.ladhs.org/wps/portal/valleycareHomePage
-LA County Office of Emergency Management,The agency provides disaster services for Los Angeles County.,Emergency Response,Emergency and Disaster Offices,,"Emergency Survival Program - Alisa Williams Service/Intake (323) 980-2265, Preparedness Materials/English Service/Intake (213) 974-1166, Preparedness Materials/Spanish Service/Intake (213) 974-2217, Disaster Information Service/Intake and Hotline (800) 2",lacoa.org/esp.htm
-LA County Sheriff's Department,"The department provides correctional programs, disaster services, environmental services, holiday assistance, law enforcement services, substance abuse services and youth services for the unincorporated areas of Los Angeles County and contracting cities.",Emergency Response,Emergency and Disaster Offices,,Emergency Operations Bureau Service/Intake (323) 980-2200,www.lasd.org
-City of Los Angeles Animal Services Department,The department provides animal services and volunteer opportunties for people who live in the city of Los Angeles.,Emergency Response,Emergency and Disaster Offices,,"Management Office Administrative (213) 482-9558, Licensing Service/Intake (213) 482-9550, FAX (213) 482-9511, Volunteer Programs FAX (323) 224-2353, Information for Assistance Service/Intake (888) 452-7381, Volunteer Office Service/Intake (818) 374-5878",www.laanimalservices.com
-United Way of Greater Los Angeles,The agency is a community funding organization that administers services for non-profit organizations in Los Angeles County.,Emergency Response,Emergency and Disaster Offices,,Service/Intake and Administration (661) 874-4282,www.unitedwayla.org
-United Way of Greater Los Angeles,The agency is a community funding organization that administers services for non-profit organizations in Los Angeles County.,Emergency Response,Emergency and Disaster Offices,,"Auto Donations Service/Intake (800) 336-1868, Service/Intake (213) 808-6220, FAX (213) 808-6221, Service/Intake (213) 630-2100, Donor Services Service/Intake (866) 366-7335",www.unitedwayla.org
-LA County Emergency Medical Services,"Serves as the Lead Agency for the Emergency Medical Services System at the Local Level and is Responsible for Coordinating all System Participants, both Public and Private, to include Fire Departments and Law Enforcement as well as Ambulance Companies. EMS works with both the private and public sectors to bring paramedic coverage to our county's more than 10 million residents and visitors.",Emergency Response,Emergency and Disaster Offices,,(323) 890-7500 (Primary),ems.dhs.lacounty.gov
-City of Pomona,,Emergency Response,Emergency and Disaster Offices,,909-620-2201,
-City of Glendale,,Emergency Response,Emergency and Disaster Offices,,818-548-3301,
-LA County District Attorney,The program provides victims of crime support in Los Angeles County.,Public Safety,Crime Prevention and Support,,"FAX (626) 442-6543, Service/Intake (626) 575-5565",da.co.la.ca.us/vwap
-LA County District Attorney,The program provides victims of crime support in Los Angeles County.,Public Safety,Legal Services and Counseling,,"FAX (626) 442-6543, Service/Intake (626) 575-5565",da.co.la.ca.us/vwap
-UCLA Medical Center,The agency provides sexual assault services for people of all ages in Los Angeles.,Public Safety,Crime Prevention and Support,,"24 hour service and intake Service/Intake and Hotline (310) 319-4000 Ext.0, Administration (310) 319-4503",www.911rape.org
-LA County District Attorney,The program provides victims of crime support in Los Angeles County.,Public Safety,Crime Prevention and Support,,"FAX (310) 537-5675, Service/Intake (310) 603-7574, Service/Intake (310) 603-7579, Hardcore Gang Service/Intake (310) 603-7127",da.co.la.ca.us/vwap
-LA County District Attorney,The program provides victims of crime support in Los Angeles County.,Public Safety,Legal Services and Counseling,,"FAX (310) 537-5675, Service/Intake (310) 603-7574, Service/Intake (310) 603-7579, Hardcore Gang Service/Intake (310) 603-7127",da.co.la.ca.us/vwap
-LA County District Attorney,The program provides victims of crime support in Los Angeles County.,Public Safety,Crime Prevention and Support,,"Service/Intake (213) 974-9795, Service/Intake and Administration (213) 974-7499, Service/Intake (800) 380-3811, Family Violence Division Service/Intake (213) 974-9795, Service/Intake (213) 974-9795, FAX (213) 617-9720, Family Violence Division Servic",da.co.la.ca.us/vwap
-LA County District Attorney,The program provides victims of crime support in Los Angeles County.,Public Safety,Legal Services and Counseling,,"Service/Intake (213) 974-9795, Service/Intake and Administration (213) 974-7499, Service/Intake (800) 380-3811, Family Violence Division Service/Intake (213) 974-9795, Service/Intake (213) 974-9795, FAX (213) 617-9720, Family Violence Division Servic",da.co.la.ca.us/vwap
-SHIELDS for Families ,"The agency provides child abuse services, domestic violence services, family preservation services, mental health services, residential substance abuse treatment, substance abuse services, vocational education services and youth services primarily for fa",Public Safety,Crime Prevention and Support,,Service/Intake and Administration (323) 242-5000,www.shieldsforfamilies.org
-San Gabriel/Pomona Regional Center,"The center provides services for people of all ages with developmental disabilities who live in the El Monte, Foothill and Pomona Health Districts of Los Angeles County.",Public Safety,Legal Services and Counseling,,Regional Center Service/Intake and Administration (909) 620-7722,www.sgprc.org
-1736 Family Crisis Center,"The agency provides case management, counseling services, domestic violence services, family support services for low income families, runaway services, emergency and transitional shelter for battered women and their children, shelter for runaway/homeles",Public Safety,Legal Services and Counseling,,"FAX (310) 543-9910, Community Service Center Service/Intake (310) 543-9900",www.1736fcc.org
-Proyecto Pastoral,"The agency provides business services, child care, community services, homeless support services, shelter for homeless, volunteer opportunities and youth services to low-income people in the Spanish-speaking community of East Los Angeles.",Municipal Services,Community Services,,"Service/Intake (323) 881-0024, Impacto Elementary Component Service/Intake (323) 269-7552",www.proyectopastoral.org
-Proyecto Pastoral,"The agency provides business services, child care, community services, homeless support services, shelter for homeless, volunteer opportunities and youth services to low-income people in the Spanish-speaking community of East Los Angeles.",Municipal Services,Community Services,,"Service/Intake (323) 881-0024, Impacto After School Program Service/Intake (323) 881-0006",www.proyectopastoral.org
-Koreatown Youth & Community Center,"The agency provides business services, child care, conservation, counseling services, housing services, and youth services to residents of Koreatown.",Municipal Services,Community Services,,"FAX (213) 927-0017, Service/Intake and Administration (213) 365-7400, Property Management Co. Administrative (213) 482-1600, Property Management Co. Service/Intake (213) 482-1600",www.kyccla.org
-City of Pasadena,"The agency provides health services, HIV/AIDS services, substance abuse services, vital records, welfare-to-work support services and WIC services for people of all ages who live in the Pasadena area.",Municipal Services,Public Records,,"Child Health Clinic Service/Intake (626) 744-6136, Tuberculosis Clinic Service/Intake (626) 744-6024, Vital Records Service/Intake (626) 744-6010, Mobile HIV testing unit Service/Intake (626) 744-6145, Healthy Kids Enrollment Service/Intake (626) 744-608",www.cityofpasadena.net/PublicHealth/
-City of Baldwin Park Department of Recreation and Community Services,"The Baldwin Park Recreation and Community Services Department provides counseling services, emergency food, health services, personal goods, services for older adults, transportation and youth services for people who live in Baldwin Park including specia",Municipal Services,Community Services,,"Service/Intake and Administration (626) 813-5270, FAX (626) 851-3676",www.baldwinpark.com
-City of Claremont Senior Services,"The center provides advocacy, cooling center, health services, housing services, nutrition services, and services for older adults, age 55 and older, and for people who live in the City of Claremont.",Municipal Services,Community Services,,"Senior HelpLine/Housing Info Service/Intake (909) 625-4600, Service/Intake (909) 399-5488, FAX (909) 621-7320",www.ci.claremont.ca.us
-City of Claremont Senior Services,"The center provides advocacy, cooling center, health services, housing services, nutrition services, and services for older adults, age 55 and older, and for people who live in the City of Claremont.",Municipal Services,Property and Tax,,"Senior HelpLine/Housing Info Service/Intake (909) 625-4600, Service/Intake (909) 399-5488, FAX (909) 621-7320",www.ci.claremont.ca.us
-San Fernando Valley Interfaith Council,The center provides emergency food and services for older adults age 55 and older who live in the northeast San Fernando Valley.,Municipal Services,Community Services,,"Service/Intake and Administration (818) 834-6100, FAX (818) 834-6108",www.vic-la.org
-San Fernando Valley Interfaith Council,The center provides emergency food and services for older adults age 55 and older who live in the northeast San Fernando Valley.,Municipal Services,Property and Tax,,"Service/Intake and Administration (818) 834-6100, FAX (818) 834-6108",www.vic-la.org
-Salvation Army,"The center provides information and referral, recreational programs and services for older adults in the downtown and Koreatown areas of Los Angeles.",Municipal Services,Community Services,,"Service/Intake (213) 480-0714, Service/Intake (213) 480-6679, Service/Intake (213) 480-6690",
-Carson Refinery,,Private Industry,Agriculture and Food,Agriculture and Mineral Operations,,
-El Segundo Refinery,,Private Industry,Agriculture and Food,Agriculture and Mineral Operations,,
-Los Angeles Refinery,,Private Industry,Agriculture and Food,Agriculture and Mineral Operations,,
-Torrance Refinery,,Private Industry,Agriculture and Food,Agriculture and Mineral Operations,,
-Paramount Refinery,,Private Industry,Agriculture and Food,Agriculture and Mineral Operations,,
-Shell Los Angeles Refinery,,Private Industry,Agriculture and Food,Agriculture and Mineral Operations,,
-Wilmington Refinery,,Private Industry,Agriculture and Food,Agriculture and Mineral Operations,,
-Alliance Bank,,Private Industry,Banking and Finance,Bank Main Offices,310-410-9281,
-Mirae Bank,,Private Industry,Banking and Finance,Bank Main Offices,213-427-7900,
-Golden Coast Bank,,Private Industry,Banking and Finance,Bank Main Offices,562-216-6388,
-Mission of Casa de Los Angelitos,The agency operates a maternity home for women age 18 and older.,Community Groups,Volunteer Opportunities,,"FAX (310) 325-8217, Service/Intake and Administration (310) 325-8208",www.casadelosangelitos.org
-DIGNITY Los Angeles,The agency provides personal enrichment services for people of all ages.,Community Groups,Community Organizations,,Service/Intake (323) 344-8064,www.dignitylosangeles.org
-Korean Resource Center,"The agency provides advocacy, community action groups, education services, and health insurance.",Community Groups,Community Organizations,,Service/Intake (323) 937-3718,www.krcla.org
-Proyecto Pastoral,"The agency provides business services, child care, community services, homeless support services, shelter for homeless, volunteer opportunities and youth services to low-income people in the Spanish-speaking community of East Los Angeles.",Community Groups,Volunteer Opportunities,,"Service/Intake (323) 881-0024, Impacto Elementary Component Service/Intake (323) 269-7552",www.proyectopastoral.org
-Proyecto Pastoral,"The agency provides business services, child care, community services, homeless support services, shelter for homeless, volunteer opportunities and youth services to low-income people in the Spanish-speaking community of East Los Angeles.",Community Groups,Volunteer Opportunities,,"Service/Intake (323) 881-0024, Impacto After School Program Service/Intake (323) 881-0006",www.proyectopastoral.org
-Little Tokyo Service Center,"The agency provides child care, counseling services, services for older adults and youth services for Japanese immigrants and Japanese-Americans in Los Angeles County.",Community Groups,Community Organizations,,"Administrative (213) 473-3030, FAX (213) 473-3031, Child Care Programs Information Only (213) 473-1699, Head Start Program Information Only (213) 481-0227, Service/Intake (213) 473-3035, Japanese Students Hotline Hotline/Talkline/Warmline (213) 473-163",www.ltsc.org
-Salvation Army,The agency provides counseling services and recreational programs for people who live in central Los Angeles.,Community Groups,Community Organizations,,Service/Intake (213) 896-9178,www.salvationarmy-socal.org
-The Maple Counseling Center,The agency provides counseling services and volunteer opportunities for people of all ages who live or work in Beverly Hills and adjacent areas.,Community Groups,Volunteer Opportunities,,"Crisis Response Team Administrative (310) 854-8996, Mary Monreal - Volunteer Opportunities Service/Intake and Administration (310) 271-9999 Ext.224, FAX (310) 247-4910, Service/Intake and Administration (310) 271-9999",www.tmcc.org
-Grandparents as Parents,The agency provides counseling services through therapy/support groups and information and referral for grandparents or any relative caregivers who live in Los Angeles County.,Community Groups,Community Organizations,,"Corporate Office Administrative (818) 264-0880, Caregiver Center Edelman Children's Court Service/Intake (323) 526-6553, Service/Intake (562) 421-7991, Service/Intake (310) 839-2548, Service/Intake (818) 789-1177",www.grandparentsasparents.org
-MEND Poverty,"The agency provides education services, emergency food, employment services, health services, holiday assistance, household goods, and personal goods for low-income people who live in the northeast part of the San Fernando Valley.",Community Groups,Volunteer Opportunities,,"FAX (818) 897-0128, Service/Intake (818) 896-0246, Dental Clinic Direct Line Service/Intake (818) 686-7355, Information Only (818) 897-2443, Front Desk Service/Intake and Administration (818) 686-7300",www.mendpoverty.org
diff --git a/private/templates/CRMT2/Demo/organisation.csv b/private/templates/CRMT2/Demo/organisation.csv
deleted file mode 100644
index 47e36fcc1d..0000000000
--- a/private/templates/CRMT2/Demo/organisation.csv
+++ /dev/null
@@ -1,22 +0,0 @@
-Organisation,Acronym,Sectors,Services,Type,Country,Website,Twitter,Donation Phone,Comments
-LA City Emergency Management Department,EMD,"Government,Emergency Management",Emergency and Disaster Offices,Government,US,http://emergency.lacity.org,ReadyLA,,
-CERT Los Angeles,CERT,Emergency Management,Volunteer Opportunities,National NGO,US,http://www.cert-la.com,,,
-American Red Cross,ARC,"Emergency Management,Housing / Shelter",Volunteer Opportunities,Red Cross / Red Crescent,US,http://redcrossla.org,redcrossla,,
-LA Works,,Social Services,Volunteer Opportunities,National NGO,US,http://www.laworks.com,,,
-Volunteer Center of Los Angeles,VCLA,Social Services,,National NGO,US,http://www.vcla.net,,,
-Disaster Healthcare Volunteers,DHV,Emergency Management,Volunteer Opportunities,National NGO,US,http://www.lacountydhv.org,,,
-Salvation Army,,Cultural / Faith Based Organization,"Thrift Shops,Volunteer Opportunities",National NGO,US,http://www1.usw.salvationarmy.org/USW/www_usw_southcal.nsf/,,,
-Catholic Charities of Los Angeles,,Cultural / Faith Based Organization,Volunteer Opportunities,National NGO,US,http://www.catholiccharitiesla.org,,,
-California Southern Baptist Convention Disaster Relief,,Cultural / Faith Based Organization,Churches,National NGO,US,http://www.csbc.com/disasterrelief,,,
-Faithful Central Bible Church,,Cultural / Faith Based Organization,Churches,National NGO,US,http://www.faithfulcentral.com,,,
-LA Regional Food Bank,,Social Services,Food Assistance,National NGO,US,http://www.lafoodbank.org,,,
-Lutheran Social Services of the Southwest,,Cultural / Faith Based Organization,,National NGO,US,http://www.lss-sw.org,,,
-"Operation HOPE, Inc.",,Social Services,,National NGO,US,http://www.operationhope.org,,,
-Tzu Chi Foundation,,Cultural / Faith Based Organization,,National NGO,US,http://www.us.tzuchi.org/us/en/,,,
-United Way - Los Angeles,,Social Services,Volunteer Opportunities,National NGO,US,http://www.unitedwayla.org,,,
-LA City Department of Animal Services,,Government,Animals and Pets,Government,US,http://www.laanimalservices.com,,,
-LA County Chief Information Office,,Government,,Government,US,http://egis3.lacounty.gov/egis/,,,
-LA County Department of Public Health,,Government,,Government,US,http://publichealth.lacounty.gov,,,
-LA County Department of Social Services,,Government,,Government,US,http://www.ladpss.org,,,
-LA County Emergency Management Office,,"Government,Emergency Management",,Government,US,http://www.lacoa.org,,,
-Walmart,,Business,,Business,US,http://www.walmart.com,,,
diff --git a/private/templates/CRMT2/Demo/users.csv b/private/templates/CRMT2/Demo/users.csv
deleted file mode 100644
index 1978b2dffd..0000000000
--- a/private/templates/CRMT2/Demo/users.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-First Name,Last Name,Email,Password,Role,Organisation,Organisation Group,Type,Job Title
-Jeff,Beck,jeff@beck.org,eden,,CERT Los Angeles,Culver City,Staff,Coordinator
-County,Location Management System,lms@cio.lacounty.gov,eden,,Los Angeles County Chief Information Office,,Staff,Geographic Information Officer
diff --git a/private/templates/CRMT2/activity_type.csv b/private/templates/CRMT2/activity_type.csv
deleted file mode 100644
index e0aedc341c..0000000000
--- a/private/templates/CRMT2/activity_type.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-Name
-Training
-Outreach
-Meetings
-Community Events
\ No newline at end of file
diff --git a/private/templates/CRMT2/facility_type.csv b/private/templates/CRMT2/facility_type.csv
deleted file mode 100644
index be6a9a5c01..0000000000
--- a/private/templates/CRMT2/facility_type.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-Type
-Park
-Stadium
-School
-Church
-Food Bank
-Business
-Farmers Market
-Senior Home
-Nursing Home
-Supermarket
-Animal Shelter
-Fire Station
-Office
\ No newline at end of file
diff --git a/private/templates/CRMT2/gis_hierarchy.csv b/private/templates/CRMT2/gis_hierarchy.csv
deleted file mode 100644
index 8ab02a7248..0000000000
--- a/private/templates/CRMT2/gis_hierarchy.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-UUID,Country,L1,L2,L3,L4,L5,Edit L1
-SITE_DEFAULT,,"State","County","City","Neighborhood",,
-,US,"State","County","City","Neighborhood",,False
\ No newline at end of file
diff --git a/private/templates/CRMT2/gis_layer_coordinate.csv b/private/templates/CRMT2/gis_layer_coordinate.csv
deleted file mode 100644
index 9e9c8bd822..0000000000
--- a/private/templates/CRMT2/gis_layer_coordinate.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-Name,Enabled,Visible
-Coordinate Grid,True,False
diff --git a/private/templates/CRMT2/gis_layer_feature_census.csv b/private/templates/CRMT2/gis_layer_feature_census.csv
deleted file mode 100644
index 460e2375d4..0000000000
--- a/private/templates/CRMT2/gis_layer_feature_census.csv
+++ /dev/null
@@ -1,19 +0,0 @@
-Name,Description,Controller,Function,Marker,GPS Marker,Popup Format,Attributes,Filter,Default,Individual,Style,Folder,Visible,Enabled,Cluster Distance,Cluster Threshold,Refresh
-Population,"2010 Census, http://www.census.gov/2010census/ DP0010001",stats,demographic_data,,,{location_id}: {value},"value,location_id",~.parameter_id$name=Population,,,"[{'low':0,'high':4,'label':'0-4','fill':'FEFBDA','fillOpacity':0.5},{'low':5,'high':9,'label':'5-9','fill':'FDF15B','fillOpacity':0.5},{'low':10,'high':17,'label':'10-17','fill':'FBCB0D','fillOpacity':0.5},{'low':18,'high':29,'label':'18-29','fill':'F27621','fillOpacity':0.5},{'low':30,'high':48,'label':'30-48','fill':'F93013','fillOpacity':0.5},{'low':49,'high':86,'label':'49-86','fill':'B61014','fillOpacity':0.5},{'low':87,'high':20000,'label':'87-20,000','fill':'801122','fillOpacity':0.5}]",Census Data,False,False,,0,0
-Population unused,"2010 Census from Aggregates - slower performance but allows us to have data for multiple years, http://www.census.gov/2010census/ DP0010001",stats,demographic_aggregate,,,{location_id}: {sum},"sum,location_id",~.agg_type=3&~.end_date=None&~.parameter_id$name=Population,,,"[{'prop':'sum','low':0,'high':4,'label':'0-4','fill':'FEFBDA','fillOpacity':0.5},{'prop':'sum','low':5,'high':9,'label':'5-9','fill':'FDF15B','fillOpacity':0.5},{'prop':'sum','low':10,'high':17,'label':'10-17','fill':'FBCB0D','fillOpacity':0.5},{'prop':'sum','low':18,'high':29,'label':'18-29','fill':'F27621','fillOpacity':0.5},{'prop':'sum','low':30,'high':48,'label':'30-48','fill':'F93013','fillOpacity':0.5},{'prop':'sum','low':49,'high':86,'label':'49-86','fill':'B61014','fillOpacity':0.5},{'prop':'sum','low':87,'high':20000,'label':'87-20,000','fill':'801122','fillOpacity':0.5}]",Census Data,False,False,,0,0
-Owner-occupied,"Percentage of Population in Owner-occupied: 2010 Census, http://www.census.gov/2010census/ DP0210002",stats,demographic_aggregate,,,"{location_id}: {percentage}, {sum}","percentage,location_id,sum",~.agg_type=3&~.end_date=None&~.parameter_id$name=Owner-occupied,,,"[{'prop':'percentage','low':80,'high':1,'label':'80% - 100% Owner Occupied','fill':'E2B797','fillOpacity':0.5},{'prop':'percentage','low':60,'high':79.999,'label':'60% - 80% Owner Occupied','fill':'F8DDA9','fillOpacity':0.5},{'prop':'percentage','low':40,'high':59.999,'label':'Mixed Renter/Owner Occupied','fill':'FFFFA3','fillOpacity':0.5},{'prop':'percentage','low':20,'high':39.999,'label':'60% - 80% Renter Occupied','fill':'C7DF83','fillOpacity':0.5},{'prop':'percentage','low':0,'high':19.999,'label':'80% - 100% Renter Occupied','fill':'94B685','fillOpacity':0.5}]",Census Data,False,False,,0,0
-White,"Percentage of Population that is White: 2010 Census, http://www.census.gov/2010census/ DP0080003",stats,demographic_aggregate,,,"{location_id}: {percentage}, {sum}","percentage,location_id,sum",~.agg_type=3&~.end_date=None&~.parameter_id$name=White,,,"[{'prop':'percentage','low':0,'high':0.099,'label':'Less than 0.1%','fill':'FFFFFF','fillOpacity':0.5},{'prop':'percentage','low':0.1,'high':0.999,'label':'0.1% to 0.9%','fill':'F8E2BE','fillOpacity':0.5},{'prop':'percentage','low':1,'high':2.499,'label':'1.0% to 2.5%','fill':'E7A614','fillOpacity':0.5},{'prop':'percentage','low':2.5,'high':100,'label':'More than 2.5%','fill':'990000','fillOpacity':0.5}]",Census Data,False,False,,0,0
-Black or African American,"Percentage of Population that is Black or African American: 2010 Census, http://www.census.gov/2010census/ DP0080004",stats,demographic_aggregate,,,"{location_id}: {percentage}, {sum}","percentage,location_id,sum",~.agg_type=3&~.end_date=None&~.parameter_id$name=Black or African American,,,"[{'prop':'percentage','low':0,'high':0.099,'label':'Less than 0.1%','fill':'FFFFFF','fillOpacity':0.5},{'prop':'percentage','low':0.1,'high':0.999,'label':'0.1% to 0.9%','fill':'F8E2BE','fillOpacity':0.5},{'prop':'percentage','low':1,'high':2.499,'label':'1.0% to 2.5%','fill':'E7A614','fillOpacity':0.5},{'prop':'percentage','low':2.5,'high':100,'label':'More than 2.5%','fill':'990000','fillOpacity':0.5}]",Census Data,False,False,,0,0
-American Indian and Alaska Native,"Percentage of Population that is American Indian and Alaska Native: 2010 Census, http://www.census.gov/2010census/ DP0080005",stats,demographic_aggregate,,,"{location_id}: {percentage}, {sum}","percentage,location_id,sum",~.agg_type=3&~.end_date=None&~.parameter_id$name=American Indian and Alaska Native,,,"[{'prop':'percentage','low':0,'high':0.099,'label':'Less than 0.1%','fill':'FFFFFF','fillOpacity':0.5},{'prop':'percentage','low':0.1,'high':0.999,'label':'0.1% to 0.9%','fill':'F8E2BE','fillOpacity':0.5},{'prop':'percentage','low':1,'high':2.499,'label':'1.0% to 2.5%','fill':'E7A614','fillOpacity':0.5},{'prop':'percentage','low':2.5,'high':100,'label':'More than 2.5%','fill':'990000','fillOpacity':0.5}]",Census Data,False,False,,0,0
-Asian Indian,"Percentage of Population that is Asian Indian: 2010 Census, http://www.census.gov/2010census/ DP0080007",stats,demographic_aggregate,,,"{location_id}: {percentage}, {sum}","percentage,location_id,sum",~.agg_type=3&~.end_date=None&~.parameter_id$name=Asian Indian,,,"[{'prop':'percentage','low':0,'high':0.099,'label':'Less than 0.1%','fill':'FFFFFF','fillOpacity':0.5},{'prop':'percentage','low':0.1,'high':0.999,'label':'0.1% to 0.9%','fill':'F8E2BE','fillOpacity':0.5},{'prop':'percentage','low':1,'high':2.499,'label':'1.0% to 2.5%','fill':'E7A614','fillOpacity':0.5},{'prop':'percentage','low':2.5,'high':100,'label':'More than 2.5%','fill':'990000','fillOpacity':0.5}]",Census Data,False,False,,0,0
-Chinese,"Percentage of Population that is Chinese: 2010 Census, http://www.census.gov/2010census/ DP0080008",stats,demographic_aggregate,,,"{location_id}: {percentage}, {sum}","percentage,location_id,sum",~.agg_type=3&~.end_date=None&~.parameter_id$name=Chinese,,,"[{'prop':'percentage','low':0,'high':0.099,'label':'Less than 0.1%','fill':'FFFFFF','fillOpacity':0.5},{'prop':'percentage','low':0.1,'high':0.999,'label':'0.1% to 0.9%','fill':'F8E2BE','fillOpacity':0.5},{'prop':'percentage','low':1,'high':2.499,'label':'1.0% to 2.5%','fill':'E7A614','fillOpacity':0.5},{'prop':'percentage','low':2.5,'high':100,'label':'More than 2.5%','fill':'990000','fillOpacity':0.5}]",Census Data,False,False,,0,0
-Filipino,"Percentage of Population that is Filipino: 2010 Census, http://www.census.gov/2010census/ DP0080009",stats,demographic_aggregate,,,"{location_id}: {percentage}, {sum}","percentage,location_id,sum",~.agg_type=3&~.end_date=None&~.parameter_id$name=Filipino,,,"[{'prop':'percentage','low':0,'high':0.099,'label':'Less than 0.1%','fill':'FFFFFF','fillOpacity':0.5},{'prop':'percentage','low':0.1,'high':0.999,'label':'0.1% to 0.9%','fill':'F8E2BE','fillOpacity':0.5},{'prop':'percentage','low':1,'high':2.499,'label':'1.0% to 2.5%','fill':'E7A614','fillOpacity':0.5},{'prop':'percentage','low':2.5,'high':100,'label':'More than 2.5%','fill':'990000','fillOpacity':0.5}]",Census Data,False,False,,0,0
-Japanese,"Percentage of Population that is Japanese: 2010 Census, http://www.census.gov/2010census/ DP0080010",stats,demographic_aggregate,,,"{location_id}: {percentage}, {sum}","percentage,location_id,sum",~.agg_type=3&~.end_date=None&~.parameter_id$name=Japanese,,,"[{'prop':'percentage','low':0,'high':0.099,'label':'Less than 0.1%','fill':'FFFFFF','fillOpacity':0.5},{'prop':'percentage','low':0.1,'high':0.999,'label':'0.1% to 0.9%','fill':'F8E2BE','fillOpacity':0.5},{'prop':'percentage','low':1,'high':2.499,'label':'1.0% to 2.5%','fill':'E7A614','fillOpacity':0.5},{'prop':'percentage','low':2.5,'high':100,'label':'More than 2.5%','fill':'990000','fillOpacity':0.5}]",Census Data,False,False,,0,0
-Korean,"Percentage of Population that is Korean: 2010 Census, http://www.census.gov/2010census/ DP0080011",stats,demographic_aggregate,,,"{location_id}: {percentage}, {sum}","percentage,location_id,sum",~.agg_type=3&~.end_date=None&~.parameter_id$name=Korean,,,"[{'prop':'percentage','low':0,'high':0.099,'label':'Less than 0.1%','fill':'FFFFFF','fillOpacity':0.5},{'prop':'percentage','low':0.1,'high':0.999,'label':'0.1% to 0.9%','fill':'F8E2BE','fillOpacity':0.5},{'prop':'percentage','low':1,'high':2.499,'label':'1.0% to 2.5%','fill':'E7A614','fillOpacity':0.5},{'prop':'percentage','low':2.5,'high':100,'label':'More than 2.5%','fill':'990000','fillOpacity':0.5}]",Census Data,False,False,,0,0
-Vietnamese,"Percentage of Population that is Vietnamese: 2010 Census, http://www.census.gov/2010census/ DP0080012",stats,demographic_aggregate,,,"{location_id}: {percentage}, {sum}","percentage,location_id,sum",~.agg_type=3&~.end_date=None&~.parameter_id$name=Vietnamese,,,"[{'prop':'percentage','low':0,'high':0.099,'label':'Less than 0.1%','fill':'FFFFFF','fillOpacity':0.5},{'prop':'percentage','low':0.1,'high':0.999,'label':'0.1% to 0.9%','fill':'F8E2BE','fillOpacity':0.5},{'prop':'percentage','low':1,'high':2.499,'label':'1.0% to 2.5%','fill':'E7A614','fillOpacity':0.5},{'prop':'percentage','low':2.5,'high':100,'label':'More than 2.5%','fill':'990000','fillOpacity':0.5}]",Census Data,False,False,,0,0
-Other Asian,"Percentage of Population that is Other Asian: 2010 Census, http://www.census.gov/2010census/ DP0080013",stats,demographic_aggregate,,,"{location_id}: {percentage}, {sum}","percentage,location_id,sum",~.agg_type=3&~.end_date=None&~.parameter_id$name=Other Asian,,,"[{'prop':'percentage','low':0,'high':0.099,'label':'Less than 0.1%','fill':'FFFFFF','fillOpacity':0.5},{'prop':'percentage','low':0.1,'high':0.999,'label':'0.1% to 0.9%','fill':'F8E2BE','fillOpacity':0.5},{'prop':'percentage','low':1,'high':2.499,'label':'1.0% to 2.5%','fill':'E7A614','fillOpacity':0.5},{'prop':'percentage','low':2.5,'high':100,'label':'More than 2.5%','fill':'990000','fillOpacity':0.5}]",Census Data,False,False,,0,0
-Native Hawaiian,"Percentage of Population that is Native Hawaiian: 2010 Census, http://www.census.gov/2010census/ DP0080015",stats,demographic_aggregate,,,"{location_id}: {percentage}, {sum}","percentage,location_id,sum",~.agg_type=3&~.end_date=None&~.parameter_id$name=Native Hawaiian,,,"[{'prop':'percentage','low':0,'high':0.099,'label':'Less than 0.1%','fill':'FFFFFF','fillOpacity':0.5},{'prop':'percentage','low':0.1,'high':0.999,'label':'0.1% to 0.9%','fill':'F8E2BE','fillOpacity':0.5},{'prop':'percentage','low':1,'high':2.499,'label':'1.0% to 2.5%','fill':'E7A614','fillOpacity':0.5},{'prop':'percentage','low':2.5,'high':100,'label':'More than 2.5%','fill':'990000','fillOpacity':0.5}]",Census Data,False,False,,0,0
-Guamanian or Chamorro,"Percentage of Population that is Guamanian or Chamorro: 2010 Census, http://www.census.gov/2010census/ DP0080016",stats,demographic_aggregate,,,"{location_id}: {percentage}, {sum}","percentage,location_id,sum",~.agg_type=3&~.end_date=None&~.parameter_id$name=Guamanian or Chamorro,,,"[{'prop':'percentage','low':0,'high':0.099,'label':'Less than 0.1%','fill':'FFFFFF','fillOpacity':0.5},{'prop':'percentage','low':0.1,'high':0.999,'label':'0.1% to 0.9%','fill':'F8E2BE','fillOpacity':0.5},{'prop':'percentage','low':1,'high':2.499,'label':'1.0% to 2.5%','fill':'E7A614','fillOpacity':0.5},{'prop':'percentage','low':2.5,'high':100,'label':'More than 2.5%','fill':'990000','fillOpacity':0.5}]",Census Data,False,False,,0,0
-Samoan,"Percentage of Population that is Samoan: 2010 Census, http://www.census.gov/2010census/ DP0080017",stats,demographic_aggregate,,,"{location_id}: {percentage}, {sum}","percentage,location_id,sum",~.agg_type=3&~.end_date=None&~.parameter_id$name=Samoan,,,"[{'prop':'percentage','low':0,'high':0.099,'label':'Less than 0.1%','fill':'FFFFFF','fillOpacity':0.5},{'prop':'percentage','low':0.1,'high':0.999,'label':'0.1% to 0.9%','fill':'F8E2BE','fillOpacity':0.5},{'prop':'percentage','low':1,'high':2.499,'label':'1.0% to 2.5%','fill':'E7A614','fillOpacity':0.5},{'prop':'percentage','low':2.5,'high':100,'label':'More than 2.5%','fill':'990000','fillOpacity':0.5}]",Census Data,False,False,,0,0
-Other Pacific Islander,"Percentage of Population that is Other Pacific Islander: 2010 Census, http://www.census.gov/2010census/ DP0080018",stats,demographic_aggregate,,,"{location_id}: {percentage}, {sum}","percentage,location_id,sum",~.agg_type=3&~.end_date=None&~.parameter_id$name=Other Pacific Islander,,,"[{'prop':'percentage','low':0,'high':0.099,'label':'Less than 0.1%','fill':'FFFFFF','fillOpacity':0.5},{'prop':'percentage','low':0.1,'high':0.999,'label':'0.1% to 0.9%','fill':'F8E2BE','fillOpacity':0.5},{'prop':'percentage','low':1,'high':2.499,'label':'1.0% to 2.5%','fill':'E7A614','fillOpacity':0.5},{'prop':'percentage','low':2.5,'high':100,'label':'More than 2.5%','fill':'990000','fillOpacity':0.5}]",Census Data,False,False,,0,0
-Some Other Race,"Percentage of Population that is Some Other Race: 2010 Census, http://www.census.gov/2010census/  DP0080019",stats,demographic_aggregate,,,"{location_id}: {percentage}, {sum}","percentage,location_id,sum",~.agg_type=3&~.end_date=None&~.parameter_id$name=Some Other Race,,,"[{'prop':'percentage','low':0,'high':0.099,'label':'Less than 0.1%','fill':'FFFFFF','fillOpacity':0.5},{'prop':'percentage','low':0.1,'high':0.999,'label':'0.1% to 0.9%','fill':'F8E2BE','fillOpacity':0.5},{'prop':'percentage','low':1,'high':2.499,'label':'1.0% to 2.5%','fill':'E7A614','fillOpacity':0.5},{'prop':'percentage','low':2.5,'high':100,'label':'More than 2.5%','fill':'990000','fillOpacity':0.5}]",Census Data,False,False,,0,0
diff --git a/private/templates/CRMT2/gis_layer_feature_hazards.csv b/private/templates/CRMT2/gis_layer_feature_hazards.csv
deleted file mode 100644
index 3b5a4f7084..0000000000
--- a/private/templates/CRMT2/gis_layer_feature_hazards.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-Name,Description,Controller,Function,Marker,GPS Marker,Popup Format,Attributes,Filter,Default,Individual,Style,Folder,Visible,Enabled,Cluster Distance,Cluster Threshold,Refresh
-Tsunami,Tsunami Inundation Area - USGS,vulnerability,risk,,,,,~.hazard_id$name=Tsunami&risk_group.id=None,,,"{'fill':'0000FF','fillOpacity':0.5,'label':'Inundation Zone'}",Hazards,False,False,,0,0
diff --git a/private/templates/CRMT2/gis_layer_google.csv b/private/templates/CRMT2/gis_layer_google.csv
deleted file mode 100644
index c1cd9849b5..0000000000
--- a/private/templates/CRMT2/gis_layer_google.csv
+++ /dev/null
@@ -1,9 +0,0 @@
-Name,Description,Type,Enabled,Default
-"Google Maps",Streets,maps,"False",
-"Google Hybrid","Streets over Satellite imagery",hybrid,"False",
-"Satellite (Google)","Satellite imagery",satellite,"True",
-"Topographic (Google)","Streets over topography",terrain,"True",
-"Google MapMaker","Community additions to streets. This is much more detailed than normal Google in some locations. It is incompatioble with Streetview.",mapmaker,"False",
-"Google MapMapker Hybrid","Community additions to streets overlaid over Satellite imagery. This is much more detailed than normal Google in some locations. It is incompatioble with Streetview.",mapmakerhybrid,"False",
-"Google Earth","Earth allows access to a 3D satellite view.",earth,"False",
-"Google Streetview","Streetview allows access to a 3D photographic panorama. It is incompatible with MapMaker layers.",streetview,"False",
diff --git a/private/templates/CRMT2/gis_layer_kml.csv b/private/templates/CRMT2/gis_layer_kml.csv
deleted file mode 100644
index e7b8ffc75b..0000000000
--- a/private/templates/CRMT2/gis_layer_kml.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-Name,Description,URL,Marker,Folder,Title,Body,Style,Folder,Enabled,Visible,Cluster Distance,Cluster Threshold,Refresh
-Gas Pipelines,"SoCal Gas. Accuracy of pipeline locations can vary +/- 500 feet.",http://socalgas.com/safety/pipeline-maps/kmz/LosAngelesHP.kmz,,,,,"[{'label':'Transmission','stroke':'00007f','strokeWidth':4},{'label':'Distribution','stroke':'0059fe'}]",Hazards,True,False,,0,0
\ No newline at end of file
diff --git a/private/templates/CRMT2/gis_layer_openstreetmap.csv b/private/templates/CRMT2/gis_layer_openstreetmap.csv
deleted file mode 100644
index d51ae43bc3..0000000000
--- a/private/templates/CRMT2/gis_layer_openstreetmap.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-Name,Enabled,Visible,Base,Default,Folder,URL,URL2,URL3,Attribution,"Zoom Levels"
-"Streets (OpenStreetMap Humanitarian)","True",,,"True",,"http://a.tile.openstreetmap.fr/hot/","http://b.tile.openstreetmap.fr/hot/","http://c.tile.openstreetmap.fr/hot/","Tiles Courtesy of <a href=""http://hot.openstreetmap.org/"" target=""_blank"">Humanitarian OpenStreetMap Team</a>",
-"Streets (OpenStreetMap MapQuest)","True",,,,,"http://otile1.mqcdn.com/tiles/1.0.0/osm/","http://otile2.mqcdn.com/tiles/1.0.0/osm/","http://otile3.mqcdn.com/tiles/1.0.0/osm/","Tiles Courtesy of <a href=""http://open.mapquest.co.uk/"" target=""_blank"">MapQuest</a> <img src=""http://developer.mapquest.com/content/osm/mq_logo.png"" border=""0"">",
diff --git a/private/templates/CRMT2/gis_layer_wfs.csv b/private/templates/CRMT2/gis_layer_wfs.csv
deleted file mode 100644
index 38db535eb2..0000000000
--- a/private/templates/CRMT2/gis_layer_wfs.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-Name,Description,Source Name,Source URL,URL,Projection,Marker,Feature Type,Title,Geometry Name,Folder,Config,Enabled,Visible,Cluster Threshold,Cluster Distance,Refresh
-Hazardous Sites,Facilities or sites subject to environmental regulation,Environmental Protection Agency,http://www.epa.gov/enviro/geo_data.html,http://lacrmt.sahanafoundation.org:8080/geoserver/lacrmt/wfs,4326,risk,epa,fac_name,geom,Hazards,,True,False,,40,0
diff --git a/private/templates/CRMT2/incident_type.csv b/private/templates/CRMT2/incident_type.csv
deleted file mode 100644
index 525b033d83..0000000000
--- a/private/templates/CRMT2/incident_type.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-Type
-Broken Windows
-Gang Violence
-Grafitti
-Fires
\ No newline at end of file
diff --git a/private/templates/CRMT2/org_group_membership_status.csv b/private/templates/CRMT2/org_group_membership_status.csv
deleted file mode 100644
index e1741678bc..0000000000
--- a/private/templates/CRMT2/org_group_membership_status.csv
+++ /dev/null
@@ -1,5 +0,0 @@
-Name,Description
-Recorded,
-Contacted,
-Member,
-Located within Coalition,
\ No newline at end of file
diff --git a/private/templates/CRMT2/org_sector.csv b/private/templates/CRMT2/org_sector.csv
deleted file mode 100644
index 6268d62401..0000000000
--- a/private/templates/CRMT2/org_sector.csv
+++ /dev/null
@@ -1,14 +0,0 @@
-Abrv, SubsectorOf
-"Business",
-"Community Leadership",
-"Cultural / Faith Based Organization",
-"Emergency Management",
-"Healthcare",
-"Social Services",
-"Housing / Shelter",
-"Media",
-"Mental/ Behavioral Health",
-"Elderly / Aging",
-"Children / Education",
-"Special Needs Populations",
-"Government",
diff --git a/private/templates/CRMT2/org_service.csv b/private/templates/CRMT2/org_service.csv
deleted file mode 100644
index 9beab50dc9..0000000000
--- a/private/templates/CRMT2/org_service.csv
+++ /dev/null
@@ -1,194 +0,0 @@
-Service,SubService,SubSubService
-Arts and Recreation,Beaches and Marinas,
-Arts and Recreation,Campgrounds,
-Arts and Recreation,Cruise Line Terminals,
-Arts and Recreation,Cultural and Performing Arts Centers,
-Arts and Recreation,Golf Courses,
-Arts and Recreation,Museums and Aquariums,
-Arts and Recreation,Natural Areas and Wildlife Sanctuaries,Ranger Stations
-Arts and Recreation,Parks and Gardens,
-Arts and Recreation,Picnic Areas,
-Arts and Recreation,Pools,
-Arts and Recreation,Ranches,
-Arts and Recreation,Recreation Centers,
-Arts and Recreation,Recreation Clubs,
-Arts and Recreation,Recreation Programs,
-Arts and Recreation,Ski Areas,
-Arts and Recreation,Sports Venues,Horse Race Track
-Arts and Recreation,Sports Venues,IRL
-Arts and Recreation,Sports Venues,MLB
-Arts and Recreation,Sports Venues,MLS
-Arts and Recreation,Sports Venues,NBA
-Arts and Recreation,Sports Venues,NCAA Division 1 Basketball
-Arts and Recreation,Sports Venues,NCAA Division 1 bowl game
-Arts and Recreation,Sports Venues,NCAA Division 1-A Football
-Arts and Recreation,Sports Venues,NHL
-Arts and Recreation,Sports Venues,Raceways
-Arts and Recreation,Sports Venues,WNBA
-Arts and Recreation,Tourist Assistance,
-Arts and Recreation,Trails,
-Arts and Recreation,Wineries,
-Communications,IT Portal Locations,
-Communications,Internet Exchange Points,
-Communications,Internet Service Providers,
-Communications,Internet Service Providers,
-Community Groups,Churches,
-Community Groups,Community Organizations,
-Community Groups,Farmers Markets,
-Community Groups,Red Cross Offices,
-Community Groups,Volunteer Opportunities,
-Education,Adult Education,
-Education,Colleges and Universities,
-Education,Early Childhood Education and Head Start,
-Education,Guidance and Tutoring Programs,
-Education,Private and Charter Schools,
-Education,Public Elementary Schools,
-Education,Public High Schools,
-Education,Public Middle Schools,
-Education,School Districts,
-Education,Special Curriculum Schools and Programs,Flight Schools
-Emergency Response,Cooling and Warming Centers,
-Emergency Response,Emergency and Disaster Offices,
-Emergency Response,National Shelter System,
-Emergency Response,Points of Dispensing,
-Environment,Conservation Programs,
-Environment,Hazardous Waste Disposal,
-Environment,Recycling,
-Government,Chambers of Commerce,
-Government,City Halls,
-Government,Consulate Offices,
-Government,County Offices,
-Government,Government Offices,Office of Field Operations (OFO) Facilities
-Government,Government Offices,Office of Field Operations (OFO) Port Facilities
-Government,Military Facilities,AF Active
-Government,Military Facilities,Air National Guard Combined Support Maintenance Shops
-Government,Military Facilities,Air National Guard Field Maintenance Shop
-Government,Military Facilities,Air National Guard Maintenance Shop
-Government,Military Facilities,Air National Guard Readiness Centers and Armories
-Government,Military Facilities,Army National Guard Sites
-Government,Military Facilities,Army Recruiting Centers
-Government,Military Facilities,Navy Active
-Government,Military Facilities,Navy Reserve
-Government,Military Facilities,US Army Reserves Locations
-Government,Military Facilities,US Coast Guard Units
-Government,Passports,
-Government,Representative Offices,
-Government,Social Security Administration,
-Health and Mental Health,DHS Health Clinics,
-Health and Mental Health,Dental Care,
-Health and Mental Health,Health Centers,
-Health and Mental Health,Health Clinics,
-Health and Mental Health,Health Education and Counseling,
-Health and Mental Health,Health Screening and Testing,
-Health and Mental Health,Hospitals and Medical Centers,911 Receiving
-Health and Mental Health,Hospitals and Medical Centers,Acute Care
-Health and Mental Health,Hospitals and Medical Centers,Base Hospital
-Health and Mental Health,Hospitals and Medical Centers,Disaster Resource Center
-Health and Mental Health,Hospitals and Medical Centers,EDAP-PMC
-Health and Mental Health,Hospitals and Medical Centers,Perinatal
-Health and Mental Health,Hospitals and Medical Centers,Rehabilitation
-Health and Mental Health,Hospitals and Medical Centers,Respiratory Hospital
-Health and Mental Health,Hospitals and Medical Centers,SART (Sexual Assault Response Team Center)
-Health and Mental Health,Hospitals and Medical Centers,STEMI
-Health and Mental Health,Hospitals and Medical Centers,Stroke
-Health and Mental Health,Hospitals and Medical Centers,Trauma Center
-Health and Mental Health,Immunization,
-Health and Mental Health,Medicare and Medicaid Offices,
-Health and Mental Health,Mental Health Centers,NGA
-Health and Mental Health,Mental Health Counseling,
-Health and Mental Health,Mental Health Programs,
-Health and Mental Health,Safe Havens,
-Health and Mental Health,Substance Abuse Programs,
-Municipal Services,Animals and Pets,
-Municipal Services,Building Inspections,
-Municipal Services,Cemeteries,
-Municipal Services,Community Services,
-Municipal Services,Consumer Services,
-Municipal Services,Economic Development,
-Municipal Services,Elections,
-Municipal Services,Environmental Programs,
-Municipal Services,Health and Housing Inspections,
-Municipal Services,Libraries,
-Municipal Services,Licenses and Permits,
-Municipal Services,Planning and Zoning,
-Municipal Services,Property and Tax,
-Municipal Services,Public Internet Access,
-Municipal Services,Public Records,
-Municipal Services,Rubbish Disposal,
-Municipal Services,Street Maintenance,
-Municipal Services,Utilities,Waste Water
-Postal,DHL Locations,DHL Staffed Facility
-Postal,DHL Locations,Drop Box
-Postal,DHL Locations,Drop Off Facility
-Postal,Federal Express Locations,Authorized Ship Center
-Postal,Federal Express Locations,Fed Ex Staffed
-Postal,Federal Express Locations,Self-Service
-Postal,Post Offices,
-Postal,Private Non Retail Shipping Locations,
-Postal,UPS Locations,
-Postal,USPS Bulk Mail Centers,
-Private Industry,Agriculture and Food,Agriculture and Mineral Operations
-Private Industry,Agriculture and Food,Food Processing
-Private Industry,Agriculture and Food,Game Propagation
-Private Industry,Agriculture and Food,Public Refrigerated Warehouses
-Private Industry,Banking and Finance,Bank Main Offices
-Private Industry,Banking and Finance,Brokerages
-Private Industry,Banking and Finance,Bullion Repositories
-Private Industry,Banking and Finance,Credit Unions
-Private Industry,Banking and Finance,FDIC Insured Banks
-Private Industry,Banking and Finance,Federal Reserve Branches
-Private Industry,Banking and Finance,Financial Processing Center
-Private Industry,Banking and Finance,Insurance
-Private Industry,Business Centers,
-Private Industry,Corporate Headquarters,
-Private Industry,Manufacturing,Construction Minerals
-Private Industry,Manufacturing,Crushed Stone Operations
-Private Industry,Manufacturing,Sand and Gravel Operations
-Private Industry,Mines,
-Private Industry,Oilfields,
-Private Industry,Shopping Centers,
-Private Industry,TV and Movie Studios,
-Public Safety,Courthouses,
-Public Safety,Crime Prevention and Support,
-Public Safety,Crime Reporting and Investigation,Fusion Centers
-Public Safety,District Attorney,
-Public Safety,Fingerprinting,
-Public Safety,Fire Stations,Battalion HQ
-Public Safety,Jails and Prisons,
-Public Safety,Legal Services and Counseling,
-Public Safety,Lifeguard Towers,
-Public Safety,Parole and Offender Assistance,
-Public Safety,Probation Camps and Juvenile Halls,
-Public Safety,Probation Offices,
-Public Safety,Public Defender,
-Public Safety,Self-Help Legal Centers,
-Public Safety,Sheriff and Police Stations,FBI Field Offices
-Social Services,Adoption,
-Social Services,Child Care,
-Social Services,Child Support Services,
-Social Services,Children and Family Services,
-Social Services,Clothing,
-Social Services,Disability Support Services,
-Social Services,Domestic Violence Services,
-Social Services,Donation Services,
-Social Services,Food Assistance,
-Social Services,Forms Assistance,
-Social Services,Homeless Shelters and Services,
-Social Services,Housing Assistance and Information,
-Social Services,Immigration,
-Social Services,Job Training,
-Social Services,Life Links,LL - African American
-Social Services,Life Links,LL - Latino
-Social Services,NEG Program WorkSource Centers,
-Social Services,Payment Assistance,
-Social Services,Public Housing,
-Social Services,Public Information Services,
-Social Services,Senior Services,Convalescent Hospitals
-Social Services,Senior Services,Meals
-Social Services,Support Groups,
-Social Services,Thrift Shops,
-Social Services,Transportation Assistance,
-Social Services,Unemployment Insurance Offices,
-Social Services,Veterans Services,
-Social Services,Welfare Offices and Programs,
-Transportation,Transit Systems,
diff --git a/private/templates/CRMT2/stats_demographic.csv b/private/templates/CRMT2/stats_demographic.csv
deleted file mode 100644
index fdf6d825e9..0000000000
--- a/private/templates/CRMT2/stats_demographic.csv
+++ /dev/null
@@ -1,18 +0,0 @@
-Name,Description,Total
-Population,Total Population,
-White,,Population
-Black or African American,,Population
-American Indian and Alaska Native,,Population
-Asian Indian,,Population
-Chinese,,Population
-Filipino,,Population
-Japanese,,Population
-Korean,,Population
-Vietnamese,,Population
-Other Asian,,Population
-Native Hawaiian,,Population
-Guamanian or Chamorro,,Population
-Samoan,,Population
-Other Pacific Islander,,Population
-Some Other Race,,Population
-Owner-occupied,Population in Owner-occupied,Population
\ No newline at end of file
diff --git a/private/templates/CRMT2/tests.py b/private/templates/CRMT2/tests.py
deleted file mode 100644
index df47454ea2..0000000000
--- a/private/templates/CRMT2/tests.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-    This file specifies the tests which are to be run on the CRMT template.
-
-    modules/tests/suite.py runs this file to get the test_list which is to be loaded.
-    To add more tests which are to run on this template, simply add the class name
-    to the list below.
-"""
-
-from gluon import current
-
-current.selenium_tests = ["SearchStaff",
-                          "CreateProject"
-                          ]
diff --git a/private/templates/Syria/views/_popup.html b/private/templates/Syria/views/_popup.html
deleted file mode 100644
index 6bf4870250..0000000000
--- a/private/templates/Syria/views/_popup.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div id='popup' class='cf'>
-{{try:}}{{=form}}{{except:}}{{pass}}
-{{try:}}<div id='table-container'>{{=items}}</div>{{except:}}{{pass}}
-</div>
diff --git a/private/templates/Syria/views/footer.html b/private/templates/Syria/views/footer.html
deleted file mode 100644
index 0bf43f0693..0000000000
--- a/private/templates/Syria/views/footer.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<footer id='page-footer'>
- <div class='container'>
-  <div class='row'>
-   <div class='span3'></div>
-   <div class='span3'></div>
-   <div class='span3'></div>
-   <div id='footer-partner-logos' class='span3 hide-on-mobile'>
-    <p class='pull-right'><a target='_blank' href='http://eden.sahanafoundation.org' title='A Sahana Eden Site'><img src='/{{=appname}}/static/img/sahanasmall_05.png' width='92' height='41' style='vertical-align:middle' alt='{{=T("A Sahana Eden Site")}}' /></a></p>
-   </div>
-  </div>
- </div>
-</footer>
\ No newline at end of file
diff --git a/private/templates/mobile/__init__.py b/private/templates/mobile/__init__.py
deleted file mode 100644
index 8d1c8b69c3..0000000000
--- a/private/templates/mobile/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-