refactor fhir resources