diff --git a/Cargo.lock b/Cargo.lock index 09ea05a36..3cdacc93f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1414,6 +1414,7 @@ dependencies = [ "clap", "helios-fhir-macro", "helios-fhirpath-support", + "helios-serde-support", "reqwest", "rust_decimal", "rust_decimal_macros", @@ -1501,6 +1502,30 @@ dependencies = [ "helios-fhir", ] +[[package]] +name = "helios-serde" +version = "0.1.32" +dependencies = [ + "helios-fhir", + "helios-fhir-macro", + "helios-serde-support", + "quick-xml 0.38.3", + "reqwest", + "rust_decimal", + "rust_decimal_macros", + "serde", + "serde_json", + "zip 0.6.6", +] + +[[package]] +name = "helios-serde-support" +version = "0.1.32" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "helios-sof" version = "0.1.32" @@ -2779,6 +2804,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42a232e7487fc2ef313d96dde7948e7a3c05101870d8985e4fd8d26aedd27b89" dependencies = [ "memchr", + "serde", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 714cdf27b..e0ff3da3e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,6 +11,8 @@ default-members = [ "crates/fhir-macro", "crates/fhirpath", "crates/fhirpath-support", + "crates/serde", + "crates/serde-support", "crates/hfs", "crates/sof", ] diff --git a/crates/fhir-macro/src/lib.rs b/crates/fhir-macro/src/lib.rs index f0937d7f2..f623b3eed 100644 --- a/crates/fhir-macro/src/lib.rs +++ b/crates/fhir-macro/src/lib.rs @@ -75,8 +75,9 @@ extern crate proc_macro; -use heck::ToLowerCamelCase; +use heck::{ToLowerCamelCase, ToSnakeCase}; use proc_macro::TokenStream; +use proc_macro2::TokenStream as TokenStream2; use quote::{format_ident, quote}; use syn::{ Data, DeriveInput, Fields, GenericArgument, Ident, Lit, Meta, Path, PathArguments, Type, @@ -308,6 +309,7 @@ pub fn fhir_serde_derive(input: TokenStream) -> TokenStream { } } + // --- is_empty() Implementation --- #is_empty_impl }; @@ -632,6 +634,34 @@ fn extract_inner_element_type(type_name: &str) -> &str { } } +fn element_primitive_type_tokens(field_ty: &Type) -> TokenStream2 { + let base_type = get_base_type(field_ty); + if let Type::Path(type_path) = base_type { + if let Some(last_segment) = type_path.path.segments.last() { + if last_segment.ident == "Element" { + if let PathArguments::AngleBracketed(generics) = &last_segment.arguments { + if let Some(GenericArgument::Type(inner_v_type)) = generics.args.first() { + return quote! { #inner_v_type }; + } + } + panic!("Element missing generic argument V"); + } else { + let alias_name = last_segment.ident.to_string(); + let primitive_type_str = extract_inner_element_type(&alias_name); + let primitive_type_parsed: Type = syn::parse_str(primitive_type_str) + .unwrap_or_else(|_| { + panic!( + "Failed to parse primitive type string: {}", + primitive_type_str + ) + }); + return quote! { #primitive_type_parsed }; + } + } + } + panic!("Element type is not a Type::Path"); +} + //============================================================================= // FhirSerde Implementation Generator Functions //============================================================================= @@ -740,14 +770,7 @@ fn generate_serialize_impl(data: &Data, name: &Ident) -> proc_macro2::TokenStrea } // Serialize the extension part if present if has_extension { - #[derive(serde::Serialize)] - struct IdAndExtensionHelper<'a> { - #[serde(skip_serializing_if = "Option::is_none")] - id: &'a Option, - #[serde(skip_serializing_if = "Option::is_none")] - extension: &'a Option>, - } - let extension_part = IdAndExtensionHelper { + let extension_part = helios_serde_support::IdAndExtensionHelper { id: &value.id, extension: &value.extension, }; @@ -974,14 +997,7 @@ fn generate_serialize_impl(data: &Data, name: &Ident) -> proc_macro2::TokenStrea if element.id.is_some() || element.extension.is_some() { has_extensions = true; // Use helper struct for consistent serialization of id/extension - #[derive(serde::Serialize)] - struct IdAndExtensionHelper<'a> { - #[serde(skip_serializing_if = "Option::is_none")] - id: &'a Option, - #[serde(skip_serializing_if = "Option::is_none")] - extension: &'a Option>, - } - let extension_part = IdAndExtensionHelper { + let extension_part = helios_serde_support::IdAndExtensionHelper { id: &element.id, extension: &element.extension, }; @@ -1024,14 +1040,7 @@ fn generate_serialize_impl(data: &Data, name: &Ident) -> proc_macro2::TokenStrea state.serialize_entry(&#effective_field_name_str, value)?; } if #extension_field_ident { - #[derive(serde::Serialize)] - struct IdAndExtensionHelper<'a> { - #[serde(skip_serializing_if = "Option::is_none")] - id: &'a Option, - #[serde(skip_serializing_if = "Option::is_none")] - extension: &'a Option>, - } - let extension_part = IdAndExtensionHelper { + let extension_part = helios_serde_support::IdAndExtensionHelper { id: &field.id, extension: &field.extension, }; @@ -1050,14 +1059,7 @@ fn generate_serialize_impl(data: &Data, name: &Ident) -> proc_macro2::TokenStrea state.serialize_field(&#effective_field_name_str, value)?; } if #extension_field_ident { - #[derive(serde::Serialize)] - struct IdAndExtensionHelper<'a> { - #[serde(skip_serializing_if = "Option::is_none")] - id: &'a Option, - #[serde(skip_serializing_if = "Option::is_none")] - extension: &'a Option>, - } - let extension_part = IdAndExtensionHelper { + let extension_part = helios_serde_support::IdAndExtensionHelper { id: &field.id, extension: &field.extension, }; @@ -1077,14 +1079,7 @@ fn generate_serialize_impl(data: &Data, name: &Ident) -> proc_macro2::TokenStrea state.serialize_entry(&#effective_field_name_str, value)?; } if #extension_field_ident { - #[derive(serde::Serialize)] - struct IdAndExtensionHelper<'a> { - #[serde(skip_serializing_if = "Option::is_none")] - id: &'a Option, - #[serde(skip_serializing_if = "Option::is_none")] - extension: &'a Option>, - } - let extension_part = IdAndExtensionHelper { + let extension_part = helios_serde_support::IdAndExtensionHelper { id: &#field_access.id, extension: &#field_access.extension, }; @@ -1100,14 +1095,7 @@ fn generate_serialize_impl(data: &Data, name: &Ident) -> proc_macro2::TokenStrea state.serialize_field(&#effective_field_name_str, value)?; } if #extension_field_ident { - #[derive(serde::Serialize)] - struct IdAndExtensionHelper<'a> { - #[serde(skip_serializing_if = "Option::is_none")] - id: &'a Option, - #[serde(skip_serializing_if = "Option::is_none")] - extension: &'a Option>, - } - let extension_part = IdAndExtensionHelper { + let extension_part = helios_serde_support::IdAndExtensionHelper { id: &#field_access.id, extension: &#field_access.extension, }; @@ -1179,6 +1167,7 @@ fn generate_serialize_impl(data: &Data, name: &Ident) -> proc_macro2::TokenStrea field_counts.push(field_counting_code); field_serializers.push(field_serializing_code); } + // Use the has_flattened_fields variable defined at the top of the function if has_flattened_fields { // If we have flattened fields, use serialize_map instead of serialize_struct @@ -1636,6 +1625,14 @@ fn generate_deserialize_impl(data: &Data, name: &Ident) -> proc_macro2::TokenStr let mut temp_struct_attributes = Vec::new(); let mut constructor_attributes = Vec::new(); + let single_or_vec_ident: proc_macro2::TokenStream = + quote! { ::helios_serde_support::SingleOrVec }; + let primitive_or_element_ident: proc_macro2::TokenStream = + quote! { ::helios_serde_support::PrimitiveOrElement }; + let convert_fn_ident = format_ident!( + "convert_xml_primitive_for_{}", + name.to_string().to_snake_case() + ); match *data { Data::Enum(ref data) => { @@ -1825,16 +1822,10 @@ fn generate_deserialize_impl(data: &Data, name: &Ident) -> proc_macro2::TokenStr }); } // End loop over variants - // Define the helper struct needed for enum deserialization + // Define the helper type alias needed for enum deserialization let id_extension_helper_def = quote! { - // Helper struct for deserializing the id/extension part from _fieldName - #[derive(Clone, Deserialize, Default)] // Add Default derive - struct IdAndExtensionHelper { - #[serde(skip_serializing_if = "Option::is_none")] // Change from default - id: Option, - #[serde(skip_serializing_if = "Option::is_none")] // Change from default - extension: Option>, - } + // Type alias for deserializing the id/extension part from _fieldName + type IdAndExtensionHelper = helios_serde_support::IdAndExtensionOwned; }; // Generate the enum deserialization implementation @@ -1965,84 +1956,69 @@ fn generate_deserialize_impl(data: &Data, name: &Ident) -> proc_macro2::TokenStr get_element_info(field_ty); let is_fhir_element = is_element || is_decimal_element; + let primitive_value_type = if is_fhir_element && !is_decimal_element { + Some(element_primitive_type_tokens(field_ty)) + } else { + None + }; // Determine the type for the primitive value field in the temp struct - let temp_primitive_type_quote = if is_fhir_element { - // Need to re-determine the base type here - let base_type = get_base_type(field_ty); - - // Determine the base primitive type (e.g., bool, String, rust_decimal::Decimal) - let primitive_type_ident = if is_decimal_element { - // For DecimalElement, use serde_json::Value in temp struct to preserve original string - quote! { serde_json::Value } - } else { - // is_element is true here - if let Type::Path(type_path) = base_type { - if let Some(last_segment) = type_path.path.segments.last() { - if last_segment.ident == "Element" { - // Direct Element - if let PathArguments::AngleBracketed(generics) = - &last_segment.arguments - { - if let Some(GenericArgument::Type(inner_v_type)) = - generics.args.first() - { - quote! { #inner_v_type } // Use the inner type V directly - } else { - panic!("Element missing generic argument V"); - } - } else { - panic!("Element missing angle bracketed arguments"); - } - } else { - // It's an alias like 'Code'. Get the primitive type it wraps. - let alias_name = last_segment.ident.to_string(); - let primitive_type_str = - extract_inner_element_type(&alias_name); - // Parse the primitive type string back into a Type for quoting - let primitive_type_parsed: Type = syn::parse_str( - primitive_type_str, - ) - .unwrap_or_else(|_| { - panic!( - "Failed to parse primitive type string: {}", - primitive_type_str - ) - }); - quote! { #primitive_type_parsed } // Use the parsed primitive type - } + let temp_primitive_type_quote = { + let single_or_vec_path = quote! { #single_or_vec_ident }; + + if is_vec { + if is_fhir_element { + let vec_type = if is_option { + get_option_inner_type(field_ty) + .expect("Option inner type not found for Vec field") } else { - panic!("Could not get last segment of Element type path"); + field_ty + }; + let vec_inner_type = get_vec_inner_type(vec_type) + .expect("Vec inner type not found"); + let entry_type = quote! { Option<#primitive_or_element_ident> }; + let holder = quote! { #single_or_vec_path<#entry_type> }; + if is_option { + quote! { Option<#holder> } + } else { + holder } } else { - panic!("Element type is not a Type::Path"); + let vec_type = if is_option { + get_option_inner_type(field_ty) + .expect("Option inner type not found for Vec field") + } else { + field_ty + }; + let vec_inner_type = get_vec_inner_type(vec_type) + .expect("Vec inner type not found"); + let entry_type = quote! { #vec_inner_type }; + let holder = quote! { #single_or_vec_path<#entry_type> }; + if is_option { + quote! { Option<#holder> } + } else { + holder + } } - }; // End of let primitive_type_ident assignment - - // Adjust the quote based on whether it's a vector - if is_vec { - // Temp type should be Option>> to handle nulls inside the array - quote! { Option>> } // Add Option inside Vec - } else { - // If original field was Option, temp type is Option - // If original field was T, temp type is Primitive - if is_option { - quote! { Option<#primitive_type_ident> } + } else if is_fhir_element { + let element_type = if is_option { + get_option_inner_type(field_ty) + .expect("Option inner type not found for Element field") } else { - // Always use Option in temp struct for single elements - quote! { Option<#primitive_type_ident> } - } + field_ty + }; + quote! { Option<#primitive_or_element_ident> } + } else { + // Not an element, use the original type + quote! { #field_ty } } - } else { - // Not an element, use the original type - quote! { #field_ty } }; // Determine the type for the extension helper field in the temp struct let temp_extension_type = if is_fhir_element { if is_vec { - // For Vec or Option>, temp type is Option>> - quote! { Option>> } + // For Vec or Option>, temp type is Option>> + quote! { Option<#single_or_vec_ident>> } } else { // For Element or Option, temp type is Option quote! { Option } @@ -2088,198 +2064,334 @@ fn generate_deserialize_impl(data: &Data, name: &Ident) -> proc_macro2::TokenStr let constructor_attribute = if is_fhir_element { if is_vec { - // Handle Vec or Option> first - // Generate different construction logic based on whether it's decimal - let construction_logic = if is_decimal_element { - // Logic specifically for Vec or Option> - let element_type = { - // Determine DecimalElement type - let vec_inner_type = if is_option { - get_option_inner_type(field_ty) - } else { - Some(field_ty) + let element_type = { + let vec_inner_type = if is_option { + get_option_inner_type(field_ty) + } else { + Some(field_ty) + } + .and_then(get_vec_inner_type) + .expect("Vec inner type not found for Element"); + quote! { #vec_inner_type } + }; + + let merge_element = if is_decimal_element { + quote! { + match helper_opt { + Some(#primitive_or_element_ident::Element(mut element)) => { + if let Some(ext_helper) = ext_helper_opt { + if element.id.is_none() { + element.id = ext_helper.id; + } + if element.extension.is_none() { + element.extension = ext_helper.extension; + } else if let Some(mut extra) = ext_helper.extension { + element + .extension + .get_or_insert_with(Vec::new) + .extend(extra); + } + } + Some(element) + } + Some(#primitive_or_element_ident::Primitive(json_val)) => { + if json_val.is_null() && ext_helper_opt.is_none() { + None + } else { + let precise_decimal_value = if json_val.is_null() { + None + } else { + Some(crate::PreciseDecimal::deserialize(json_val) + .map_err(serde::de::Error::custom)?) + }; + if precise_decimal_value.is_none() && ext_helper_opt.is_none() { + None + } else { + let mut element = #element_type::default(); + element.value = precise_decimal_value; + if let Some(ext_helper) = ext_helper_opt { + element.id = ext_helper.id; + element.extension = ext_helper.extension; + } + Some(element) + } + } + } + None => { + ext_helper_opt.map(|ext_helper| { + let mut element = #element_type::default(); + element.id = ext_helper.id; + element.extension = ext_helper.extension; + element + }) + } } - .and_then(get_vec_inner_type) - .expect("Vec inner type not found for DecimalElement"); - quote! { #vec_inner_type } - }; - quote! { { // Block expression starts - // Handle Option for primitives and extensions - let primitives = temp_struct.#field_name_ident.unwrap_or_default(); // Vec> - let extensions = temp_struct.#field_name_ident_ext.unwrap_or_default(); // Vec> - let len = primitives.len().max(extensions.len()); - let mut result_vec = Vec::with_capacity(len); - for i in 0..len { - // Get Option by flattening the Option> from the vec - let prim_val_opt = primitives.get(i).cloned().flatten(); - let ext_helper_opt = extensions.get(i).cloned().flatten(); // Keep flatten here - if prim_val_opt.is_some() || ext_helper_opt.is_some() { - // Deserialize the Option into Option - let precise_decimal_value = match prim_val_opt { - Some(json_val) if !json_val.is_null() => { - // Map error explicitly - crate::PreciseDecimal::deserialize(json_val) - .map(Some) - .map_err(serde::de::Error::custom)? // Map error here - }, - _ => None, // Treat None or JSON null as None - }; - result_vec.push(#element_type { - value: precise_decimal_value, - id: ext_helper_opt.as_ref().and_then(|h| h.id.clone()), - extension: ext_helper_opt.as_ref().and_then(|h| h.extension.clone()), - }); + } + } else { + let primitive_type_ident = primitive_value_type + .as_ref() + .expect("non-decimal element missing primitive type"); + quote! { + match helper_opt { + Some(#primitive_or_element_ident::Element(mut element)) => { + if let Some(ext_helper) = ext_helper_opt { + if element.id.is_none() { + element.id = ext_helper.id; + } + if element.extension.is_none() { + element.extension = ext_helper.extension; + } else if let Some(mut extra) = ext_helper.extension { + element + .extension + .get_or_insert_with(Vec::new) + .extend(extra); + } + } + Some(element) + } + Some(#primitive_or_element_ident::Primitive(json_val)) => { + if json_val.is_null() && ext_helper_opt.is_none() { + None + } else { + let primitive_value = if json_val.is_null() { + None + } else { + Some(#convert_fn_ident::<#primitive_type_ident>(json_val) + .map_err(serde::de::Error::custom)?) + }; + if primitive_value.is_none() && ext_helper_opt.is_none() { + None + } else { + let mut element = #element_type::default(); + element.value = primitive_value; + if let Some(ext_helper) = ext_helper_opt { + element.id = ext_helper.id; + element.extension = ext_helper.extension; + } + Some(element) + } + } + } + None => { + ext_helper_opt.map(|ext_helper| { + let mut element = #element_type::default(); + element.id = ext_helper.id; + element.extension = ext_helper.extension; + element + }) } - // Note: Skipping adding element if both parts are null/None } - result_vec // Return the vec directly - } } // Block expression ends + } + }; + + if is_option { + quote! { + #field_name_ident: { + let (primitives, has_primitives) = match temp_struct.#field_name_ident { + Some(holder) => (holder.into(), true), + None => (Vec::new(), false), + }; + let (extensions, has_extensions) = match temp_struct.#field_name_ident_ext { + Some(holder) => (holder.into(), true), + None => (Vec::new(), false), + }; + if has_primitives || has_extensions { + let len = primitives.len().max(extensions.len()); + let mut result_vec = Vec::with_capacity(len); + for i in 0..len { + let helper_opt = primitives.get(i).cloned().flatten(); + let ext_helper_opt = extensions.get(i).cloned().flatten(); + if let Some(element) = { #merge_element } { + result_vec.push(element); + } + } + if result_vec.is_empty() { + None + } else { + Some(result_vec) + } + } else { + None + } + }, + } } else { - // Logic specifically for Vec> or Option>> (non-decimal) - let element_type = { - // Determine Element type - let vec_inner_type = if is_option { - get_option_inner_type(field_ty) - } else { - Some(field_ty) + quote! { + #field_name_ident: { + let primitives = temp_struct.#field_name_ident.into(); + let extensions = temp_struct.#field_name_ident_ext + .map(|holder| holder.into()) + .unwrap_or_default(); + let len = primitives.len().max(extensions.len()); + let mut result_vec = Vec::with_capacity(len); + for i in 0..len { + let helper_opt = primitives.get(i).cloned().flatten(); + let ext_helper_opt = extensions.get(i).cloned().flatten(); + if let Some(element) = { #merge_element } { + result_vec.push(element); + } + } + result_vec + }, + } + } + } else { + let element_type = if is_option { + get_option_inner_type(field_ty) + .expect("Option inner type not found for Element field") + } else { + field_ty + }; + + let merge_element = if is_decimal_element { + quote! { + match helper_opt { + Some(#primitive_or_element_ident::Element(mut element)) => { + if let Some(ext_helper) = ext_helper_opt { + if element.id.is_none() { + element.id = ext_helper.id; + } + if element.extension.is_none() { + element.extension = ext_helper.extension; + } else if let Some(mut extra) = ext_helper.extension { + element + .extension + .get_or_insert_with(Vec::new) + .extend(extra); + } + } + Some(element) + } + Some(#primitive_or_element_ident::Primitive(json_val)) => { + if json_val.is_null() && ext_helper_opt.is_none() { + None + } else { + let precise_decimal_value = if json_val.is_null() { + None + } else { + Some(crate::PreciseDecimal::deserialize(json_val) + .map_err(serde::de::Error::custom)?) + }; + if precise_decimal_value.is_none() && ext_helper_opt.is_none() { + None + } else { + let mut element = #element_type::default(); + element.value = precise_decimal_value; + if let Some(ext_helper) = ext_helper_opt { + element.id = ext_helper.id; + element.extension = ext_helper.extension; + } + Some(element) + } + } + } + None => { + ext_helper_opt.map(|ext_helper| { + let mut element = #element_type::default(); + element.id = ext_helper.id; + element.extension = ext_helper.extension; + element + }) + } } - .and_then(get_vec_inner_type) - .expect("Vec inner type not found for Element"); - quote! { #vec_inner_type } - }; - quote! { { // Block expression starts - // Handle Option for primitives and extensions - let primitives = temp_struct.#field_name_ident.unwrap_or_default(); // Vec> - let extensions = temp_struct.#field_name_ident_ext.unwrap_or_default(); // Vec> - let len = primitives.len().max(extensions.len()); - let mut result_vec = Vec::with_capacity(len); - for i in 0..len { - // Get Option by flattening the Option> from the vec - let prim_val_opt = primitives.get(i).cloned().flatten(); - let ext_helper_opt = extensions.get(i).cloned().flatten(); // Keep flatten here - if prim_val_opt.is_some() || ext_helper_opt.is_some() { - result_vec.push(#element_type { - value: prim_val_opt, // Assign Option directly - id: ext_helper_opt.as_ref().and_then(|h| h.id.clone()), - extension: ext_helper_opt.as_ref().and_then(|h| h.extension.clone()), - }); + } + } else { + let primitive_type_ident = primitive_value_type + .as_ref() + .expect("non-decimal element missing primitive type"); + quote! { + match helper_opt { + Some(#primitive_or_element_ident::Element(mut element)) => { + if let Some(ext_helper) = ext_helper_opt { + if element.id.is_none() { + element.id = ext_helper.id; + } + if element.extension.is_none() { + element.extension = ext_helper.extension; + } else if let Some(mut extra) = ext_helper.extension { + element + .extension + .get_or_insert_with(Vec::new) + .extend(extra); + } + } + Some(element) + } + Some(#primitive_or_element_ident::Primitive(json_val)) => { + if json_val.is_null() && ext_helper_opt.is_none() { + None + } else { + let primitive_value = if json_val.is_null() { + None + } else { + Some(#convert_fn_ident::<#primitive_type_ident>(json_val) + .map_err(serde::de::Error::custom)?) + }; + if primitive_value.is_none() && ext_helper_opt.is_none() { + None + } else { + let mut element = #element_type::default(); + element.value = primitive_value; + if let Some(ext_helper) = ext_helper_opt { + element.id = ext_helper.id; + element.extension = ext_helper.extension; + } + Some(element) + } + } + } + None => { + ext_helper_opt.map(|ext_helper| { + let mut element = #element_type::default(); + element.id = ext_helper.id; + element.extension = ext_helper.extension; + element + }) } - // Note: Skipping adding element if both parts are null/None } - result_vec - } } // Block expression ends - }; // End of outer if/else determining construction_logic + } + }; - // Assign the correct construction_logic based on is_option if is_option { - // For Option>, construct Some if either primitive or extension array was present quote! { - #field_name_ident: if temp_struct.#field_name_ident.is_some() || temp_struct.#field_name_ident_ext.is_some() { - // No '?' needed here as the block returns Vec directly - Some(#construction_logic) - } else { - None + #field_name_ident: { + let helper_opt = temp_struct.#field_name_ident; + let ext_helper_opt = temp_struct.#field_name_ident_ext; + if helper_opt.is_none() && ext_helper_opt.is_none() { + None + } else { + { #merge_element } + } }, } } else { - // Direct Vec field assignment (always construct the Vec) quote! { - // No '?' needed here as the block returns Vec directly - #field_name_ident: #construction_logic, + #field_name_ident: { + let helper_opt = temp_struct.#field_name_ident; + let ext_helper_opt = temp_struct.#field_name_ident_ext; + { #merge_element }.unwrap_or_else(#field_ty::default) + }, } } - } else if is_decimal_element { - // Handle single DecimalElement or Option + } + } else { + // Not an FHIR element type + if is_vec { if is_option { - // Logic for Option - let construction_logic = quote! { { // Block expression starts - // Deserialize PreciseDecimal from Option - let precise_decimal_value = match temp_struct.#field_name_ident { - Some(json_val) if !json_val.is_null() => { - // Attempt deserialization, map error explicitly - crate::PreciseDecimal::deserialize(json_val) - .map(Some) - .map_err(serde::de::Error::custom)? // Map error here - }, - _ => None, // Treat None or JSON null as None - }; - // Construct the DecimalElement (no Ok() needed) - crate::DecimalElement { - value: precise_decimal_value, - id: temp_struct.#field_name_ident_ext.as_ref().and_then(|h| h.id.clone()), - extension: temp_struct.#field_name_ident_ext.as_ref().and_then(|h| h.extension.clone()), - } - } }; // Block expression ends - // Wrap in Some() only if value or extension exists quote! { - #field_name_ident: if temp_struct.#field_name_ident.is_some() || temp_struct.#field_name_ident_ext.is_some() { - // No '?' needed here as the block returns DecimalElement directly - Some(#construction_logic) - } else { - None // If neither field present, result is None - }, + #field_name_ident: temp_struct.#field_name_ident + .map(|holder| holder.into()), } } else { - // Logic for non-optional DecimalElement quote! { - #field_name_ident: { // Block expression starts - // Deserialize PreciseDecimal from Option - let precise_decimal_value = match temp_struct.#field_name_ident { - Some(json_val) if !json_val.is_null() => { - // Attempt deserialization, map error explicitly - crate::PreciseDecimal::deserialize(json_val) - .map(Some) - .map_err(serde::de::Error::custom)? // Map error here - }, - _ => None, // Treat None or JSON null as None - }; - // Construct the DecimalElement (no Ok() needed) - crate::DecimalElement { - value: precise_decimal_value, - id: temp_struct.#field_name_ident_ext.as_ref().and_then(|h| h.id.clone()), - extension: temp_struct.#field_name_ident_ext.as_ref().and_then(|h| h.extension.clone()), - } - }, // No '?' needed after block + #field_name_ident: temp_struct.#field_name_ident.into(), } } - } else if is_option { - // Handle single Option (already checked !is_vec) - // Revert to simpler logic without explicit type annotation for value - // Get the inner type T from Option to construct Element - let inner_element_type = get_option_inner_type(field_ty) - .expect("Option inner type not found"); - quote! { - #field_name_ident: if temp_struct.#field_name_ident.is_some() || temp_struct.#field_name_ident_ext.is_some() { - Some(#inner_element_type { // Use the unwrapped Element type - value: temp_struct.#field_name_ident, // Assign directly - id: temp_struct.#field_name_ident_ext.as_ref().and_then(|h| h.id.clone()), - extension: temp_struct.#field_name_ident_ext.as_ref().and_then(|h| h.extension.clone()), - }) - } else { - None // Assign None if neither value nor extension part exists - }, - } } else { - // Handles Element (non-option, non-vec) - // Construct element explicitly quote! { - #field_name_ident: { - let mut element = #field_ty::default(); // Create default element (e.g., Code::default()) - element.value = temp_struct.#field_name_ident; // Assign Option - // Assign id/extension from helper if present - if let Some(helper) = temp_struct.#field_name_ident_ext { - element.id = helper.id; - element.extension = helper.extension; - } - element // Return the constructed element - }, + #field_name_ident: temp_struct.#field_name_ident, } } - } else { - // Not an FHIR element type - quote! { - #field_name_ident: temp_struct.#field_name_ident, - } }; // Semicolon ends the let constructor_attribute binding temp_struct_attributes.push(temp_struct_attribute); @@ -2294,14 +2406,8 @@ fn generate_deserialize_impl(data: &Data, name: &Ident) -> proc_macro2::TokenStr } let id_extension_helper_def = quote! { - // Helper struct for deserializing the id/extension part from _fieldName - #[derive(Clone, Deserialize, Default)] // Add Default derive - struct IdAndExtensionHelper { - #[serde(skip_serializing_if = "Option::is_none")] // Change from default - id: Option, - #[serde(skip_serializing_if = "Option::is_none")] // Change from default - extension: Option>, - } + // Type alias for deserializing the id/extension part from _fieldName + type IdAndExtensionHelper = helios_serde_support::IdAndExtensionOwned; }; let temp_struct = quote! { @@ -2311,7 +2417,47 @@ fn generate_deserialize_impl(data: &Data, name: &Ident) -> proc_macro2::TokenStr } }; + let convert_helper_fn = quote! { + fn #convert_fn_ident( + value: serde_json::Value, + ) -> Result + where + T: serde::de::DeserializeOwned, + { + match serde_json::from_value::(value.clone()) { + Ok(v) => Ok(v), + Err(_) => { + if let serde_json::Value::String(s) = value { + if let Ok(b) = s.parse::() { + return serde_json::from_value(serde_json::Value::Bool(b)) + .map_err(|err| ::custom(err)); + } + if let Ok(n) = s.parse::() { + return serde_json::from_value(serde_json::Value::Number(n.into())) + .map_err(|err| ::custom(err)); + } + if let Ok(f) = s.parse::() { + if let Some(num) = serde_json::Number::from_f64(f) { + return serde_json::from_value(serde_json::Value::Number(num)) + .map_err(|err| ::custom(err)); + } + } + serde_json::from_value(serde_json::Value::String(s)) + .map_err(|err| ::custom(err)) + } else { + Err(::custom(format!( + "unexpected primitive value type {:?} for {}", + value, + ::std::any::type_name::() + ))) + } + } + } + } + }; + quote! { + #convert_helper_fn // Define the helper struct at the top level of the deserialize function #id_extension_helper_def diff --git a/crates/fhir/Cargo.toml b/crates/fhir/Cargo.toml index 4c92e3edd..f8b44f863 100644 --- a/crates/fhir/Cargo.toml +++ b/crates/fhir/Cargo.toml @@ -24,6 +24,7 @@ serde_json = { workspace = true, features = ["raw_value"] } clap = { version = "4.0", features = ["derive"] } helios-fhir-macro = { path = "../fhir-macro", version = "0.1.32" } helios-fhirpath-support = { path = "../fhirpath-support", version = "0.1.32" } +helios-serde-support = { path = "../serde-support", version = "0.1.32" } time = "0.3" chrono = { workspace = true } # Re-add serde-with-arbitrary-precision, keep macros @@ -39,5 +40,3 @@ zip = "0.6" [package.metadata.docs.rs] all-features = true rustdoc-args = ["--cfg", "docsrs"] - - diff --git a/crates/fhir/build.rs b/crates/fhir/build.rs index 37503d2f1..69f62f69e 100644 --- a/crates/fhir/build.rs +++ b/crates/fhir/build.rs @@ -20,14 +20,18 @@ fn main() { println!("cargo:warning=Downloading R6 test data from HL7 build server"); - let resources_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/data/R6"); + let json_resources_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/data/json/R6"); + let xml_resources_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/data/xml/R6"); - // Create the resources directory if it doesn't exist - fs::create_dir_all(&resources_dir).expect("Failed to create resources directory"); + // Create the resources directories if they don't exist + fs::create_dir_all(&json_resources_dir).expect("Failed to create JSON resources directory"); + fs::create_dir_all(&xml_resources_dir).expect("Failed to create XML resources directory"); - let url = "https://build.fhir.org/examples-json.zip"; + let json_url = "https://build.fhir.org/examples-json.zip"; + let xml_url = "https://build.fhir.org/examples.zip"; - let output_path = resources_dir.join("examples.json.zip"); + let json_output_path = json_resources_dir.join("examples.json.zip"); + let xml_output_path = xml_resources_dir.join("examples.xml.zip"); println!("Downloading test data ..."); @@ -40,12 +44,15 @@ fn main() { // Try downloading with retries const MAX_RETRIES: u32 = 3; + + // Download JSON examples + println!("Downloading JSON examples..."); let mut last_error = None; for attempt in 1..=MAX_RETRIES { - println!("Download attempt {} of {}", attempt, MAX_RETRIES); + println!("JSON download attempt {} of {}", attempt, MAX_RETRIES); - match download_with_retry(&client, url, &output_path) { + match download_with_retry(&client, json_url, &json_output_path) { Ok(bytes) => { println!("Downloaded {} bytes", bytes); last_error = None; @@ -66,13 +73,56 @@ fn main() { if let Some(error) = last_error { panic!( - "Failed to download file after {} attempts: {}", + "Failed to download JSON file after {} attempts: {}", MAX_RETRIES, error ); } + // Extract JSON examples + extract_and_clean(&json_output_path, &json_resources_dir, "examples.json.zip"); + + // Download XML examples + println!("Downloading XML examples..."); + last_error = None; + + for attempt in 1..=MAX_RETRIES { + println!("XML download attempt {} of {}", attempt, MAX_RETRIES); + + match download_with_retry(&client, xml_url, &xml_output_path) { + Ok(bytes) => { + println!("Downloaded {} bytes", bytes); + last_error = None; + break; + } + Err(e) => { + println!("Attempt {} failed: {}", attempt, e); + last_error = Some(e); + + if attempt < MAX_RETRIES { + let wait_time = Duration::from_secs(5 * attempt as u64); + println!("Waiting {:?} before retry...", wait_time); + thread::sleep(wait_time); + } + } + } + } + + if let Some(error) = last_error { + panic!( + "Failed to download XML file after {} attempts: {}", + MAX_RETRIES, error + ); + } + + // Extract XML examples + extract_and_clean(&xml_output_path, &xml_resources_dir, "examples.xml.zip"); + + println!("FHIR test data downloaded successfully"); +} + +fn extract_and_clean(zip_path: &PathBuf, resources_dir: &PathBuf, zip_filename: &str) { // Verify and extract the downloaded file - let file = fs::File::open(&output_path).expect("Failed to open downloaded file"); + let file = fs::File::open(zip_path).expect("Failed to open downloaded file"); let metadata = file.metadata().expect("Failed to get file metadata"); println!("File size on disk: {} bytes", metadata.len()); @@ -84,12 +134,12 @@ fn main() { // Clean out the resources directory before extracting (removes old files that may no longer exist in the zip) println!("cargo:warning=Cleaning resources directory before extraction..."); - for entry in fs::read_dir(&resources_dir).unwrap() { + for entry in fs::read_dir(resources_dir).unwrap() { let entry = entry.unwrap(); let path = entry.path(); // Skip the zip file itself - if path.file_name() == Some(std::ffi::OsStr::new("examples.json.zip")) { + if path.file_name() == Some(std::ffi::OsStr::new(zip_filename)) { continue; } @@ -122,9 +172,7 @@ fn main() { } // Delete the zip file after extraction - fs::remove_file(output_path).expect("Failed to delete zip file"); - - println!("FHIR test data downloaded successfully"); + fs::remove_file(zip_path).expect("Failed to delete zip file"); } fn download_with_retry( diff --git a/crates/fhir/src/lib.rs b/crates/fhir/src/lib.rs index aa72a6a94..d24d9c28f 100644 --- a/crates/fhir/src/lib.rs +++ b/crates/fhir/src/lib.rs @@ -43,6 +43,8 @@ use chrono::{DateTime as ChronoDateTime, NaiveDate, NaiveTime, Utc}; use helios_fhirpath_support::{EvaluationResult, IntoEvaluationResult, TypeInfoResult}; +use helios_serde_support::SingleOrVec; + use rust_decimal::Decimal; use serde::{ Deserialize, Serialize, @@ -1432,6 +1434,9 @@ pub mod parameters; // Re-export commonly used types from parameters module pub use parameters::{ParameterValueAccessor, VersionIndependentParameters}; +// Internal helpers used by the derive macro; not part of the public API +#[doc(hidden)] + /// Multi-version FHIR resource container supporting version-agnostic operations. /// /// This enum provides a unified interface for working with FHIR resources across @@ -1843,7 +1848,9 @@ where if extension.is_some() { return Err(de::Error::duplicate_field("extension")); } - extension = Some(map.next_value()?); + // Handle single or vec for extension field (XML compatibility) + let single_or_vec: SingleOrVec = map.next_value()?; + extension = Some(single_or_vec.into()); } "value" => { if value.is_some() { @@ -1928,10 +1935,11 @@ pub struct Element { } impl Element { - /// Returns `true` if no value, id, or extensions are present. - #[inline] + /// Returns true when no value, id, or extensions are present. pub fn is_empty(&self) -> bool { - self.value.is_none() && self.id.is_none() && self.extension.is_none() + self.value.is_none() + && self.id.is_none() + && self.extension.as_ref().map_or(true, |ext| ext.is_empty()) } } @@ -2422,12 +2430,6 @@ impl DecimalElement { value: Some(precise_value), } } - - /// Returns `true` if the element has no value, id, or extensions. - #[inline] - pub fn is_empty(&self) -> bool { - self.value.is_none() && self.id.is_none() && self.extension.is_none() - } } // Custom Deserialize for DecimalElement using intermediate Value @@ -2501,8 +2503,9 @@ where if extension.is_some() { return Err(de::Error::duplicate_field("extension")); } - // Deserialize extension directly from its Value - extension = Deserialize::deserialize(v).map_err(de::Error::custom)?; + // Handle single or vec for extension field (XML compatibility) + let single_or_vec: SingleOrVec = Deserialize::deserialize(v).map_err(de::Error::custom)?; + extension = Some(single_or_vec.into()); } "value" => { if value.is_some() { diff --git a/crates/fhir/tests/data/R6/codesystem-permission-rule-combining.json b/crates/fhir/tests/data/R6/codesystem-permission-rule-combining.json deleted file mode 100644 index c38c42040..000000000 --- a/crates/fhir/tests/data/R6/codesystem-permission-rule-combining.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "resourceType": "CodeSystem", - "id": "permission-rule-combining", - "meta": { - "lastUpdated": "2025-11-18T06:23:40.261+11:00" - }, - "text": { - "status": "generated", - "div": "\u003cdiv xmlns\u003d\"http://www.w3.org/1999/xhtml\"\u003e\u003cp class\u003d\"res-header-id\"\u003e\u003cb\u003eGenerated Narrative: CodeSystem permission-rule-combining\u003c/b\u003e\u003c/p\u003e\u003ca name\u003d\"permission-rule-combining\"\u003e \u003c/a\u003e\u003ca name\u003d\"hcpermission-rule-combining\"\u003e \u003c/a\u003e\u003cdiv style\u003d\"display: inline-block; background-color: #d9e0e7; padding: 6px; margin: 4px; border: 1px solid #8da1b4; border-radius: 5px; line-height: 60%\"\u003e\u003cp style\u003d\"margin-bottom: 0px\"\u003eLast updated: 2022-08-05T10:01:24.148+11:00\u003c/p\u003e\u003c/div\u003e\u003cp\u003eThis case-sensitive code system \u003ccode\u003ehttp://hl7.org/fhir/permission-rule-combining\u003c/code\u003e defines the following codes:\u003c/p\u003e\u003ctable class\u003d\"codes\"\u003e\u003ctr\u003e\u003ctd style\u003d\"white-space:nowrap\"\u003e\u003cb\u003eCode\u003c/b\u003e\u003c/td\u003e\u003ctd\u003e\u003cb\u003eDisplay\u003c/b\u003e\u003c/td\u003e\u003ctd\u003e\u003cb\u003eDefinition\u003c/b\u003e\u003c/td\u003e\u003c/tr\u003e\u003ctr\u003e\u003ctd style\u003d\"white-space:nowrap\"\u003edeny-overrides\u003ca name\u003d\"permission-rule-combining-deny-overrides\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd\u003eDeny-overrides\u003c/td\u003e\u003ctd\u003eThe deny overrides combining algorithm is intended for those cases where a deny decision should have priority over a permit decision.\u003c/td\u003e\u003c/tr\u003e\u003ctr\u003e\u003ctd style\u003d\"white-space:nowrap\"\u003epermit-overrides\u003ca name\u003d\"permission-rule-combining-permit-overrides\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd\u003ePermit-overrides\u003c/td\u003e\u003ctd\u003eThe permit overrides combining algorithm is intended for those cases where a permit decision should have priority over a deny decision.\u003c/td\u003e\u003c/tr\u003e\u003ctr\u003e\u003ctd style\u003d\"white-space:nowrap\"\u003eordered-deny-overrides\u003ca name\u003d\"permission-rule-combining-ordered-deny-overrides\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd\u003eOrdered-deny-overrides\u003c/td\u003e\u003ctd\u003eThe behavior of this algorithm is identical to that of the “Deny-overrides” rule-combining algorithm with one exception. The order in which the collection of rules is evaluated SHALL match the order as listed in the permission.\u003c/td\u003e\u003c/tr\u003e\u003ctr\u003e\u003ctd style\u003d\"white-space:nowrap\"\u003eordered-permit-overrides\u003ca name\u003d\"permission-rule-combining-ordered-permit-overrides\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd\u003eOrdered-permit-overrides\u003c/td\u003e\u003ctd\u003eThe behavior of this algorithm is identical to that of the “Permit-overrides” rule-combining algorithm with one exception. The order in which the collection of rules is evaluated SHALL match the order as listed in the permission.\u003c/td\u003e\u003c/tr\u003e\u003ctr\u003e\u003ctd style\u003d\"white-space:nowrap\"\u003edeny-unless-permit\u003ca name\u003d\"permission-rule-combining-deny-unless-permit\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd\u003eDeny-unless-permit\u003c/td\u003e\u003ctd\u003eThe “Deny-unless-permit” combining algorithm is intended for those cases where a permit decision should have priority over a deny decision, and an “Indeterminate” or “NotApplicable” must never be the result. It is particularly useful at the top level in a policy structure to ensure that a PDP will always return a definite “Permit” or “Deny” result.\u003c/td\u003e\u003c/tr\u003e\u003ctr\u003e\u003ctd style\u003d\"white-space:nowrap\"\u003epermit-unless-deny\u003ca name\u003d\"permission-rule-combining-permit-unless-deny\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd\u003ePermit-unless-deny\u003c/td\u003e\u003ctd\u003eThe “Permit-unless-deny” combining algorithm is intended for those cases where a deny decision should have priority over a permit decision, and an “Indeterminate” or “NotApplicable” must never be the result. It is particularly useful at the top level in a policy structure to ensure that a PDP will always return a definite “Permit” or “Deny” result. This algorithm has the following behavior.\u003c/td\u003e\u003c/tr\u003e\u003c/table\u003e\u003c/div\u003e" - }, - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg", - "valueCode": "sec" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status", - "valueCode": "normative" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm", - "valueInteger": 1 - } - ], - "url": "http://hl7.org/fhir/permission-rule-combining", - "identifier": [ - { - "system": "urn:ietf:rfc:3986", - "value": "urn:oid:2.16.840.1.113883.4.642.4.2070" - } - ], - "version": "6.0.0-ballot3", - "name": "PermissionRuleCombining", - "title": "Permission Rule Combining", - "status": "active", - "experimental": false, - "date": "2022-08-05T10:01:24+11:00", - "publisher": "HL7 (FHIR Project)", - "contact": [ - { - "telecom": [ - { - "system": "url", - "value": "http://hl7.org/fhir" - }, - { - "system": "email", - "value": "fhir@lists.hl7.org" - } - ] - } - ], - "description": "Codes identifying the rule combining. See XACML Combining algorithms http://docs.oasis-open.org/xacml/3.0/xacml-3.0-core-spec-cos01-en.html", - "jurisdiction": [ - { - "coding": [ - { - "system": "http://unstats.un.org/unsd/methods/m49/m49.htm", - "code": "001", - "display": "World" - } - ] - } - ], - "caseSensitive": true, - "content": "complete", - "concept": [ - { - "code": "deny-overrides", - "display": "Deny-overrides", - "definition": "The deny overrides combining algorithm is intended for those cases where a deny decision should have priority over a permit decision." - }, - { - "code": "permit-overrides", - "display": "Permit-overrides", - "definition": "The permit overrides combining algorithm is intended for those cases where a permit decision should have priority over a deny decision." - }, - { - "code": "ordered-deny-overrides", - "display": "Ordered-deny-overrides", - "definition": "The behavior of this algorithm is identical to that of the “Deny-overrides” rule-combining algorithm with one exception. The order in which the collection of rules is evaluated SHALL match the order as listed in the permission." - }, - { - "code": "ordered-permit-overrides", - "display": "Ordered-permit-overrides", - "definition": "The behavior of this algorithm is identical to that of the “Permit-overrides” rule-combining algorithm with one exception. The order in which the collection of rules is evaluated SHALL match the order as listed in the permission." - }, - { - "code": "deny-unless-permit", - "display": "Deny-unless-permit", - "definition": "The “Deny-unless-permit” combining algorithm is intended for those cases where a permit decision should have priority over a deny decision, and an “Indeterminate” or “NotApplicable” must never be the result. It is particularly useful at the top level in a policy structure to ensure that a PDP will always return a definite “Permit” or “Deny” result." - }, - { - "code": "permit-unless-deny", - "display": "Permit-unless-deny", - "definition": "The “Permit-unless-deny” combining algorithm is intended for those cases where a deny decision should have priority over a permit decision, and an “Indeterminate” or “NotApplicable” must never be the result. It is particularly useful at the top level in a policy structure to ensure that a PDP will always return a definite “Permit” or “Deny” result. This algorithm has the following behavior." - } - ] -} \ No newline at end of file diff --git a/crates/fhir/tests/data/R6/codesystem-permission-status.json b/crates/fhir/tests/data/R6/codesystem-permission-status.json deleted file mode 100644 index c14a9c658..000000000 --- a/crates/fhir/tests/data/R6/codesystem-permission-status.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "resourceType": "CodeSystem", - "id": "permission-status", - "meta": { - "lastUpdated": "2025-11-17T19:23:40.261+00:00" - }, - "text": { - "status": "generated", - "div": "\u003cdiv xmlns\u003d\"http://www.w3.org/1999/xhtml\"\u003e\u003cp class\u003d\"res-header-id\"\u003e\u003cb\u003eGenerated Narrative: CodeSystem permission-status\u003c/b\u003e\u003c/p\u003e\u003ca name\u003d\"permission-status\"\u003e \u003c/a\u003e\u003ca name\u003d\"hcpermission-status\"\u003e \u003c/a\u003e\u003cp\u003eThis case-sensitive code system \u003ccode\u003ehttp://hl7.org/fhir/permission-status\u003c/code\u003e defines the following codes:\u003c/p\u003e\u003ctable class\u003d\"codes\"\u003e\u003ctr\u003e\u003ctd style\u003d\"white-space:nowrap\"\u003e\u003cb\u003eCode\u003c/b\u003e\u003c/td\u003e\u003ctd\u003e\u003cb\u003eDisplay\u003c/b\u003e\u003c/td\u003e\u003ctd\u003e\u003cb\u003eDefinition\u003c/b\u003e\u003c/td\u003e\u003c/tr\u003e\u003ctr\u003e\u003ctd style\u003d\"white-space:nowrap\"\u003eactive\u003ca name\u003d\"permission-status-active\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd\u003eActive\u003c/td\u003e\u003ctd\u003ePermission is given.\u003c/td\u003e\u003c/tr\u003e\u003ctr\u003e\u003ctd style\u003d\"white-space:nowrap\"\u003eentered-in-error\u003ca name\u003d\"permission-status-entered-in-error\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd\u003eEntered in Error\u003c/td\u003e\u003ctd\u003ePermission was entered in error and is not active.\u003c/td\u003e\u003c/tr\u003e\u003ctr\u003e\u003ctd style\u003d\"white-space:nowrap\"\u003edraft\u003ca name\u003d\"permission-status-draft\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd\u003eDraft\u003c/td\u003e\u003ctd\u003ePermission is being defined.\u003c/td\u003e\u003c/tr\u003e\u003ctr\u003e\u003ctd style\u003d\"white-space:nowrap\"\u003erejected\u003ca name\u003d\"permission-status-rejected\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd\u003eRejected\u003c/td\u003e\u003ctd\u003ePermission not granted.\u003c/td\u003e\u003c/tr\u003e\u003c/table\u003e\u003c/div\u003e" - }, - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg", - "valueCode": "sec" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status", - "valueCode": "normative" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm", - "valueInteger": 1 - } - ], - "url": "http://hl7.org/fhir/permission-status", - "identifier": [ - { - "system": "urn:ietf:rfc:3986", - "value": "urn:oid:2.16.840.1.113883.4.642.4.2071" - } - ], - "version": "6.0.0-ballot3", - "name": "PermissionStatus", - "title": "Permission Status", - "status": "active", - "experimental": false, - "date": "2021-01-05T10:01:24+11:00", - "publisher": "HL7 (FHIR Project)", - "contact": [ - { - "telecom": [ - { - "system": "url", - "value": "http://hl7.org/fhir" - }, - { - "system": "email", - "value": "fhir@lists.hl7.org" - } - ] - } - ], - "description": "Codes identifying the lifecycle stage of a product.", - "jurisdiction": [ - { - "coding": [ - { - "system": "http://unstats.un.org/unsd/methods/m49/m49.htm", - "code": "001", - "display": "World" - } - ] - } - ], - "caseSensitive": true, - "valueSet": "http://hl7.org/fhir/ValueSet/permission-status", - "content": "complete", - "concept": [ - { - "code": "active", - "display": "Active", - "definition": "Permission is given." - }, - { - "code": "entered-in-error", - "display": "Entered in Error", - "definition": "Permission was entered in error and is not active." - }, - { - "code": "draft", - "display": "Draft", - "definition": "Permission is being defined." - }, - { - "code": "rejected", - "display": "Rejected", - "definition": "Permission not granted." - } - ] -} \ No newline at end of file diff --git a/crates/fhir/tests/data/R6/permission-example-base.json b/crates/fhir/tests/data/R6/permission-example-base.json deleted file mode 100644 index 7028a7e8a..000000000 --- a/crates/fhir/tests/data/R6/permission-example-base.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "resourceType": "Permission", - "id": "example-base", - "status": "active", - "asserter": { - "reference": "Organization/f203" - }, - "date": [ - "2018-12-24" - ], - "combining": "deny-overrides", - "rule": [ - { - "type": "deny", - "data": [ - { - "security": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActCode", - "code": "SUD" - } - ] - } - ], - "activity": [ - { - "action": [ - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/consentaction", - "code": "access" - } - ] - } - ] - } - ] - } - ], - "meta": { - "tag": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HTEST", - "display": "test health data" - } - ] - } -} \ No newline at end of file diff --git a/crates/fhir/tests/data/R6/permission-example-bundle-residual.json b/crates/fhir/tests/data/R6/permission-example-bundle-residual.json deleted file mode 100644 index 8fbe0da97..000000000 --- a/crates/fhir/tests/data/R6/permission-example-bundle-residual.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "resourceType": "Bundle", - "id": "ex-SearchSet-withPermission", - "meta": { - "security": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HTEST" - }, - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActCode", - "code": "CPLYPOL" - } - ], - "tag": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HTEST", - "display": "test health data" - } - ] - }, - "type": "searchset", - "timestamp": "2023-11-22T09:32:24Z", - "total": 2, - "link": [ - { - "relation": "self", - "url": "http://test.fhir.net/R4/fhir/Observation?patient\u003dexample\u0026status\u003dcurrent" - } - ], - "entry": [ - { - "fullUrl": "http://test.fhir.net/R4/fhir/Observation/in-Observation", - "resource": { - "resourceType": "Observation", - "id": "in-Observation", - "meta": { - "security": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActCode", - "code": "ETH" - }, - { - "system": "http://terminology.hl7.org/CodeSystem/v3-Confidentiality", - "code": "R" - } - ] - }, - "text": { - "status": "generated", - "div": "\u003cdiv xmlns\u003d\"http://www.w3.org/1999/xhtml\"\u003e\u003cp class\u003d\"res-header-id\"\u003e\u003cb\u003eGenerated Narrative: Observation in-Observation\u003c/b\u003e\u003c/p\u003e\u003ca name\u003d\"in-Observation\"\u003e \u003c/a\u003e\u003ca name\u003d\"hcin-Observation\"\u003e \u003c/a\u003e\u003cdiv style\u003d\"display: inline-block; background-color: #d9e0e7; padding: 6px; margin: 4px; border: 1px solid #8da1b4; border-radius: 5px; line-height: 60%\"\u003e\u003cp style\u003d\"margin-bottom: 0px\"/\u003e\u003cp style\u003d\"margin-bottom: 0px\"\u003eSecurity Labels: substance abuse information sensitivity (Details: ActCode code ETH \u003d \u0027substance abuse information sensitivity\u0027), restricted (Details: Confidentiality code R \u003d \u0027restricted\u0027)\u003c/p\u003e\u003c/div\u003e\u003cp\u003e\u003cb\u003estatus\u003c/b\u003e: Final\u003c/p\u003e\u003cp\u003e\u003cb\u003ecode\u003c/b\u003e: \u003cspan title\u003d\"Codes:{http://loinc.org 74013-4}\"\u003eAlcoholic drinks per day\u003c/span\u003e\u003c/p\u003e\u003cp\u003e\u003cb\u003esubject\u003c/b\u003e: \u003ca href\u003d\"patient-example.html\"\u003eJim Male, DoB: 1974-12-25 ( Medical record number (use: usual, period: 2001-05-06 --\u0026gt; (ongoing)))\u003c/a\u003e\u003c/p\u003e\u003cp\u003e\u003cb\u003eeffective\u003c/b\u003e: 2022-06-13\u003c/p\u003e\u003cp\u003e\u003cb\u003eperformer\u003c/b\u003e: \u003ca href\u003d\"patient-example.html\"\u003eJim Male, DoB: 1974-12-25 ( Medical record number (use: usual, period: 2001-05-06 --\u0026gt; (ongoing)))\u003c/a\u003e\u003c/p\u003e\u003cp\u003e\u003cb\u003evalue\u003c/b\u003e: 5 wine glasses per day\u003cspan style\u003d\"background: LightGoldenRodYellow\"\u003e (Details: UCUM code/d \u003d \u0027/d\u0027)\u003c/span\u003e\u003c/p\u003e\u003c/div\u003e" - }, - "status": "final", - "code": { - "coding": [ - { - "system": "http://loinc.org", - "code": "74013-4" - } - ] - }, - "subject": { - "reference": "Patient/example" - }, - "effectiveDateTime": "2022-06-13", - "performer": [ - { - "reference": "Patient/example" - } - ], - "valueQuantity": { - "value": 5, - "unit": "wine glasses per day", - "system": "http://unitsofmeasure.org", - "code": "/d" - } - }, - "search": { - "mode": "match" - } - }, - { - "fullUrl": "http://test.fhir.net/R4/fhir/Permission/in-permission-redisclose-forbidden-without-consent", - "resource": { - "resourceType": "Permission", - "id": "in-permission-redisclose-forbidden-without-consent", - "meta": { - "security": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HTEST" - } - ] - }, - "text": { - "status": "generated", - "div": "\u003cdiv xmlns\u003d\"http://www.w3.org/1999/xhtml\"\u003e\u003cp class\u003d\"res-header-id\"\u003e\u003cb\u003eGenerated Narrative: Permission in-permission-redisclose-forbidden-without-consent\u003c/b\u003e\u003c/p\u003e\u003ca name\u003d\"in-permission-redisclose-forbidden-without-consent\"\u003e \u003c/a\u003e\u003ca name\u003d\"hcin-permission-redisclose-forbidden-without-consent\"\u003e \u003c/a\u003e\u003cdiv style\u003d\"display: inline-block; background-color: #d9e0e7; padding: 6px; margin: 4px; border: 1px solid #8da1b4; border-radius: 5px; line-height: 60%\"\u003e\u003cp style\u003d\"margin-bottom: 0px\"/\u003e\u003cp style\u003d\"margin-bottom: 0px\"\u003eSecurity Label: test health data (Details: ActReason code HTEST \u003d \u0027test health data\u0027)\u003c/p\u003e\u003c/div\u003e\u003cp\u003e\u003cb\u003estatus\u003c/b\u003e: Active\u003c/p\u003e\u003cp\u003e\u003cb\u003easserter\u003c/b\u003e: \u003ca href\u003d\"organization-example.html\"\u003eOrganization ACME Health\u003c/a\u003e\u003c/p\u003e\u003cp\u003e\u003cb\u003edate\u003c/b\u003e: 2023-11-22\u003c/p\u003e\u003cp\u003e\u003cb\u003ecombining\u003c/b\u003e: Deny-unless-permit\u003c/p\u003e\u003cblockquote\u003e\u003cp\u003e\u003cb\u003erule\u003c/b\u003e\u003c/p\u003e\u003cp\u003e\u003cb\u003etype\u003c/b\u003e: Permit\u003c/p\u003e\u003cblockquote\u003e\u003cp\u003e\u003cb\u003eactivity\u003c/b\u003e\u003c/p\u003e\u003cp\u003e\u003cb\u003epurpose\u003c/b\u003e: \u003cspan title\u003d\"Codes:{http://terminology.hl7.org/CodeSystem/v3-ActReason TREAT}\"\u003etreatment\u003c/span\u003e, \u003cspan title\u003d\"Codes:{http://terminology.hl7.org/CodeSystem/v3-ActReason HPAYMT}\"\u003ehealthcare payment\u003c/span\u003e, \u003cspan title\u003d\"Codes:{http://terminology.hl7.org/CodeSystem/v3-ActReason HOPERAT}\"\u003ehealthcare operations\u003c/span\u003e\u003c/p\u003e\u003c/blockquote\u003e\u003cblockquote\u003e\u003cp\u003e\u003cb\u003elimit\u003c/b\u003e\u003c/p\u003e\u003c/blockquote\u003e\u003c/blockquote\u003e\u003c/div\u003e" - }, - "status": "active", - "asserter": { - "reference": "Organization/example" - }, - "date": [ - "2023-11-22" - ], - "combining": "deny-unless-permit", - "rule": [ - { - "type": "permit", - "activity": [ - { - "purpose": [ - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "TREAT" - } - ] - }, - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HPAYMT" - } - ] - }, - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HOPERAT" - } - ] - } - ] - } - ], - "limit": [ - null - ] - } - ] - }, - "search": { - "mode": "include" - } - } - ] -} \ No newline at end of file diff --git a/crates/fhir/tests/data/R6/permission-example-composite.json b/crates/fhir/tests/data/R6/permission-example-composite.json deleted file mode 100644 index 6adf593fa..000000000 --- a/crates/fhir/tests/data/R6/permission-example-composite.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "resourceType": "Permission", - "id": "example-composite", - "status": "active", - "asserter": { - "reference": "Organization/f203" - }, - "date": [ - "2018-12-24" - ], - "combining": "permit-overrides", - "rule": [ - { - "import": { - "reference": "Permission/example-base" - } - }, - { - "type": "permit", - "data": [ - { - "security": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActCode", - "code": "SUD" - } - ] - } - ], - "activity": [ - { - "actor": [ - { - "reference": { - "reference": "Organization/f203" - } - } - ], - "action": [ - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/consentaction", - "code": "access" - } - ] - } - ], - "purpose": [ - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "TREAT" - } - ] - } - ] - } - ] - } - ], - "meta": { - "tag": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HTEST", - "display": "test health data" - } - ] - } -} \ No newline at end of file diff --git a/crates/fhir/tests/data/R6/permission-example-directory-admin.json b/crates/fhir/tests/data/R6/permission-example-directory-admin.json deleted file mode 100644 index 3c0e7d5c0..000000000 --- a/crates/fhir/tests/data/R6/permission-example-directory-admin.json +++ /dev/null @@ -1,147 +0,0 @@ -{ - "resourceType": "Permission", - "id": "ex-permission-directory-admin", - "meta": { - "security": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HTEST" - } - ], - "tag": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HTEST", - "display": "test health data" - } - ] - }, - "status": "active", - "asserter": { - "reference": "Organization/example" - }, - "date": [ - "2023-11-22" - ], - "combining": "deny-unless-permit", - "rule": [ - { - "type": "permit", - "activity": [ - { - "action": [ - { - "coding": [ - { - "system": "http://hl7.org/fhir/audit-event-action", - "code": "C" - } - ] - }, - { - "coding": [ - { - "system": "http://hl7.org/fhir/audit-event-action", - "code": "R" - } - ] - }, - { - "coding": [ - { - "system": "http://hl7.org/fhir/audit-event-action", - "code": "U" - } - ] - }, - { - "coding": [ - { - "system": "http://hl7.org/fhir/audit-event-action", - "code": "D" - } - ] - }, - { - "coding": [ - { - "system": "http://hl7.org/fhir/audit-event-action", - "code": "E" - } - ] - } - ], - "purpose": [ - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HDIRECT" - } - ] - } - ] - } - ] - }, - { - "type": "permit", - "activity": [ - { - "action": [ - { - "coding": [ - { - "system": "http://hl7.org/fhir/audit-event-action", - "code": "C" - } - ] - }, - { - "coding": [ - { - "system": "http://hl7.org/fhir/audit-event-action", - "code": "R" - } - ] - }, - { - "coding": [ - { - "system": "http://hl7.org/fhir/audit-event-action", - "code": "U" - } - ] - }, - { - "coding": [ - { - "system": "http://hl7.org/fhir/audit-event-action", - "code": "D" - } - ] - }, - { - "coding": [ - { - "system": "http://hl7.org/fhir/audit-event-action", - "code": "E" - } - ] - } - ], - "purpose": [ - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HSYSADMIN" - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/crates/fhir/tests/data/R6/permission-example-exclude.json b/crates/fhir/tests/data/R6/permission-example-exclude.json deleted file mode 100644 index 5f7bd7f65..000000000 --- a/crates/fhir/tests/data/R6/permission-example-exclude.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "resourceType": "Permission", - "id": "example-exclude", - "meta": { - "security": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HTEST" - } - ], - "tag": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HTEST", - "display": "test health data" - } - ] - }, - "status": "active", - "asserter": { - "reference": "Organization/example" - }, - "date": [ - "2023-11-22" - ], - "combining": "deny-unless-permit", - "rule": [ - { - "type": "permit", - "activity": [ - { - "action": [ - { - "coding": [ - { - "system": "http://hl7.org/fhir/audit-event-action", - "code": "C" - } - ] - }, - { - "coding": [ - { - "system": "http://hl7.org/fhir/audit-event-action", - "code": "R" - } - ] - }, - { - "coding": [ - { - "system": "http://hl7.org/fhir/audit-event-action", - "code": "U" - } - ] - }, - { - "coding": [ - { - "system": "http://hl7.org/fhir/audit-event-action", - "code": "D" - } - ] - }, - { - "coding": [ - { - "system": "http://hl7.org/fhir/audit-event-action", - "code": "E" - } - ] - } - ], - "purpose": [ - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HDIRECT" - } - ] - }, - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HSYSADMIN" - } - ] - } - ] - } - ] - }, - { - "type": "permit", - "activity": [ - { - "action": [ - { - "coding": [ - { - "system": "http://hl7.org/fhir/audit-event-action", - "code": "R" - } - ] - }, - { - "coding": [ - { - "system": "http://hl7.org/fhir/audit-event-action", - "code": "E" - } - ] - } - ], - "purpose": [ - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "TREAT" - } - ] - }, - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HPAYMT" - } - ] - }, - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HOPERAT" - } - ] - } - ] - } - ], - "limit": [ - { - "tag": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActCode", - "code": "LOCIS" - } - ] - } - ] - }, - { - "type": "permit", - "data": [ - { - "expression": { - "description": "select all Practitioner resources where the Practitioner has a PractitionerRole with code of doctor", - "language": "application/x-fhir-query", - "expression": "Practitioner?_has:PractitionerRole:practitioner:role\u003dhttp://terminology.hl7.org/CodeSystem/practitioner-role|doctor" - } - } - ], - "activity": [ - { - "action": [ - { - "coding": [ - { - "system": "http://hl7.org/fhir/audit-event-action", - "code": "R" - } - ] - }, - { - "coding": [ - { - "system": "http://hl7.org/fhir/audit-event-action", - "code": "E" - } - ] - } - ], - "purpose": [ - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "PATRQT" - } - ] - } - ] - } - ], - "limit": [ - { - "tag": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActCode", - "code": "LOCIS" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/crates/fhir/tests/data/R6/permission-example-saner.json b/crates/fhir/tests/data/R6/permission-example-saner.json deleted file mode 100644 index 49f2a2253..000000000 --- a/crates/fhir/tests/data/R6/permission-example-saner.json +++ /dev/null @@ -1,153 +0,0 @@ -{ - "resourceType": "Permission", - "id": "example-saner", - "text": { - "status": "generated", - "div": "\u003cdiv xmlns\u003d\"http://www.w3.org/1999/xhtml\"\u003e\n \u003cp\u003e\n Read-Only access to a given SANER report is authorized for PurposeOfUse of Public-Health\n compliance, from the given Organization.\n Access requests authorized shall be recorded.\n \u003c/p\u003e\n \u003cp\u003e\n Read-Only access to a given SANER report is authorized for PurposeOfUse of Public-Health\n compliance, from the given Group.\n Access requests authorized shall be recorded.\n \u003c/p\u003e\n \u003c/div\u003e" - }, - "identifier": [ - { - "system": "http://example.org/identifiers", - "value": "saner-report" - } - ], - "status": "active", - "asserter": { - "reference": "Organization/f203" - }, - "date": [ - "2018-12-24" - ], - "combining": "deny-overrides", - "rule": [ - { - "type": "permit", - "data": [ - { - "resource": [ - { - "meaning": "instance", - "reference": { - "reference": "http://hl7.org/fhir/uv/saner/Measure/CDCHealthcareSupplyPathway" - } - } - ] - } - ], - "activity": [ - { - "actor": [ - { - "reference": { - "reference": "Organization/f203" - } - } - ], - "action": [ - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/consentaction", - "code": "access" - } - ] - } - ], - "purpose": [ - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HCOMPL" - } - ] - } - ] - } - ], - "limit": [ - { - "control": [ - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActCode", - "code": "AUDIT" - } - ] - } - ] - } - ] - }, - { - "type": "permit", - "data": [ - { - "resource": [ - { - "meaning": "instance", - "reference": { - "reference": "http://hl7.org/fhir/uv/saner/Measure/CDCHealthcareSupplyPathway" - } - } - ] - } - ], - "activity": [ - { - "actor": [ - { - "reference": { - "reference": "Group/102" - } - } - ], - "action": [ - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/consentaction", - "code": "access" - } - ] - } - ], - "purpose": [ - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HCOMPL" - } - ] - } - ] - } - ], - "limit": [ - { - "control": [ - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActCode", - "code": "AUDIT" - } - ] - } - ] - } - ] - } - ], - "meta": { - "tag": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HTEST", - "display": "test health data" - } - ] - } -} \ No newline at end of file diff --git a/crates/fhir/tests/data/R6/permission-example-vhdir.json b/crates/fhir/tests/data/R6/permission-example-vhdir.json deleted file mode 100644 index 7065420a1..000000000 --- a/crates/fhir/tests/data/R6/permission-example-vhdir.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "resourceType": "Permission", - "id": "example-vhdir", - "text": { - "status": "generated", - "div": "\u003cdiv xmlns\u003d\"http://www.w3.org/1999/xhtml\"\u003e\n \u003cp\u003e\n VhDir has identified a need to identify specific entries in the Directory and indicate some restrictions upon use of that entry. \n This example is the example from VhDir with some additional details added.\n \u003c/p\u003e\n \u003cp\u003e \n womens-shelter : All entries related to Women\u0027s Shelter can only be read by members of a CareTeam \n defined for councellors for womens abuse. \n Uses the existing example CareTeam that is not actually about women abuse councellors, used as example only.\n Presumes that directory entries related to womens shelter are marked with .meta.security of WSHELTER \n sensitivity code, a code that is not standard so would exist in a domain using this example Permission.\n \u003c/p\u003e\n \u003cp\u003e\n Thus the dataScope is for all data with .meta.security of WSHELTER.\n \u003c/p\u003e\n \u003cp\u003e\n Activities by those in the CareTeam. \n Explicit action and purpose are given, but they are likely not critical to the usecase.\n \u003c/p\u003e\n \u003c/div\u003e" - }, - "status": "active", - "date": [ - "2022-08-04" - ], - "combining": "deny-overrides", - "rule": [ - { - "type": "permit", - "data": [ - { - "security": [ - { - "system": "https://example.org", - "code": "WSHELTER" - } - ] - } - ], - "activity": [ - { - "actor": [ - { - "reference": { - "reference": "CareTeam/example" - } - } - ], - "action": [ - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/consentaction", - "code": "access" - } - ] - } - ], - "purpose": [ - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HOPERAT" - } - ] - } - ] - } - ] - } - ], - "meta": { - "tag": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HTEST", - "display": "test health data" - } - ] - } -} \ No newline at end of file diff --git a/crates/fhir/tests/data/R6/permission-example.json b/crates/fhir/tests/data/R6/permission-example.json deleted file mode 100644 index b3d2492a2..000000000 --- a/crates/fhir/tests/data/R6/permission-example.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "resourceType": "Permission", - "id": "example", - "status": "active", - "asserter": { - "reference": "Organization/example" - }, - "date": [ - "2022-06-13" - ], - "combining": "deny-unless-permit", - "rule": [ - { - "type": "permit", - "data": [ - { - "resource": [ - { - "meaning": "authoredby", - "reference": { - "reference": "Practitioner/example" - } - } - ] - } - ], - "activity": [ - { - "purpose": [ - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "TREAT" - } - ] - }, - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HPAYMT" - } - ] - }, - { - "coding": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HOPERAT" - } - ] - } - ] - } - ] - } - ], - "meta": { - "tag": [ - { - "system": "http://terminology.hl7.org/CodeSystem/v3-ActReason", - "code": "HTEST", - "display": "test health data" - } - ] - } -} \ No newline at end of file diff --git a/crates/fhir/tests/data/R6/permission.profile.json b/crates/fhir/tests/data/R6/permission.profile.json deleted file mode 100644 index 86a6cf023..000000000 --- a/crates/fhir/tests/data/R6/permission.profile.json +++ /dev/null @@ -1,3338 +0,0 @@ -{ - "resourceType": "StructureDefinition", - "id": "Permission", - "meta": { - "lastUpdated": "2025-11-17T19:23:40.261+00:00" - }, - "text": { - "status": "generated", - "div": "\u003cdiv xmlns\u003d\"http://www.w3.org/1999/xhtml\"\u003e\u003ctable border\u003d\"0\" cellpadding\u003d\"0\" cellspacing\u003d\"0\" style\u003d\"border: 0px #F0F0F0 solid; font-size: 11px; font-family: verdana; vertical-align: top;\"\u003e\u003ctr style\u003d\"border: 1px #F0F0F0 solid; font-size: 11px; font-family: verdana; vertical-align: top\"\u003e\u003cth style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; padding-top: 3px; padding-bottom: 3px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"https://build.fhir.org/ig/FHIR/ig-guidance/readingIgs.html#table-views\" title\u003d\"The logical name of the element\"\u003eName\u003c/a\u003e\u003c/th\u003e\u003cth style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; padding-top: 3px; padding-bottom: 3px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"https://build.fhir.org/ig/FHIR/ig-guidance/readingIgs.html#table-views\" title\u003d\"Information about the use of the element\"\u003eFlags\u003c/a\u003e\u003c/th\u003e\u003cth style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; padding-top: 3px; padding-bottom: 3px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"https://build.fhir.org/ig/FHIR/ig-guidance/readingIgs.html#table-views\" title\u003d\"Minimum and Maximum # of times the element can appear in the instance\"\u003eCard.\u003c/a\u003e\u003c/th\u003e\u003cth style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; padding-top: 3px; padding-bottom: 3px; width: 100px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"https://build.fhir.org/ig/FHIR/ig-guidance/readingIgs.html#table-views\" title\u003d\"Reference to the type of the element\"\u003eType\u003c/a\u003e\u003c/th\u003e\u003cth style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; padding-top: 3px; padding-bottom: 3px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"https://build.fhir.org/ig/FHIR/ig-guidance/readingIgs.html#table-views\" title\u003d\"Additional information about the element\"\u003eDescription \u0026amp; Constraints\u003c/a\u003e\u003cspan style\u003d\"float: right\"\u003e\u003ca href\u003d\"https://build.fhir.org/ig/FHIR/ig-guidance/readingIgs.html#table-views\" title\u003d\"Legend for this format\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3goXBCwdPqAP0wAAAldJREFUOMuNk0tIlFEYhp9z/vE2jHkhxXA0zJCMitrUQlq4lnSltEqCFhFG2MJFhIvIFpkEWaTQqjaWZRkp0g26URZkTpbaaOJkDqk10szoODP//7XIMUe0elcfnPd9zsfLOYplGrpRwZaqTtw3K7PtGem7Q6FoidbGgqHVy/HRb669R+56zx7eRV1L31JGxYbBtjKK93cxeqfyQHbehkZbUkK20goELEuIzEd+dHS+qz/Y8PTSif0FnGkbiwcAjHaU1+QWOptFiyCLp/LnKptpqIuXHx6rbR26kJcBX3yLgBfnd7CxwJmflpP2wUg0HIAoUUpZBmKzELGWcN8nAr6Gpu7tLU/CkwAaoKTWRSQyt89Q8w6J+oVQkKnBoblH7V0PPvUOvDYXfopE/SJmALsxnVm6LbkotrUtNowMeIrVrBcBpaMmdS0j9df7abpSuy7HWehwJdt1lhVwi/J58U5beXGAF6c3UXLycw1wdFklArBn87xdh0ZsZtArghBdAA3+OEDVubG4UEzP6x1FOWneHh2VDAHBAt80IbdXDcesNoCvs3E5AFyNSU5nbrDPZpcUEQQTFZiEVx+51fxMhhyJEAgvlriadIJZZksRuwBYMOPBbO3hePVVqgEJhFeUuFLhIPkRP6BQLIBrmMenujm/3g4zc398awIe90Zb5A1vREALqneMcYgP/xVQWlG+Ncu5vgwwlaUNx+3799rfe96u9K0JSDXcOzOTJg4B6IgmXfsygc7/Bvg9g9E58/cDVmGIBOP/zT8Bz1zqWqpbXIsd0O9hajXfL6u4BaOS6SeWAAAAAElFTkSuQmCC\" alt\u003d\"doco\" style\u003d\"background-color: inherit\"/\u003e\u003c/a\u003e\u003c/span\u003e\u003c/th\u003e\u003c/tr\u003e\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAAJUlEQVR4Xu3IIQEAAAgDsHd9/w4EQIOamFnaBgAA4MMKAACAKwNp30CqZFfFmwAAAABJRU5ErkJggg\u003d\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAACCElEQVQ4y4XTv2sUQRTA8e9Mzt3kjoOLSXFgZ6GJQlALCysLC89OsLTXv0VFxE4stRAEQUghSWEXuM4qMZpATsUD70dyMdnduZ15z2IvMV5IfDDNm5nPm59GVTkpms1mTVXvhxDuichlEZn03m+KyJL3/mWj0fiKqp7YVlZWXrfbbR2PTqeji4uLn1WVEqdECKFRr9eP5WdnZ/HeXwROB0TEA3S7XarVKiLC1tYW8/PzeO/5LxBCUABrLXEc02q1KJfLB30F0P144dPU9LVL1kwcrU06WP0ewhML4JwDYDgcHo7I87wAjNq5ypU3Z8arT8F5u/xejw52zmGM+Rcg1wyIcc/BTYCdBlODyh3ElA1AHMekaUoURURRBECWZSNgaGzBxxAU9jfQ9jrJr2dcbbXobRYHlQAzo9X1gDR9+KUArE6CwLefZD9WCW6P0uRZKreXqADkHXZ3dshzjwRholJH397AOXcTwHTfzQ1n7q6NnYEAy+DWQVNwKWQJ6vcx557Se7HAzIN1M9rCwVteA/rAYDRRICQgSZEr7WLYO3bzJVJGQBu0D74PkoHkoBnIHvjfkO9AGABmDHCjFWgH8i7kPQh9yEeYH4DfLhBJgA2A7BBQJ9uwXWY3rhJqFo1AaiB1CBngwKZQcqAeSFSduL9Akj7qPF64jnALS5VTPwdgPwwJ+uog9Qcx4kRZiPKqxgAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: white; background-color: inherit\" title\u003d\"Resource\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission : Permission resource holds access rules for a given data and access request context.\"\u003ePermission\u003c/span\u003e\u003ca name\u003d\"Permission\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; border: 1px grey solid; font-weight: bold; color: black; background-color: #e6ffe6; padding-left: 3px; padding-right: 3px; border: 1px grey solid; font-weight: bold; color: black; background-color: #e6ffe6\" href\u003d\"versions.html#std-process\" title\u003d\"Standards Status \u003d Normative\"\u003eN\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"/\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"domainresource.html\"\u003eDomainResource\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eAccess Rules\u003cbr/\u003e\u003cbr/\u003eElements defined in Ancestors: \u003ca href\u003d\"resource.html#Resource\" title\u003d\"The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.\"\u003eid\u003c/a\u003e, \u003ca href\u003d\"resource.html#Resource\" title\u003d\"The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.\"\u003emeta\u003c/a\u003e, \u003ca href\u003d\"resource.html#Resource\" title\u003d\"A reference to a set of rules that were followed when the resource was constructed, and which must be understood when processing the content. Often, this is a reference to an implementation guide that defines the special rules along with other profiles etc. For DomainResources, if more than one implicitRules policy applies, additional policies may be conveyed using the [additionalImplicitRules](https://build.fhir.org/ig/HL7/fhir-extensions/StructureDefinition-additionalImplicitRules.html) extension.\"\u003eimplicitRules\u003c/a\u003e, \u003ca href\u003d\"resource.html#Resource\" title\u003d\"The base language in which the resource is written.\"\u003elanguage\u003c/a\u003e, \u003ca href\u003d\"domainresource.html#DomainResource\" title\u003d\"A human-readable narrative that contains a summary of the resource and can be used to represent the content of the resource to a human. The narrative need not encode all the structured data, but is required to contain sufficient detail to make it \u0026quot;clinically safe\u0026quot; for a human to just read the narrative. Resource definitions may define what content should be represented in the narrative to ensure clinical safety.\"\u003etext\u003c/a\u003e, \u003ca href\u003d\"domainresource.html#DomainResource\" title\u003d\"These resources do not have an independent existence apart from the resource that contains them - they cannot be identified independently, nor can they have their own independent transaction scope. This is allowed to be a Parameters resource if and only if it is referenced by a resource that provides context/meaning.\"\u003econtained\u003c/a\u003e, \u003ca href\u003d\"domainresource.html#DomainResource\" title\u003d\"May be used to represent additional information that is not part of the basic definition of the resource. To make the use of extensions safe and managable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension.\"\u003eextension\u003c/a\u003e, \u003ca href\u003d\"domainresource.html#DomainResource\" title\u003d\"May be used to represent additional information that is not part of the basic definition of the resource and that modifies the understanding of the element that contains it and/or the understanding of the containing element\u0027s descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and managable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer is allowed to define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).\"\u003emodifierExtension\u003c/a\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAALUlEQVR4Xu3IoREAIAwEwfT6/ddA0GBAxO3NrLlKUj9263wAAAAvrgEAADClAVWFQIBRHMicAAAAAElFTkSuQmCC)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,R0lGODlhEAAQAPZ/APrkusOiYvvfqbiXWaV2G+jGhdq1b8GgYf3v1frw3vTUlsWkZNewbcSjY/DQkad4Hb6dXv3u0f3v1ObEgfPTlerJiP3w1v79+e7OkPrfrfnjuNOtZPrpydaxa+/YrvvdpP779ZxvFPvnwKKBQaFyF/369M2vdaqHRPz58/HNh/vowufFhfroxO3OkPrluv779tK0e6JzGProwvrow9m4eOnIifPTlPDPkP78+Naxaf3v0/zowfXRi+bFhLWUVv379/rnwPvszv3rye3LiPvnv+3MjPDasKiIS/789/3x2f747eXDg+7Mifvu0tu7f+/QkfDTnPXWmPrjsvrjtPbPgrqZW+/QlPz48K2EMv36866OUPvowat8Ivvgq/Pbrvzgq/PguvrgrqN0Gda2evfYm9+7d/rpw9q6e/LSku/Rl/XVl/LSlfrkt+zVqe7Wqv3x1/bNffbOf59wFdS6if3u0vrqyP3owPvepfXQivDQkO/PkKh9K7STVf779P///wD/ACH5BAEKAH8ALAAAAAAQABAAAAemgH+CgxeFF4OIhBdKGwFChYl/hYwbdkoBPnaQkosbG3d3VEpSUlonUoY1Gzo6QkI8SrGxWBOFG4uySgY5ZWR3PFy2hnaWZXC/PHcPwkpJk1ShoHcxhQEXSUmtFy6+0iSFVResrjoTPDzdcoU+F65CduVU6KAhhQa3F8Tx8nchBoYuqoTLZoAKFRIhqGwqJAULFx0GYpBQeChRIR4TJm6KJMhQRUSBAAA7\" alt\u003d\".\" style\u003d\"background-color: #F7F7F7; background-color: inherit\" title\u003d\"Data Type\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.identifier : A unique identifier assigned to this permission.\"\u003eidentifier\u003c/span\u003e\u003ca name\u003d\"Permission.identifier\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..*\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"datatypes.html#Identifier\"\u003eIdentifier\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eBusiness Identifier for permission\u003cbr/\u003e\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAALUlEQVR4Xu3IoREAIAwEwfT6/ddA0GBAxO3NrLlKUj9263wAAAAvrgEAADClAVWFQIBRHMicAAAAAElFTkSuQmCC)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAARklEQVQ4y2P8//8/AyWAhYFCMAgMuHjx4n+KXaCv+I0szW8WpCG8kFO1lGFKW/SIjAUYgxz/MzAwMDC+nqhDUTQyjuYFBgCNmhP4OvTRgwAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: white; background-color: inherit\" title\u003d\"Primitive Data Type\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.status : Status.\"\u003estatus\u003c/span\u003e\u003ca name\u003d\"Permission.status\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e1..1\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"datatypes.html#code\"\u003ecode\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eactive | entered-in-error | draft | rejected\u003cbr/\u003eBinding: \u003ca href\u003d\"valueset-permission-status.html\"\u003ePermission Status\u003c/a\u003e (\u003ca href\u003d\"terminologies.html#required\" title\u003d\"To be conformant, the concept in this element SHALL be from the specified value set.\"\u003eRequired\u003c/a\u003e)\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAALUlEQVR4Xu3IoREAIAwEwfT6/ddA0GBAxO3NrLlKUj9263wAAAAvrgEAADClAVWFQIBRHMicAAAAAElFTkSuQmCC)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAFxJREFUOE/NjEEOACEIA/0o/38GGw+agoXYeNnDJDCUDnd/gkoFKhWozJiZI3gLwY6rAgxhsPKTPUzycTl8lAryMyMsVQG6TFi6cHULyz8KOjC7OIQKlQpU3uPjAwhX2CCcGsgOAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: #F7F7F7; background-color: inherit\" title\u003d\"Reference to another Resource\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.asserter : The person or entity that asserts the permission.\"\u003easserter\u003c/span\u003e\u003ca name\u003d\"Permission.asserter\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..1\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"references.html#Reference\"\u003eReference\u003c/a\u003e(\u003ca href\u003d\"practitioner.html\"\u003ePractitioner\u003c/a\u003e | \u003ca href\u003d\"practitionerrole.html\"\u003ePractitionerRole\u003c/a\u003e | \u003ca href\u003d\"organization.html\"\u003eOrganization\u003c/a\u003e | \u003ca href\u003d\"careteam.html\"\u003eCareTeam\u003c/a\u003e | \u003ca href\u003d\"patient.html\"\u003ePatient\u003c/a\u003e | \u003ca href\u003d\"relatedperson.html\"\u003eRelatedPerson\u003c/a\u003e | \u003ca href\u003d\"healthcareservice.html\"\u003eHealthcareService\u003c/a\u003e)\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eThe person or entity that asserts the permission\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAALUlEQVR4Xu3IoREAIAwEwfT6/ddA0GBAxO3NrLlKUj9263wAAAAvrgEAADClAVWFQIBRHMicAAAAAElFTkSuQmCC)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAARklEQVQ4y2P8//8/AyWAhYFCMAgMuHjx4n+KXaCv+I0szW8WpCG8kFO1lGFKW/SIjAUYgxz/MzAwMDC+nqhDUTQyjuYFBgCNmhP4OvTRgwAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: white; background-color: inherit\" title\u003d\"Primitive Data Type\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.date : The date that permission was asserted.\"\u003edate\u003c/span\u003e\u003ca name\u003d\"Permission.date\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..*\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"datatypes.html#dateTime\"\u003edateTime\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eThe date that permission was asserted\u003cbr/\u003e\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAALUlEQVR4Xu3IoREAIAwEwfT6/ddA0GBAxO3NrLlKUj9263wAAAAvrgEAADClAVWFQIBRHMicAAAAAElFTkSuQmCC)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,R0lGODlhEAAQAPZ/APrkusOiYvvfqbiXWaV2G+jGhdq1b8GgYf3v1frw3vTUlsWkZNewbcSjY/DQkad4Hb6dXv3u0f3v1ObEgfPTlerJiP3w1v79+e7OkPrfrfnjuNOtZPrpydaxa+/YrvvdpP779ZxvFPvnwKKBQaFyF/369M2vdaqHRPz58/HNh/vowufFhfroxO3OkPrluv779tK0e6JzGProwvrow9m4eOnIifPTlPDPkP78+Naxaf3v0/zowfXRi+bFhLWUVv379/rnwPvszv3rye3LiPvnv+3MjPDasKiIS/789/3x2f747eXDg+7Mifvu0tu7f+/QkfDTnPXWmPrjsvrjtPbPgrqZW+/QlPz48K2EMv36866OUPvowat8Ivvgq/Pbrvzgq/PguvrgrqN0Gda2evfYm9+7d/rpw9q6e/LSku/Rl/XVl/LSlfrkt+zVqe7Wqv3x1/bNffbOf59wFdS6if3u0vrqyP3owPvepfXQivDQkO/PkKh9K7STVf779P///wD/ACH5BAEKAH8ALAAAAAAQABAAAAemgH+CgxeFF4OIhBdKGwFChYl/hYwbdkoBPnaQkosbG3d3VEpSUlonUoY1Gzo6QkI8SrGxWBOFG4uySgY5ZWR3PFy2hnaWZXC/PHcPwkpJk1ShoHcxhQEXSUmtFy6+0iSFVResrjoTPDzdcoU+F65CduVU6KAhhQa3F8Tx8nchBoYuqoTLZoAKFRIhqGwqJAULFx0GYpBQeChRIR4TJm6KJMhQRUSBAAA7\" alt\u003d\".\" style\u003d\"background-color: #F7F7F7; background-color: inherit\" title\u003d\"Data Type\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.validity : The period in which the permission is active.\"\u003evalidity\u003c/span\u003e\u003ca name\u003d\"Permission.validity\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..1\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"datatypes.html#Period\"\u003ePeriod\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eThe period in which the permission is active\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAALUlEQVR4Xu3IoREAIAwEwfT6/ddA0GBAxO3NrLlKUj9263wAAAAvrgEAADClAVWFQIBRHMicAAAAAElFTkSuQmCC)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,R0lGODlhEAAQAPQfAOvGUf7ztuvPMf/78/fkl/Pbg+u8Rvjqteu2Pf3zxPz36Pz0z+vTmPzurPvuw/npofbjquvNefHVduuyN+uuMu3Oafbgjfnqvf/3zv/3xevPi+vRjP/20/bmsP///wD/ACH5BAEKAB8ALAAAAAAQABAAAAVl4CeOZGme5qCqqDg8jyVJaz1876DsmAQAgqDgltspMEhMJoMZ4iy6I1AooFCIv+wKybziALVAoAEjYLwDgGIpJhMslgxaLR4/3rMAWoBp32V5exg8Shl1ckRUQVaMVkQ2kCstKCEAOw\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: white; background-color: inherit\" title\u003d\"Element\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.justification : The asserted justification for using the data.\"\u003ejustification\u003c/span\u003e\u003ca name\u003d\"Permission.justification\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..1\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"types.html#BackBoneElement\"\u003eBackboneElement\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eThe asserted justification for using the data\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAAMUlEQVR4Xu3LMQoAIBADwftr/v8GtdbqEAthAtMspJJUx9rYW8ftHwAA+NcRAAAAXplLq0BWj/rZigAAAABJRU5ErkJggg\u003d\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzMPbYccAgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAMElEQVQ4y+3OQREAIBDDwAv+PQcFFN5MIyCzqHMKUGVCpMFLK97heq+gggoq+EiwAVjvMhFGmlEUAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,R0lGODlhEAAQAPZ/APrkusOiYvvfqbiXWaV2G+jGhdq1b8GgYf3v1frw3vTUlsWkZNewbcSjY/DQkad4Hb6dXv3u0f3v1ObEgfPTlerJiP3w1v79+e7OkPrfrfnjuNOtZPrpydaxa+/YrvvdpP779ZxvFPvnwKKBQaFyF/369M2vdaqHRPz58/HNh/vowufFhfroxO3OkPrluv779tK0e6JzGProwvrow9m4eOnIifPTlPDPkP78+Naxaf3v0/zowfXRi+bFhLWUVv379/rnwPvszv3rye3LiPvnv+3MjPDasKiIS/789/3x2f747eXDg+7Mifvu0tu7f+/QkfDTnPXWmPrjsvrjtPbPgrqZW+/QlPz48K2EMv36866OUPvowat8Ivvgq/Pbrvzgq/PguvrgrqN0Gda2evfYm9+7d/rpw9q6e/LSku/Rl/XVl/LSlfrkt+zVqe7Wqv3x1/bNffbOf59wFdS6if3u0vrqyP3owPvepfXQivDQkO/PkKh9K7STVf779P///wD/ACH5BAEKAH8ALAAAAAAQABAAAAemgH+CgxeFF4OIhBdKGwFChYl/hYwbdkoBPnaQkosbG3d3VEpSUlonUoY1Gzo6QkI8SrGxWBOFG4uySgY5ZWR3PFy2hnaWZXC/PHcPwkpJk1ShoHcxhQEXSUmtFy6+0iSFVResrjoTPDzdcoU+F65CduVU6KAhhQa3F8Tx8nchBoYuqoTLZoAKFRIhqGwqJAULFx0GYpBQeChRIR4TJm6KJMhQRUSBAAA7\" alt\u003d\".\" style\u003d\"background-color: #F7F7F7; background-color: inherit\" title\u003d\"Data Type\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.justification.basis : This would be a codeableconcept, or a coding, which can be constrained to , for example, the 6 grounds for processing in GDPR.\"\u003ebasis\u003c/span\u003e\u003ca name\u003d\"Permission.justification.basis\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..*\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"datatypes.html#CodeableConcept\"\u003eCodeableConcept\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eThe regulatory grounds upon which this Permission builds\u003cbr/\u003eBinding: \u003ca href\u003d\"valueset-consent-policy.html\"\u003eConsent PolicyRule Codes\u003c/a\u003e (\u003ca href\u003d\"terminologies.html#example\" title\u003d\"Instances are not expected or even encouraged to draw from the specified value set. The value set merely provides examples of the types of concepts intended to be included.\"\u003eExample\u003c/a\u003e)\u003cbr/\u003e\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAALUlEQVR4Xu3IoREAIAwEwfT6/ddA0GBAxO3NrLlKUj9263wAAAAvrgEAADClAVWFQIBRHMicAAAAAElFTkSuQmCC)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzMPbYccAgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAMElEQVQ4y+3OQREAIBDDwAv+PQcFFN5MIyCzqHMKUGVCpMFLK97heq+gggoq+EiwAVjvMhFGmlEUAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzME+lXFigAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+3OsRUAIAjEUOL+O8cJABttJM11/x1qZAGqRBEVcNIqdWj1efDqQbb3HwwwwEfABmQUHSPM9dtDAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAFxJREFUOE/NjEEOACEIA/0o/38GGw+agoXYeNnDJDCUDnd/gkoFKhWozJiZI3gLwY6rAgxhsPKTPUzycTl8lAryMyMsVQG6TFi6cHULyz8KOjC7OIQKlQpU3uPjAwhX2CCcGsgOAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: white; background-color: inherit\" title\u003d\"Reference to another Resource\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.justification.evidence : Justifing rational.\"\u003eevidence\u003c/span\u003e\u003ca name\u003d\"Permission.justification.evidence\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..*\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"references.html#Reference\"\u003eReference\u003c/a\u003e(\u003ca href\u003d\"resourcelist.html\"\u003eAny\u003c/a\u003e)\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eJustifing rational\u003cbr/\u003e\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAALUlEQVR4Xu3IoREAIAwEwfT6/ddA0GBAxO3NrLlKUj9263wAAAAvrgEAADClAVWFQIBRHMicAAAAAElFTkSuQmCC)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAARklEQVQ4y2P8//8/AyWAhYFCMAgMuHjx4n+KXaCv+I0szW8WpCG8kFO1lGFKW/SIjAUYgxz/MzAwMDC+nqhDUTQyjuYFBgCNmhP4OvTRgwAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: #F7F7F7; background-color: inherit\" title\u003d\"Primitive Data Type\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.combining : Defines a procedure for arriving at an access decision given the set of rules.\"\u003ecombining\u003c/span\u003e\u003ca name\u003d\"Permission.combining\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"conformance-rules.html#isModifier\" title\u003d\"This element is a modifier element\"\u003e?!\u003c/a\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e1..1\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"datatypes.html#code\"\u003ecode\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003edeny-overrides | permit-overrides | ordered-deny-overrides | ordered-permit-overrides | deny-unless-permit | permit-unless-deny\u003cbr/\u003eBinding: \u003ca href\u003d\"valueset-permission-rule-combining.html\"\u003ePermission Rule Combining\u003c/a\u003e (\u003ca href\u003d\"terminologies.html#required\" title\u003d\"To be conformant, the concept in this element SHALL be from the specified value set.\"\u003eRequired\u003c/a\u003e)\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAAJUlEQVR4Xu3IIQEAAAgDsHd9/w4EQIOamFnaBgAA4MMKAACAKwNp30CqZFfFmwAAAABJRU5ErkJggg\u003d\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzME+lXFigAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+3OsRUAIAjEUOL+O8cJABttJM11/x1qZAGqRBEVcNIqdWj1efDqQbb3HwwwwEfABmQUHSPM9dtDAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,R0lGODlhEAAQAPQfAOvGUf7ztuvPMf/78/fkl/Pbg+u8Rvjqteu2Pf3zxPz36Pz0z+vTmPzurPvuw/npofbjquvNefHVduuyN+uuMu3Oafbgjfnqvf/3zv/3xevPi+vRjP/20/bmsP///wD/ACH5BAEKAB8ALAAAAAAQABAAAAVl4CeOZGme5qCqqDg8jyVJaz1876DsmAQAgqDgltspMEhMJoMZ4iy6I1AooFCIv+wKybziALVAoAEjYLwDgGIpJhMslgxaLR4/3rMAWoBp32V5exg8Shl1ckRUQVaMVkQ2kCstKCEAOw\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: white; background-color: inherit\" title\u003d\"Element\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule : A set of rules.\"\u003erule\u003c/span\u003e\u003ca name\u003d\"Permission.rule\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; border: 1px maroon solid; font-weight: bold; color: #301212; background-color: #fdf4f4;; padding-left: 3px; padding-right: 3px; border: 1px maroon solid; font-weight: bold; color: #301212; background-color: #fdf4f4;\" href\u003d\"conformance-rules.html#constraints\" title\u003d\"This element has or is affected by some invariants\"\u003eC\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..*\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"types.html#BackBoneElement\"\u003eBackboneElement\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eConstraints to the Permission\u003cbr/\u003e\u003cspan style\u003d\"font-style: italic\" title\u003d\"prm-1\"\u003e+ Rule: If the import element is populated then the type, data, and activity shall not be populated\u003c/span\u003e\u003cbr/\u003eThis repeating element order: The order of the rules processing is defined in rule combining selected in .combining element.\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAALElEQVR4Xu3IsQ0AIAwEsez6+89AqKGGJj7JzVWS+mm3zgcAAMxwDQAAgFcaYAVAgNGLTjgAAAAASUVORK5CYII\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAFxJREFUOE/NjEEOACEIA/0o/38GGw+agoXYeNnDJDCUDnd/gkoFKhWozJiZI3gLwY6rAgxhsPKTPUzycTl8lAryMyMsVQG6TFi6cHULyz8KOjC7OIQKlQpU3uPjAwhX2CCcGsgOAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: #F7F7F7; background-color: inherit\" title\u003d\"Reference to another Resource\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.import : This rule is expressed in another Permission resource.\"\u003eimport\u003c/span\u003e\u003ca name\u003d\"Permission.rule.import\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; border: 1px maroon solid; font-weight: bold; color: #301212; background-color: #fdf4f4;; padding-left: 3px; padding-right: 3px; border: 1px maroon solid; font-weight: bold; color: #301212; background-color: #fdf4f4;\" href\u003d\"conformance-rules.html#constraints\" title\u003d\"This element has or is affected by some invariants\"\u003eC\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..1\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"references.html#Reference\"\u003eReference\u003c/a\u003e(\u003ca href\u003d\"permission.html\"\u003ePermission\u003c/a\u003e)\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eReference to a Permission\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAALElEQVR4Xu3IsQ0AIAwEsez6+89AqKGGJj7JzVWS+mm3zgcAAMxwDQAAgFcaYAVAgNGLTjgAAAAASUVORK5CYII\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAARklEQVQ4y2P8//8/AyWAhYFCMAgMuHjx4n+KXaCv+I0szW8WpCG8kFO1lGFKW/SIjAUYgxz/MzAwMDC+nqhDUTQyjuYFBgCNmhP4OvTRgwAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: white; background-color: inherit\" title\u003d\"Primitive Data Type\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.type : deny | permit.\"\u003etype\u003c/span\u003e\u003ca name\u003d\"Permission.rule.type\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"conformance-rules.html#isModifier\" title\u003d\"This element is a modifier element\"\u003e?!\u003c/a\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; border: 1px maroon solid; font-weight: bold; color: #301212; background-color: #fdf4f4;; padding-left: 3px; padding-right: 3px; border: 1px maroon solid; font-weight: bold; color: #301212; background-color: #fdf4f4;\" href\u003d\"conformance-rules.html#constraints\" title\u003d\"This element has or is affected by some invariants\"\u003eC\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..1\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"datatypes.html#code\"\u003ecode\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003edeny | permit\u003cbr/\u003eBinding: \u003ca href\u003d\"valueset-consent-provision-type.html\"\u003eConsent Provision Type\u003c/a\u003e (\u003ca href\u003d\"terminologies.html#required\" title\u003d\"To be conformant, the concept in this element SHALL be from the specified value set.\"\u003eRequired\u003c/a\u003e)\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAALElEQVR4Xu3IsQ0AIAwEsez6+89AqKGGJj7JzVWS+mm3zgcAAMxwDQAAgFcaYAVAgNGLTjgAAAAASUVORK5CYII\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,R0lGODlhEAAQAPQfAOvGUf7ztuvPMf/78/fkl/Pbg+u8Rvjqteu2Pf3zxPz36Pz0z+vTmPzurPvuw/npofbjquvNefHVduuyN+uuMu3Oafbgjfnqvf/3zv/3xevPi+vRjP/20/bmsP///wD/ACH5BAEKAB8ALAAAAAAQABAAAAVl4CeOZGme5qCqqDg8jyVJaz1876DsmAQAgqDgltspMEhMJoMZ4iy6I1AooFCIv+wKybziALVAoAEjYLwDgGIpJhMslgxaLR4/3rMAWoBp32V5exg8Shl1ckRUQVaMVkQ2kCstKCEAOw\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: #F7F7F7; background-color: inherit\" title\u003d\"Element\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.data : A description or definition of which activities are allowed to be done on the data.\"\u003edata\u003c/span\u003e\u003ca name\u003d\"Permission.rule.data\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; border: 1px maroon solid; font-weight: bold; color: #301212; background-color: #fdf4f4;; padding-left: 3px; padding-right: 3px; border: 1px maroon solid; font-weight: bold; color: #301212; background-color: #fdf4f4;\" href\u003d\"conformance-rules.html#constraints\" title\u003d\"This element has or is affected by some invariants\"\u003eC\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..*\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"types.html#BackBoneElement\"\u003eBackboneElement\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eThe selection criteria to identify data that is within scope of this provision\u003cbr/\u003e\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAAMUlEQVR4Xu3LsQkAIBRDwb9r9p9BrbUSUZsLXPMglaReGmtz23H6BwAA/lkCAADALR1gq0BWueJ34gAAAABJRU5ErkJggg\u003d\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzMPbYccAgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAMElEQVQ4y+3OQREAIBDDwAv+PQcFFN5MIyCzqHMKUGVCpMFLK97heq+gggoq+EiwAVjvMhFGmlEUAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,R0lGODlhEAAQAPQfAOvGUf7ztuvPMf/78/fkl/Pbg+u8Rvjqteu2Pf3zxPz36Pz0z+vTmPzurPvuw/npofbjquvNefHVduuyN+uuMu3Oafbgjfnqvf/3zv/3xevPi+vRjP/20/bmsP///wD/ACH5BAEKAB8ALAAAAAAQABAAAAVl4CeOZGme5qCqqDg8jyVJaz1876DsmAQAgqDgltspMEhMJoMZ4iy6I1AooFCIv+wKybziALVAoAEjYLwDgGIpJhMslgxaLR4/3rMAWoBp32V5exg8Shl1ckRUQVaMVkQ2kCstKCEAOw\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: white; background-color: inherit\" title\u003d\"Element\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.data.resource : Explicit FHIR Resource references.\"\u003eresource\u003c/span\u003e\u003ca name\u003d\"Permission.rule.data.resource\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..*\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"types.html#BackBoneElement\"\u003eBackboneElement\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eExplicit FHIR Resource references\u003cbr/\u003e\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAAMUlEQVR4Xu3LsQkAIBRDwb9r9p9BrbVSUJsLXPMglaReGmtz2/H7DwAAnFsCAADALR1r0UAs80WDJQAAAABJRU5ErkJggg\u003d\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzMPbYccAgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAMElEQVQ4y+3OQREAIBDDwAv+PQcFFN5MIyCzqHMKUGVCpMFLK97heq+gggoq+EiwAVjvMhFGmlEUAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzMPbYccAgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAMElEQVQ4y+3OQREAIBDDwAv+PQcFFN5MIyCzqHMKUGVCpMFLK97heq+gggoq+EiwAVjvMhFGmlEUAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAARklEQVQ4y2P8//8/AyWAhYFCMAgMuHjx4n+KXaCv+I0szW8WpCG8kFO1lGFKW/SIjAUYgxz/MzAwMDC+nqhDUTQyjuYFBgCNmhP4OvTRgwAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: #F7F7F7; background-color: inherit\" title\u003d\"Primitive Data Type\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.data.resource.meaning : How the resource reference is interpreted when testing consent restrictions.\"\u003emeaning\u003c/span\u003e\u003ca name\u003d\"Permission.rule.data.resource.meaning\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e1..1\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"datatypes.html#code\"\u003ecode\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003einstance | related | dependents | authoredby\u003cbr/\u003eBinding: \u003ca href\u003d\"valueset-consent-data-meaning.html\"\u003eConsent Data Meaning\u003c/a\u003e (\u003ca href\u003d\"terminologies.html#required\" title\u003d\"To be conformant, the concept in this element SHALL be from the specified value set.\"\u003eRequired\u003c/a\u003e)\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAAMUlEQVR4Xu3LsQkAIBRDwb9r9p9BrbUSUZsLXPMglaReGmtz23H6BwAA/lkCAADALR1gq0BWueJ34gAAAABJRU5ErkJggg\u003d\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzMPbYccAgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAMElEQVQ4y+3OQREAIBDDwAv+PQcFFN5MIyCzqHMKUGVCpMFLK97heq+gggoq+EiwAVjvMhFGmlEUAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzMPbYccAgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAMElEQVQ4y+3OQREAIBDDwAv+PQcFFN5MIyCzqHMKUGVCpMFLK97heq+gggoq+EiwAVjvMhFGmlEUAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzME+lXFigAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+3OsRUAIAjEUOL+O8cJABttJM11/x1qZAGqRBEVcNIqdWj1efDqQbb3HwwwwEfABmQUHSPM9dtDAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAFxJREFUOE/NjEEOACEIA/0o/38GGw+agoXYeNnDJDCUDnd/gkoFKhWozJiZI3gLwY6rAgxhsPKTPUzycTl8lAryMyMsVQG6TFi6cHULyz8KOjC7OIQKlQpU3uPjAwhX2CCcGsgOAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: white; background-color: inherit\" title\u003d\"Reference to another Resource\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.data.resource.reference : A reference to a specific resource that defines which resources are covered by this consent.\"\u003ereference\u003c/span\u003e\u003ca name\u003d\"Permission.rule.data.resource.reference\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e1..1\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"references.html#Reference\"\u003eReference\u003c/a\u003e(\u003ca href\u003d\"resourcelist.html\"\u003eAny\u003c/a\u003e)\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eThe actual data reference\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAAMUlEQVR4Xu3LsQkAIBRDwb9r9p9BrbUSUZsLXPMglaReGmtz23H6BwAA/lkCAADALR1gq0BWueJ34gAAAABJRU5ErkJggg\u003d\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzMPbYccAgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAMElEQVQ4y+3OQREAIBDDwAv+PQcFFN5MIyCzqHMKUGVCpMFLK97heq+gggoq+EiwAVjvMhFGmlEUAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,R0lGODlhEAAQAPZ/APrkusOiYvvfqbiXWaV2G+jGhdq1b8GgYf3v1frw3vTUlsWkZNewbcSjY/DQkad4Hb6dXv3u0f3v1ObEgfPTlerJiP3w1v79+e7OkPrfrfnjuNOtZPrpydaxa+/YrvvdpP779ZxvFPvnwKKBQaFyF/369M2vdaqHRPz58/HNh/vowufFhfroxO3OkPrluv779tK0e6JzGProwvrow9m4eOnIifPTlPDPkP78+Naxaf3v0/zowfXRi+bFhLWUVv379/rnwPvszv3rye3LiPvnv+3MjPDasKiIS/789/3x2f747eXDg+7Mifvu0tu7f+/QkfDTnPXWmPrjsvrjtPbPgrqZW+/QlPz48K2EMv36866OUPvowat8Ivvgq/Pbrvzgq/PguvrgrqN0Gda2evfYm9+7d/rpw9q6e/LSku/Rl/XVl/LSlfrkt+zVqe7Wqv3x1/bNffbOf59wFdS6if3u0vrqyP3owPvepfXQivDQkO/PkKh9K7STVf779P///wD/ACH5BAEKAH8ALAAAAAAQABAAAAemgH+CgxeFF4OIhBdKGwFChYl/hYwbdkoBPnaQkosbG3d3VEpSUlonUoY1Gzo6QkI8SrGxWBOFG4uySgY5ZWR3PFy2hnaWZXC/PHcPwkpJk1ShoHcxhQEXSUmtFy6+0iSFVResrjoTPDzdcoU+F65CduVU6KAhhQa3F8Tx8nchBoYuqoTLZoAKFRIhqGwqJAULFx0GYpBQeChRIR4TJm6KJMhQRUSBAAA7\" alt\u003d\".\" style\u003d\"background-color: #F7F7F7; background-color: inherit\" title\u003d\"Data Type\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.data.resourceType : The resourceType(s) covered by this rule. The type can be a FHIR resource type or a profile on a type that indicates what information the rule applies to.\"\u003eresourceType\u003c/span\u003e\u003ca name\u003d\"Permission.rule.data.resourceType\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..*\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"datatypes.html#Coding\"\u003eCoding\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003ee.g. Resource Type, Profile, etc\u003cbr/\u003eBinding: \u003ca href\u003d\"valueset-resource-types.html\"\u003eResource Types\u003c/a\u003e (\u003ca href\u003d\"terminologies.html#extensible\" title\u003d\"To be conformant, the concept in this element SHALL be from the specified value set if any of the codes within the value set can apply to the concept being communicated. If the value set does not cover the concept (based on human review), alternate codings (or, data type allowing, text) may be included instead.\"\u003eExtensible\u003c/a\u003e)\u003cbr/\u003e\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAAMUlEQVR4Xu3LsQkAIBRDwb9r9p9BrbUSUZsLXPMglaReGmtz23H6BwAA/lkCAADALR1gq0BWueJ34gAAAABJRU5ErkJggg\u003d\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzMPbYccAgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAMElEQVQ4y+3OQREAIBDDwAv+PQcFFN5MIyCzqHMKUGVCpMFLK97heq+gggoq+EiwAVjvMhFGmlEUAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,R0lGODlhEAAQAPZ/APrkusOiYvvfqbiXWaV2G+jGhdq1b8GgYf3v1frw3vTUlsWkZNewbcSjY/DQkad4Hb6dXv3u0f3v1ObEgfPTlerJiP3w1v79+e7OkPrfrfnjuNOtZPrpydaxa+/YrvvdpP779ZxvFPvnwKKBQaFyF/369M2vdaqHRPz58/HNh/vowufFhfroxO3OkPrluv779tK0e6JzGProwvrow9m4eOnIifPTlPDPkP78+Naxaf3v0/zowfXRi+bFhLWUVv379/rnwPvszv3rye3LiPvnv+3MjPDasKiIS/789/3x2f747eXDg+7Mifvu0tu7f+/QkfDTnPXWmPrjsvrjtPbPgrqZW+/QlPz48K2EMv36866OUPvowat8Ivvgq/Pbrvzgq/PguvrgrqN0Gda2evfYm9+7d/rpw9q6e/LSku/Rl/XVl/LSlfrkt+zVqe7Wqv3x1/bNffbOf59wFdS6if3u0vrqyP3owPvepfXQivDQkO/PkKh9K7STVf779P///wD/ACH5BAEKAH8ALAAAAAAQABAAAAemgH+CgxeFF4OIhBdKGwFChYl/hYwbdkoBPnaQkosbG3d3VEpSUlonUoY1Gzo6QkI8SrGxWBOFG4uySgY5ZWR3PFy2hnaWZXC/PHcPwkpJk1ShoHcxhQEXSUmtFy6+0iSFVResrjoTPDzdcoU+F65CduVU6KAhhQa3F8Tx8nchBoYuqoTLZoAKFRIhqGwqJAULFx0GYpBQeChRIR4TJm6KJMhQRUSBAAA7\" alt\u003d\".\" style\u003d\"background-color: white; background-color: inherit\" title\u003d\"Data Type\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.data.security : The data in scope are those with the given codes present in that data .meta.security element.\"\u003esecurity\u003c/span\u003e\u003ca name\u003d\"Permission.rule.data.security\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..*\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"datatypes.html#Coding\"\u003eCoding\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eSecurity tag code on .meta.security\u003cbr/\u003e\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAAMUlEQVR4Xu3LsQkAIBRDwb9r9p9BrbUSUZsLXPMglaReGmtz23H6BwAA/lkCAADALR1gq0BWueJ34gAAAABJRU5ErkJggg\u003d\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzMPbYccAgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAMElEQVQ4y+3OQREAIBDDwAv+PQcFFN5MIyCzqHMKUGVCpMFLK97heq+gggoq+EiwAVjvMhFGmlEUAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,R0lGODlhEAAQAPZ/APrkusOiYvvfqbiXWaV2G+jGhdq1b8GgYf3v1frw3vTUlsWkZNewbcSjY/DQkad4Hb6dXv3u0f3v1ObEgfPTlerJiP3w1v79+e7OkPrfrfnjuNOtZPrpydaxa+/YrvvdpP779ZxvFPvnwKKBQaFyF/369M2vdaqHRPz58/HNh/vowufFhfroxO3OkPrluv779tK0e6JzGProwvrow9m4eOnIifPTlPDPkP78+Naxaf3v0/zowfXRi+bFhLWUVv379/rnwPvszv3rye3LiPvnv+3MjPDasKiIS/789/3x2f747eXDg+7Mifvu0tu7f+/QkfDTnPXWmPrjsvrjtPbPgrqZW+/QlPz48K2EMv36866OUPvowat8Ivvgq/Pbrvzgq/PguvrgrqN0Gda2evfYm9+7d/rpw9q6e/LSku/Rl/XVl/LSlfrkt+zVqe7Wqv3x1/bNffbOf59wFdS6if3u0vrqyP3owPvepfXQivDQkO/PkKh9K7STVf779P///wD/ACH5BAEKAH8ALAAAAAAQABAAAAemgH+CgxeFF4OIhBdKGwFChYl/hYwbdkoBPnaQkosbG3d3VEpSUlonUoY1Gzo6QkI8SrGxWBOFG4uySgY5ZWR3PFy2hnaWZXC/PHcPwkpJk1ShoHcxhQEXSUmtFy6+0iSFVResrjoTPDzdcoU+F65CduVU6KAhhQa3F8Tx8nchBoYuqoTLZoAKFRIhqGwqJAULFx0GYpBQeChRIR4TJm6KJMhQRUSBAAA7\" alt\u003d\".\" style\u003d\"background-color: #F7F7F7; background-color: inherit\" title\u003d\"Data Type\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.data.period : Clinical or Operational Relevant period of time that bounds the data controlled by this rule.\"\u003eperiod\u003c/span\u003e\u003ca name\u003d\"Permission.rule.data.period\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..1\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"datatypes.html#Period\"\u003ePeriod\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eTimeframe encompasing data create/update\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAALElEQVR4Xu3IsQ0AIAwEsez6+89AqKGGJj7JzVWS+mm3zgcAAMxwDQAAgFcaYAVAgNGLTjgAAAAASUVORK5CYII\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzMPbYccAgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAMElEQVQ4y+3OQREAIBDDwAv+PQcFFN5MIyCzqHMKUGVCpMFLK97heq+gggoq+EiwAVjvMhFGmlEUAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzME+lXFigAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+3OsRUAIAjEUOL+O8cJABttJM11/x1qZAGqRBEVcNIqdWj1efDqQbb3HwwwwEfABmQUHSPM9dtDAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,R0lGODlhEAAQAPZ/APrkusOiYvvfqbiXWaV2G+jGhdq1b8GgYf3v1frw3vTUlsWkZNewbcSjY/DQkad4Hb6dXv3u0f3v1ObEgfPTlerJiP3w1v79+e7OkPrfrfnjuNOtZPrpydaxa+/YrvvdpP779ZxvFPvnwKKBQaFyF/369M2vdaqHRPz58/HNh/vowufFhfroxO3OkPrluv779tK0e6JzGProwvrow9m4eOnIifPTlPDPkP78+Naxaf3v0/zowfXRi+bFhLWUVv379/rnwPvszv3rye3LiPvnv+3MjPDasKiIS/789/3x2f747eXDg+7Mifvu0tu7f+/QkfDTnPXWmPrjsvrjtPbPgrqZW+/QlPz48K2EMv36866OUPvowat8Ivvgq/Pbrvzgq/PguvrgrqN0Gda2evfYm9+7d/rpw9q6e/LSku/Rl/XVl/LSlfrkt+zVqe7Wqv3x1/bNffbOf59wFdS6if3u0vrqyP3owPvepfXQivDQkO/PkKh9K7STVf779P///wD/ACH5BAEKAH8ALAAAAAAQABAAAAemgH+CgxeFF4OIhBdKGwFChYl/hYwbdkoBPnaQkosbG3d3VEpSUlonUoY1Gzo6QkI8SrGxWBOFG4uySgY5ZWR3PFy2hnaWZXC/PHcPwkpJk1ShoHcxhQEXSUmtFy6+0iSFVResrjoTPDzdcoU+F65CduVU6KAhhQa3F8Tx8nchBoYuqoTLZoAKFRIhqGwqJAULFx0GYpBQeChRIR4TJm6KJMhQRUSBAAA7\" alt\u003d\".\" style\u003d\"background-color: white; background-color: inherit\" title\u003d\"Data Type\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.data.expression : Used when other data selection elements are insufficient.\"\u003eexpression\u003c/span\u003e\u003ca name\u003d\"Permission.rule.data.expression\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..1\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"metadatatypes.html#Expression\"\u003eExpression\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eExpression identifying the data\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAALElEQVR4Xu3IsQ0AIAwEsez6+89AqKGGJj7JzVWS+mm3zgcAAMxwDQAAgFcaYAVAgNGLTjgAAAAASUVORK5CYII\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,R0lGODlhEAAQAPQfAOvGUf7ztuvPMf/78/fkl/Pbg+u8Rvjqteu2Pf3zxPz36Pz0z+vTmPzurPvuw/npofbjquvNefHVduuyN+uuMu3Oafbgjfnqvf/3zv/3xevPi+vRjP/20/bmsP///wD/ACH5BAEKAB8ALAAAAAAQABAAAAVl4CeOZGme5qCqqDg8jyVJaz1876DsmAQAgqDgltspMEhMJoMZ4iy6I1AooFCIv+wKybziALVAoAEjYLwDgGIpJhMslgxaLR4/3rMAWoBp32V5exg8Shl1ckRUQVaMVkQ2kCstKCEAOw\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: #F7F7F7; background-color: inherit\" title\u003d\"Element\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.activity : A description or definition of which activities are allowed to be done on the data.\"\u003eactivity\u003c/span\u003e\u003ca name\u003d\"Permission.rule.activity\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; border: 1px maroon solid; font-weight: bold; color: #301212; background-color: #fdf4f4;; padding-left: 3px; padding-right: 3px; border: 1px maroon solid; font-weight: bold; color: #301212; background-color: #fdf4f4;\" href\u003d\"conformance-rules.html#constraints\" title\u003d\"This element has or is affected by some invariants\"\u003eC\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..*\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"types.html#BackBoneElement\"\u003eBackboneElement\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eA description or definition of which activities are allowed to be done on the data\u003cbr/\u003e\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAAMUlEQVR4Xu3LsQkAIBRDwb9r9p9BrbUSUZsLXPMglaReGmtz23H6BwAA/lkCAADALR1gq0BWueJ34gAAAABJRU5ErkJggg\u003d\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzMPbYccAgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAMElEQVQ4y+3OQREAIBDDwAv+PQcFFN5MIyCzqHMKUGVCpMFLK97heq+gggoq+EiwAVjvMhFGmlEUAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,R0lGODlhEAAQAPQfAOvGUf7ztuvPMf/78/fkl/Pbg+u8Rvjqteu2Pf3zxPz36Pz0z+vTmPzurPvuw/npofbjquvNefHVduuyN+uuMu3Oafbgjfnqvf/3zv/3xevPi+vRjP/20/bmsP///wD/ACH5BAEKAB8ALAAAAAAQABAAAAVl4CeOZGme5qCqqDg8jyVJaz1876DsmAQAgqDgltspMEhMJoMZ4iy6I1AooFCIv+wKybziALVAoAEjYLwDgGIpJhMslgxaLR4/3rMAWoBp32V5exg8Shl1ckRUQVaMVkQ2kCstKCEAOw\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: white; background-color: inherit\" title\u003d\"Element\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.activity.actor : Who or what is controlled by this rule. Use group to identify a set of actors by some property they share (e.g. \u0027admitting officers\u0027).\"\u003eactor\u003c/span\u003e\u003ca name\u003d\"Permission.rule.activity.actor\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"/\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..*\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"types.html#BackBoneElement\"\u003eBackboneElement\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eWho|what is controlled by this rule\u003cbr/\u003e\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAAMUlEQVR4Xu3LsQkAIBRDwb9r9p9BrbVSUJsLXPMglaReGmtz2/H7DwAAnFsCAADALR1r0UAs80WDJQAAAABJRU5ErkJggg\u003d\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzMPbYccAgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAMElEQVQ4y+3OQREAIBDDwAv+PQcFFN5MIyCzqHMKUGVCpMFLK97heq+gggoq+EiwAVjvMhFGmlEUAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzMPbYccAgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAMElEQVQ4y+3OQREAIBDDwAv+PQcFFN5MIyCzqHMKUGVCpMFLK97heq+gggoq+EiwAVjvMhFGmlEUAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,R0lGODlhEAAQAPZ/APrkusOiYvvfqbiXWaV2G+jGhdq1b8GgYf3v1frw3vTUlsWkZNewbcSjY/DQkad4Hb6dXv3u0f3v1ObEgfPTlerJiP3w1v79+e7OkPrfrfnjuNOtZPrpydaxa+/YrvvdpP779ZxvFPvnwKKBQaFyF/369M2vdaqHRPz58/HNh/vowufFhfroxO3OkPrluv779tK0e6JzGProwvrow9m4eOnIifPTlPDPkP78+Naxaf3v0/zowfXRi+bFhLWUVv379/rnwPvszv3rye3LiPvnv+3MjPDasKiIS/789/3x2f747eXDg+7Mifvu0tu7f+/QkfDTnPXWmPrjsvrjtPbPgrqZW+/QlPz48K2EMv36866OUPvowat8Ivvgq/Pbrvzgq/PguvrgrqN0Gda2evfYm9+7d/rpw9q6e/LSku/Rl/XVl/LSlfrkt+zVqe7Wqv3x1/bNffbOf59wFdS6if3u0vrqyP3owPvepfXQivDQkO/PkKh9K7STVf779P///wD/ACH5BAEKAH8ALAAAAAAQABAAAAemgH+CgxeFF4OIhBdKGwFChYl/hYwbdkoBPnaQkosbG3d3VEpSUlonUoY1Gzo6QkI8SrGxWBOFG4uySgY5ZWR3PFy2hnaWZXC/PHcPwkpJk1ShoHcxhQEXSUmtFy6+0iSFVResrjoTPDzdcoU+F65CduVU6KAhhQa3F8Tx8nchBoYuqoTLZoAKFRIhqGwqJAULFx0GYpBQeChRIR4TJm6KJMhQRUSBAAA7\" alt\u003d\".\" style\u003d\"background-color: #F7F7F7; background-color: inherit\" title\u003d\"Data Type\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.activity.actor.role : How the individual is involved in the activity that is described in the rule.\"\u003erole\u003c/span\u003e\u003ca name\u003d\"Permission.rule.activity.actor.role\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"/\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..1\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"datatypes.html#CodeableConcept\"\u003eCodeableConcept\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eHow the actor is involved\u003cbr/\u003eBinding: \u003ca href\u003d\"valueset-participation-role-type.html\"\u003eParticipation Role Type\u003c/a\u003e (\u003ca href\u003d\"terminologies.html#extensible\" title\u003d\"To be conformant, the concept in this element SHALL be from the specified value set if any of the codes within the value set can apply to the concept being communicated. If the value set does not cover the concept (based on human review), alternate codings (or, data type allowing, text) may be included instead.\"\u003eExtensible\u003c/a\u003e)\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAAMUlEQVR4Xu3LsQkAIBRDwb9r9p9BrbUSUZsLXPMglaReGmtz23H6BwAA/lkCAADALR1gq0BWueJ34gAAAABJRU5ErkJggg\u003d\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzMPbYccAgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAMElEQVQ4y+3OQREAIBDDwAv+PQcFFN5MIyCzqHMKUGVCpMFLK97heq+gggoq+EiwAVjvMhFGmlEUAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzMPbYccAgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAMElEQVQ4y+3OQREAIBDDwAv+PQcFFN5MIyCzqHMKUGVCpMFLK97heq+gggoq+EiwAVjvMhFGmlEUAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzME+lXFigAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+3OsRUAIAjEUOL+O8cJABttJM11/x1qZAGqRBEVcNIqdWj1efDqQbb3HwwwwEfABmQUHSPM9dtDAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAFxJREFUOE/NjEEOACEIA/0o/38GGw+agoXYeNnDJDCUDnd/gkoFKhWozJiZI3gLwY6rAgxhsPKTPUzycTl8lAryMyMsVQG6TFi6cHULyz8KOjC7OIQKlQpU3uPjAwhX2CCcGsgOAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: white; background-color: inherit\" title\u003d\"Reference to another Resource\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.activity.actor.reference : The actor(s) authorized for the defined activity.\"\u003ereference\u003c/span\u003e\u003ca name\u003d\"Permission.rule.activity.actor.reference\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..1\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"references.html#Reference\"\u003eReference\u003c/a\u003e(\u003ca href\u003d\"device.html\"\u003eDevice\u003c/a\u003e | \u003ca href\u003d\"group.html\"\u003eGroup\u003c/a\u003e | \u003ca href\u003d\"careteam.html\"\u003eCareTeam\u003c/a\u003e | \u003ca href\u003d\"organization.html\"\u003eOrganization\u003c/a\u003e | \u003ca href\u003d\"patient.html\"\u003ePatient\u003c/a\u003e | \u003ca href\u003d\"practitioner.html\"\u003ePractitioner\u003c/a\u003e | \u003ca href\u003d\"relatedperson.html\"\u003eRelatedPerson\u003c/a\u003e | \u003ca href\u003d\"practitionerrole.html\"\u003ePractitionerRole\u003c/a\u003e | \u003ca href\u003d\"devicedefinition.html\"\u003eDeviceDefinition\u003c/a\u003e | \u003ca href\u003d\"healthcareservice.html\"\u003eHealthcareService\u003c/a\u003e)\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eAuthorized actor(s)\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAAMUlEQVR4Xu3LsQkAIBRDwb9r9p9BrbUSUZsLXPMglaReGmtz23H6BwAA/lkCAADALR1gq0BWueJ34gAAAABJRU5ErkJggg\u003d\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzMPbYccAgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAMElEQVQ4y+3OQREAIBDDwAv+PQcFFN5MIyCzqHMKUGVCpMFLK97heq+gggoq+EiwAVjvMhFGmlEUAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,R0lGODlhEAAQAPZ/APrkusOiYvvfqbiXWaV2G+jGhdq1b8GgYf3v1frw3vTUlsWkZNewbcSjY/DQkad4Hb6dXv3u0f3v1ObEgfPTlerJiP3w1v79+e7OkPrfrfnjuNOtZPrpydaxa+/YrvvdpP779ZxvFPvnwKKBQaFyF/369M2vdaqHRPz58/HNh/vowufFhfroxO3OkPrluv779tK0e6JzGProwvrow9m4eOnIifPTlPDPkP78+Naxaf3v0/zowfXRi+bFhLWUVv379/rnwPvszv3rye3LiPvnv+3MjPDasKiIS/789/3x2f747eXDg+7Mifvu0tu7f+/QkfDTnPXWmPrjsvrjtPbPgrqZW+/QlPz48K2EMv36866OUPvowat8Ivvgq/Pbrvzgq/PguvrgrqN0Gda2evfYm9+7d/rpw9q6e/LSku/Rl/XVl/LSlfrkt+zVqe7Wqv3x1/bNffbOf59wFdS6if3u0vrqyP3owPvepfXQivDQkO/PkKh9K7STVf779P///wD/ACH5BAEKAH8ALAAAAAAQABAAAAemgH+CgxeFF4OIhBdKGwFChYl/hYwbdkoBPnaQkosbG3d3VEpSUlonUoY1Gzo6QkI8SrGxWBOFG4uySgY5ZWR3PFy2hnaWZXC/PHcPwkpJk1ShoHcxhQEXSUmtFy6+0iSFVResrjoTPDzdcoU+F65CduVU6KAhhQa3F8Tx8nchBoYuqoTLZoAKFRIhqGwqJAULFx0GYpBQeChRIR4TJm6KJMhQRUSBAAA7\" alt\u003d\".\" style\u003d\"background-color: #F7F7F7; background-color: inherit\" title\u003d\"Data Type\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.activity.action : Actions controlled by this Rule.\"\u003eaction\u003c/span\u003e\u003ca name\u003d\"Permission.rule.activity.action\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..*\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"datatypes.html#CodeableConcept\"\u003eCodeableConcept\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eActions controlled by this rule\u003cbr/\u003eBinding: \u003ca href\u003d\"valueset-type-restful-interaction.html\"\u003eType Restful Interaction\u003c/a\u003e (\u003ca href\u003d\"terminologies.html#preferred\" title\u003d\"Instances are encouraged to draw from the specified codes for interoperability purposes but are not required to do so to be considered conformant.\"\u003ePreferred\u003c/a\u003e)\u003cbr/\u003e\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAALElEQVR4Xu3IsQ0AIAwEsez6+89AqKGGJj7JzVWS+mm3zgcAAMxwDQAAgFcaYAVAgNGLTjgAAAAASUVORK5CYII\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzMPbYccAgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAMElEQVQ4y+3OQREAIBDDwAv+PQcFFN5MIyCzqHMKUGVCpMFLK97heq+gggoq+EiwAVjvMhFGmlEUAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzME+lXFigAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+3OsRUAIAjEUOL+O8cJABttJM11/x1qZAGqRBEVcNIqdWj1efDqQbb3HwwwwEfABmQUHSPM9dtDAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,R0lGODlhEAAQAPZ/APrkusOiYvvfqbiXWaV2G+jGhdq1b8GgYf3v1frw3vTUlsWkZNewbcSjY/DQkad4Hb6dXv3u0f3v1ObEgfPTlerJiP3w1v79+e7OkPrfrfnjuNOtZPrpydaxa+/YrvvdpP779ZxvFPvnwKKBQaFyF/369M2vdaqHRPz58/HNh/vowufFhfroxO3OkPrluv779tK0e6JzGProwvrow9m4eOnIifPTlPDPkP78+Naxaf3v0/zowfXRi+bFhLWUVv379/rnwPvszv3rye3LiPvnv+3MjPDasKiIS/789/3x2f747eXDg+7Mifvu0tu7f+/QkfDTnPXWmPrjsvrjtPbPgrqZW+/QlPz48K2EMv36866OUPvowat8Ivvgq/Pbrvzgq/PguvrgrqN0Gda2evfYm9+7d/rpw9q6e/LSku/Rl/XVl/LSlfrkt+zVqe7Wqv3x1/bNffbOf59wFdS6if3u0vrqyP3owPvepfXQivDQkO/PkKh9K7STVf779P///wD/ACH5BAEKAH8ALAAAAAAQABAAAAemgH+CgxeFF4OIhBdKGwFChYl/hYwbdkoBPnaQkosbG3d3VEpSUlonUoY1Gzo6QkI8SrGxWBOFG4uySgY5ZWR3PFy2hnaWZXC/PHcPwkpJk1ShoHcxhQEXSUmtFy6+0iSFVResrjoTPDzdcoU+F65CduVU6KAhhQa3F8Tx8nchBoYuqoTLZoAKFRIhqGwqJAULFx0GYpBQeChRIR4TJm6KJMhQRUSBAAA7\" alt\u003d\".\" style\u003d\"background-color: white; background-color: inherit\" title\u003d\"Data Type\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.activity.purpose : The purpose for which the permission is given.\"\u003epurpose\u003c/span\u003e\u003ca name\u003d\"Permission.rule.activity.purpose\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..*\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"datatypes.html#CodeableConcept\"\u003eCodeableConcept\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eThe purpose for which the permission is given\u003cbr/\u003eBinding: \u003ca href\u003d\"http://terminology.hl7.org/7.0.0/ValueSet-v3-PurposeOfUse.html\"\u003ePurposeOfUse\u003c/a\u003e (\u003ca href\u003d\"terminologies.html#preferred\" title\u003d\"Instances are encouraged to draw from the specified codes for interoperability purposes but are not required to do so to be considered conformant.\"\u003ePreferred\u003c/a\u003e)\u003cbr/\u003e\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAAJUlEQVR4Xu3IIQEAAAgDsHd9/w4EQIOamFnaBgAA4MMKAACAKwNp30CqZFfFmwAAAABJRU5ErkJggg\u003d\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzME+lXFigAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+3OsRUAIAjEUOL+O8cJABttJM11/x1qZAGqRBEVcNIqdWj1efDqQbb3HwwwwEfABmQUHSPM9dtDAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,R0lGODlhEAAQAPQfAOvGUf7ztuvPMf/78/fkl/Pbg+u8Rvjqteu2Pf3zxPz36Pz0z+vTmPzurPvuw/npofbjquvNefHVduuyN+uuMu3Oafbgjfnqvf/3zv/3xevPi+vRjP/20/bmsP///wD/ACH5BAEKAB8ALAAAAAAQABAAAAVl4CeOZGme5qCqqDg8jyVJaz1876DsmAQAgqDgltspMEhMJoMZ4iy6I1AooFCIv+wKybziALVAoAEjYLwDgGIpJhMslgxaLR4/3rMAWoBp32V5exg8Shl1ckRUQVaMVkQ2kCstKCEAOw\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: #F7F7F7; background-color: inherit\" title\u003d\"Element\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.limit : What restrictions must be applied to the use of the data by the actor.\"\u003elimit\u003c/span\u003e\u003ca name\u003d\"Permission.rule.limit\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"/\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..*\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"types.html#BackBoneElement\"\u003eBackboneElement\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eWhat limits apply to the use of the data\u003cbr/\u003e\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAALUlEQVR4Xu3IoQ0AMAwEsez6+8/QBqe4IJJPMrlKUpt0Zz4AAGCHZwAAAPxyAWqFQIAoZQ9kAAAAAElFTkSuQmCC)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,R0lGODlhEAAQAPZ/APrkusOiYvvfqbiXWaV2G+jGhdq1b8GgYf3v1frw3vTUlsWkZNewbcSjY/DQkad4Hb6dXv3u0f3v1ObEgfPTlerJiP3w1v79+e7OkPrfrfnjuNOtZPrpydaxa+/YrvvdpP779ZxvFPvnwKKBQaFyF/369M2vdaqHRPz58/HNh/vowufFhfroxO3OkPrluv779tK0e6JzGProwvrow9m4eOnIifPTlPDPkP78+Naxaf3v0/zowfXRi+bFhLWUVv379/rnwPvszv3rye3LiPvnv+3MjPDasKiIS/789/3x2f747eXDg+7Mifvu0tu7f+/QkfDTnPXWmPrjsvrjtPbPgrqZW+/QlPz48K2EMv36866OUPvowat8Ivvgq/Pbrvzgq/PguvrgrqN0Gda2evfYm9+7d/rpw9q6e/LSku/Rl/XVl/LSlfrkt+zVqe7Wqv3x1/bNffbOf59wFdS6if3u0vrqyP3owPvepfXQivDQkO/PkKh9K7STVf779P///wD/ACH5BAEKAH8ALAAAAAAQABAAAAemgH+CgxeFF4OIhBdKGwFChYl/hYwbdkoBPnaQkosbG3d3VEpSUlonUoY1Gzo6QkI8SrGxWBOFG4uySgY5ZWR3PFy2hnaWZXC/PHcPwkpJk1ShoHcxhQEXSUmtFy6+0iSFVResrjoTPDzdcoU+F65CduVU6KAhhQa3F8Tx8nchBoYuqoTLZoAKFRIhqGwqJAULFx0GYpBQeChRIR4TJm6KJMhQRUSBAAA7\" alt\u003d\".\" style\u003d\"background-color: white; background-color: inherit\" title\u003d\"Data Type\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.limit.control : One or more coded restriction such as a refrain or obligation.\"\u003econtrol\u003c/span\u003e\u003ca name\u003d\"Permission.rule.limit.control\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..*\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"datatypes.html#CodeableConcept\"\u003eCodeableConcept\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eWhat coded limits apply to the use of the data\u003cbr/\u003eBinding: \u003ca href\u003d\"http://terminology.hl7.org/7.0.0/ValueSet-v3-SecurityControlObservationValue.html\"\u003eSecurityControlObservationValue\u003c/a\u003e (\u003ca href\u003d\"terminologies.html#preferred\" title\u003d\"Instances are encouraged to draw from the specified codes for interoperability purposes but are not required to do so to be considered conformant.\"\u003ePreferred\u003c/a\u003e)\u003cbr/\u003e\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: #F7F7F7\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAALUlEQVR4Xu3IoQ0AMAwEsez6+8/QBqe4IJJPMrlKUpt0Zz4AAGCHZwAAAPxyAWqFQIAoZQ9kAAAAAElFTkSuQmCC)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzI3XJ6V3QAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+2RsQ0AIAzDav7/2VzQwoCY4iWbZSmo1QGoUgNMghvWaIejPQW/CrrNCylIwcOCDYfLNRcNer4SAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,R0lGODlhEAAQAPZ/APrkusOiYvvfqbiXWaV2G+jGhdq1b8GgYf3v1frw3vTUlsWkZNewbcSjY/DQkad4Hb6dXv3u0f3v1ObEgfPTlerJiP3w1v79+e7OkPrfrfnjuNOtZPrpydaxa+/YrvvdpP779ZxvFPvnwKKBQaFyF/369M2vdaqHRPz58/HNh/vowufFhfroxO3OkPrluv779tK0e6JzGProwvrow9m4eOnIifPTlPDPkP78+Naxaf3v0/zowfXRi+bFhLWUVv379/rnwPvszv3rye3LiPvnv+3MjPDasKiIS/789/3x2f747eXDg+7Mifvu0tu7f+/QkfDTnPXWmPrjsvrjtPbPgrqZW+/QlPz48K2EMv36866OUPvowat8Ivvgq/Pbrvzgq/PguvrgrqN0Gda2evfYm9+7d/rpw9q6e/LSku/Rl/XVl/LSlfrkt+zVqe7Wqv3x1/bNffbOf59wFdS6if3u0vrqyP3owPvepfXQivDQkO/PkKh9K7STVf779P///wD/ACH5BAEKAH8ALAAAAAAQABAAAAemgH+CgxeFF4OIhBdKGwFChYl/hYwbdkoBPnaQkosbG3d3VEpSUlonUoY1Gzo6QkI8SrGxWBOFG4uySgY5ZWR3PFy2hnaWZXC/PHcPwkpJk1ShoHcxhQEXSUmtFy6+0iSFVResrjoTPDzdcoU+F65CduVU6KAhhQa3F8Tx8nchBoYuqoTLZoAKFRIhqGwqJAULFx0GYpBQeChRIR4TJm6KJMhQRUSBAAA7\" alt\u003d\".\" style\u003d\"background-color: #F7F7F7; background-color: inherit\" title\u003d\"Data Type\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.limit.tag : When this rule authorized data use, any data that is tagged with the code here must be redacted from the data provided for that authorized use.\"\u003etag\u003c/span\u003e\u003ca name\u003d\"Permission.rule.limit.tag\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..*\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"datatypes.html#Coding\"\u003eCoding\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: #F7F7F7; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eThe sensitivity codes that must be removed from the data\u003cbr/\u003eBinding: \u003ca href\u003d\"http://terminology.hl7.org/7.0.0/ValueSet-v3-InformationSensitivityPolicy.html\"\u003eInformationSensitivityPolicy\u003c/a\u003e (\u003ca href\u003d\"terminologies.html#preferred\" title\u003d\"Instances are encouraged to draw from the specified codes for interoperability purposes but are not required to do so to be considered conformant.\"\u003ePreferred\u003c/a\u003e)\u003cbr/\u003e\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr style\u003d\"border: 0px #F0F0F0 solid; padding:0px; vertical-align: top; background-color: white\"\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px; white-space: nowrap; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAyAAAAACCAYAAACg/LjIAAAALElEQVR4Xu3IsQ0AIAwEsez6+89AqKGGJj7JzVWSmmS3zgcAAPxxDQAAgFcadQVAgPvMVYYAAAAASUVORK5CYII\u003d)\" class\u003d\"hierarchy\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAWCAYAAAABxvaqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIs1vtcMQAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAE0lEQVQI12P4//8/AxMDAwNdCABMPwMo2ctnoQAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzIZgEiYEgAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAAIElEQVQ4y2P8//8/AyWAiYFCMGrAqAGjBowaMGoAAgAALL0DKYQ0DPIAAAAASUVORK5CYII\u003d\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAWCAYAAADJqhx8AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3wYeFzME+lXFigAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAANklEQVQ4y+3OsRUAIAjEUOL+O8cJABttJM11/x1qZAGqRBEVcNIqdWj1efDqQbb3HwwwwEfABmQUHSPM9dtDAAAAAElFTkSuQmCC\" alt\u003d\".\" style\u003d\"background-color: inherit\" class\u003d\"hierarchy\"/\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAARklEQVQ4y2P8//8/AyWAhYFCMAgMuHjx4n+KXaCv+I0szW8WpCG8kFO1lGFKW/SIjAUYgxz/MzAwMDC+nqhDUTQyjuYFBgCNmhP4OvTRgwAAAABJRU5ErkJggg\u003d\u003d\" alt\u003d\".\" style\u003d\"background-color: white; background-color: inherit\" title\u003d\"Primitive Data Type\" class\u003d\"hierarchy\"/\u003e \u003cspan title\u003d\"Permission.rule.limit.element : When this rule authorized data use, the data at the path indicated here, must be redacted from the authorized data provided for that authorized use.\"\u003eelement\u003c/span\u003e\u003ca name\u003d\"Permission.rule.limit.element\"\u003e \u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca style\u003d\"padding-left: 3px; padding-right: 3px; color: black; null; padding-left: 3px; padding-right: 3px; color: black; null\" href\u003d\"elementdefinition-definitions.html#ElementDefinition.isSummary\" title\u003d\"This element is included in summaries\"\u003eΣ\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e0..*\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003e\u003ca href\u003d\"datatypes.html#string\"\u003estring\u003c/a\u003e\u003c/td\u003e\u003ctd style\u003d\"vertical-align: top; text-align : var(--ig-left,left); background-color: white; border: 0px #F0F0F0 solid; padding:0px 4px 0px 4px\" class\u003d\"hierarchy\"\u003eWhat data elements that must be removed from the data\u003cbr/\u003e\u003cbr/\u003e\u003c/td\u003e\u003c/tr\u003e\r\n\u003ctr\u003e\u003ctd colspan\u003d\"5\" class\u003d\"hierarchy\"\u003e\u003cbr/\u003e\u003ca href\u003d\"https://build.fhir.org/ig/FHIR/ig-guidance/readingIgs.html#table-views\" title\u003d\"Legend for this format\"\u003e\u003cimg src\u003d\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3goXBCwdPqAP0wAAAldJREFUOMuNk0tIlFEYhp9z/vE2jHkhxXA0zJCMitrUQlq4lnSltEqCFhFG2MJFhIvIFpkEWaTQqjaWZRkp0g26URZkTpbaaOJkDqk10szoODP//7XIMUe0elcfnPd9zsfLOYplGrpRwZaqTtw3K7PtGem7Q6FoidbGgqHVy/HRb669R+56zx7eRV1L31JGxYbBtjKK93cxeqfyQHbehkZbUkK20goELEuIzEd+dHS+qz/Y8PTSif0FnGkbiwcAjHaU1+QWOptFiyCLp/LnKptpqIuXHx6rbR26kJcBX3yLgBfnd7CxwJmflpP2wUg0HIAoUUpZBmKzELGWcN8nAr6Gpu7tLU/CkwAaoKTWRSQyt89Q8w6J+oVQkKnBoblH7V0PPvUOvDYXfopE/SJmALsxnVm6LbkotrUtNowMeIrVrBcBpaMmdS0j9df7abpSuy7HWehwJdt1lhVwi/J58U5beXGAF6c3UXLycw1wdFklArBn87xdh0ZsZtArghBdAA3+OEDVubG4UEzP6x1FOWneHh2VDAHBAt80IbdXDcesNoCvs3E5AFyNSU5nbrDPZpcUEQQTFZiEVx+51fxMhhyJEAgvlriadIJZZksRuwBYMOPBbO3hePVVqgEJhFeUuFLhIPkRP6BQLIBrmMenujm/3g4zc398awIe90Zb5A1vREALqneMcYgP/xVQWlG+Ncu5vgwwlaUNx+3799rfe96u9K0JSDXcOzOTJg4B6IgmXfsygc7/Bvg9g9E58/cDVmGIBOP/zT8Bz1zqWqpbXIsd0O9hajXfL6u4BaOS6SeWAAAAAElFTkSuQmCC\" alt\u003d\"doco\" style\u003d\"background-color: inherit\"/\u003e Documentation for this format\u003c/a\u003e\u003c/td\u003e\u003c/tr\u003e\u003c/table\u003e\u003c/div\u003e" - }, - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status", - "valueCode": "normative" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg", - "valueCode": "sec" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm", - "valueInteger": 1 - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category", - "valueCode": "not-classified" - } - ], - "url": "http://hl7.org/fhir/StructureDefinition/Permission", - "version": "6.0.0-ballot3", - "name": "Permission", - "status": "active", - "experimental": false, - "date": "2025-11-17T19:23:40+00:00", - "publisher": "HL7 International / Security", - "contact": [ - { - "telecom": [ - { - "system": "url", - "value": "http://www.hl7.org/Special/committees/fiwg" - } - ] - }, - { - "telecom": [ - { - "system": "url", - "value": "http://www.hl7.org/Special/committees/secure" - } - ] - } - ], - "description": "Permission resource holds access rules for a given data and access request context.", - "jurisdiction": [ - { - "coding": [ - { - "system": "http://unstats.un.org/unsd/methods/m49/m49.htm", - "code": "001", - "display": "World" - } - ] - } - ], - "fhirVersion": "6.0.0-ballot3", - "mapping": [ - { - "identity": "w5", - "uri": "http://hl7.org/fhir/fivews", - "name": "FiveWs Pattern Mapping" - }, - { - "identity": "fhirconsent", - "uri": "http://hl7.org/fhir/consent", - "name": "FHIR Consent Mapping" - }, - { - "identity": "rim", - "uri": "http://hl7.org/v3", - "name": "RIM Mapping" - } - ], - "kind": "resource", - "abstract": false, - "type": "Permission", - "baseDefinition": "http://hl7.org/fhir/StructureDefinition/DomainResource", - "derivation": "specialization", - "snapshot": { - "element": [ - { - "id": "Permission", - "path": "Permission", - "short": "Access Rules", - "definition": "Permission resource holds access rules for a given data and access request context.", - "min": 0, - "max": "*", - "base": { - "path": "Permission", - "min": 0, - "max": "*" - }, - "constraint": [ - { - "key": "dom-2", - "severity": "error", - "human": "If the resource is contained in another resource, it SHALL NOT contain nested Resources", - "expression": "contained.contained.empty()", - "source": "http://hl7.org/fhir/StructureDefinition/DomainResource" - }, - { - "key": "dom-3", - "severity": "error", - "human": "If the resource is contained in another resource, it SHALL be referred to from elsewhere in the resource or SHALL refer to the containing resource", - "expression": "contained.where(((\u0027#\u0027+id.trace(\u0027id\u0027) in %resource.descendants().select(reference | as(uri))) or descendants().where(reference\u003d\u0027#\u0027 | as(uri)\u003d\u0027#\u0027).exists()).not()).trace(\u0027unmatched\u0027, id).empty()", - "source": "http://hl7.org/fhir/StructureDefinition/DomainResource" - }, - { - "key": "dom-4", - "severity": "error", - "human": "If a resource is contained in another resource, it SHALL NOT have a meta.versionId or a meta.lastUpdated", - "expression": "contained.meta.versionId.empty() and contained.meta.lastUpdated.empty()", - "source": "http://hl7.org/fhir/StructureDefinition/DomainResource" - }, - { - "key": "dom-5", - "severity": "error", - "human": "If a resource is contained in another resource, it SHALL NOT have a security label", - "expression": "contained.meta.security.empty()", - "source": "http://hl7.org/fhir/StructureDefinition/DomainResource" - }, - { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bestpractice", - "valueBoolean": true - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bestpractice-explanation", - "valueMarkdown": "When a resource has no narrative, only systems that fully understand the data can display the resource to a human safely. Including a human readable representation in the resource makes for a much more robust eco-system and cheaper handling of resources by intermediary systems. Some ecosystems restrict distribution of resources to only those systems that do fully understand the resources, and as a consequence implementers may believe that the narrative is superfluous. However experience shows that such eco-systems often open up to new participants over time." - } - ], - "key": "dom-6", - "severity": "warning", - "human": "A resource should have narrative for robust management", - "expression": "text.`div`.exists()", - "source": "http://hl7.org/fhir/StructureDefinition/DomainResource" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "rim", - "map": "Entity, Role, or Act" - }, - { - "identity": "w5", - "map": "infrastructure.information" - } - ] - }, - { - "id": "Permission.id", - "path": "Permission.id", - "short": "Logical id of this artifact", - "definition": "The logical id of the resource, as used in the URL for the resource. Once assigned, this value never changes.", - "comment": "Within the context of the FHIR RESTful interactions, the resource has an id except for cases like the create and conditional update. Otherwise, the use of the resouce id depends on the given use case.", - "min": 0, - "max": "1", - "base": { - "path": "Resource.id", - "min": 0, - "max": "1" - }, - "type": [ - { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type", - "valueUrl": "string" - } - ], - "code": "http://hl7.org/fhirpath/System.String" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true - }, - { - "id": "Permission.meta", - "path": "Permission.meta", - "short": "Metadata about the resource", - "definition": "The metadata about the resource. This is content that is maintained by the infrastructure. Changes to the content might not always be associated with version changes to the resource.", - "min": 0, - "max": "1", - "base": { - "path": "Resource.meta", - "min": 0, - "max": "1" - }, - "type": [ - { - "code": "Meta" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true - }, - { - "id": "Permission.implicitRules", - "path": "Permission.implicitRules", - "short": "A set of rules under which this content was created", - "definition": "A reference to a set of rules that were followed when the resource was constructed, and which must be understood when processing the content. Often, this is a reference to an implementation guide that defines the special rules along with other profiles etc. For DomainResources, if more than one implicitRules policy applies, additional policies may be conveyed using the [additionalImplicitRules](https://build.fhir.org/ig/HL7/fhir-extensions/StructureDefinition-additionalImplicitRules.html) extension.", - "comment": "Asserting this rule set restricts the content to be only understood by a limited set of trading partners. This inherently limits the usefulness of the data in the long term. However, the existing health eco-system is highly fractured, and not yet ready to define, collect, and exchange data in a generally computable sense. Wherever possible, implementers and/or specification writers should avoid using this element. Often, when used, the URL is a reference to an implementation guide that defines these special rules as part of its narrative along with other profiles, value sets, etc.", - "min": 0, - "max": "1", - "base": { - "path": "Resource.implicitRules", - "min": 0, - "max": "1" - }, - "type": [ - { - "code": "uri" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": true, - "isModifierReason": "This element is labeled as a modifier because the implicit rules may provide additional knowledge about the resource that modifies its meaning or interpretation", - "isSummary": true - }, - { - "id": "Permission.language", - "path": "Permission.language", - "short": "Language of the resource content", - "definition": "The base language in which the resource is written.", - "comment": "Language is provided to support indexing and accessibility (typically, services such as text to speech use the language tag). The html language tag in the narrative applies to the narrative. The language tag on the resource may be used to specify the language of other presentations generated from the data in the resource. Not all the content has to be in the base language. The Resource.language should not be assumed to apply to the narrative automatically. If a language is specified, it should it also be specified on the div element in the html (see rules in HTML5 for information about the relationship between xml:lang and the html lang attribute).", - "min": 0, - "max": "1", - "base": { - "path": "Resource.language", - "min": 0, - "max": "1" - }, - "type": [ - { - "code": "code" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": false, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "Language" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-isCommonBinding", - "valueBoolean": true - } - ], - "strength": "required", - "description": "IETF language tag for a human language", - "valueSet": "http://hl7.org/fhir/ValueSet/all-languages|6.0.0-ballot3", - "additional": [ - { - "purpose": "starter", - "valueSet": "http://hl7.org/fhir/ValueSet/languages" - } - ] - } - }, - { - "id": "Permission.text", - "path": "Permission.text", - "short": "Text summary of the resource, for human interpretation", - "definition": "A human-readable narrative that contains a summary of the resource and can be used to represent the content of the resource to a human. The narrative need not encode all the structured data, but is required to contain sufficient detail to make it \"clinically safe\" for a human to just read the narrative. Resource definitions may define what content should be represented in the narrative to ensure clinical safety.", - "comment": "Contained resources do not have a narrative. Resources that are not contained SHOULD have a narrative. In some cases, a resource may only have text with little or no additional discrete data (as long as all minOccurs\u003d1 elements are satisfied). This may be necessary for data from legacy systems where information is captured as a \"text blob\" or where text is additionally entered raw or narrated and encoded information is added later.", - "alias": [ - "narrative", - "html", - "xhtml", - "display" - ], - "min": 0, - "max": "1", - "base": { - "path": "DomainResource.text", - "min": 0, - "max": "1" - }, - "type": [ - { - "code": "Narrative" - } - ], - "condition": [ - "dom-6" - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "rim", - "map": "Act.text?" - } - ] - }, - { - "id": "Permission.contained", - "path": "Permission.contained", - "short": "Contained, inline Resources", - "definition": "These resources do not have an independent existence apart from the resource that contains them - they cannot be identified independently, nor can they have their own independent transaction scope. This is allowed to be a Parameters resource if and only if it is referenced by a resource that provides context/meaning.", - "comment": "This should never be done when the content can be identified properly, as once identification is lost, it is extremely difficult (and context dependent) to restore it again. Contained resources may have profiles and tags in their meta elements, but SHALL NOT have security labels. Contained resources may be a resource type defined in the FHIR specification, or an [additional resource](resource.html#additional).", - "alias": [ - "inline resources", - "anonymous resources", - "contained resources" - ], - "min": 0, - "max": "*", - "base": { - "path": "DomainResource.contained", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Resource" - } - ], - "condition": [ - "dom-2", - "dom-4", - "dom-3", - "dom-5" - ], - "mustSupport": false, - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "rim", - "map": "N/A" - } - ] - }, - { - "id": "Permission.extension", - "path": "Permission.extension", - "short": "Additional content defined by implementations", - "definition": "May be used to represent additional information that is not part of the basic definition of the resource. To make the use of extensions safe and managable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension.", - "comment": "There can be no stigma associated with the use of extensions by any application, project, or standard - regardless of the institution or jurisdiction that uses or defines the extensions. The use of extensions is what allows the FHIR specification to retain a core level of simplicity for everyone.", - "alias": [ - "extensions", - "user content" - ], - "min": 0, - "max": "*", - "base": { - "path": "DomainResource.extension", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Extension" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "rim", - "map": "N/A" - } - ] - }, - { - "id": "Permission.modifierExtension", - "path": "Permission.modifierExtension", - "short": "Extensions that cannot be ignored", - "definition": "May be used to represent additional information that is not part of the basic definition of the resource and that modifies the understanding of the element that contains it and/or the understanding of the containing element\u0027s descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and managable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer is allowed to define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).", - "comment": "There can be no stigma associated with the use of extensions by any application, project, or standard - regardless of the institution or jurisdiction that uses or defines the extensions. The use of extensions is what allows the FHIR specification to retain a core level of simplicity for everyone.", - "requirements": "Modifier extensions allow for extensions that *cannot* be safely ignored to be clearly distinguished from the vast majority of extensions which can be safely ignored. This promotes interoperability by eliminating the need for implementers to prohibit the presence of extensions. For further information, see the [definition of modifier extensions](extensibility.html#modifierExtension).", - "alias": [ - "extensions", - "user content" - ], - "min": 0, - "max": "*", - "base": { - "path": "DomainResource.modifierExtension", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Extension" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": true, - "isModifierReason": "Modifier extensions are expected to modify the meaning or interpretation of the resource that contains them", - "isSummary": true, - "mapping": [ - { - "identity": "rim", - "map": "N/A" - } - ] - }, - { - "id": "Permission.identifier", - "path": "Permission.identifier", - "short": "Business Identifier for permission", - "definition": "A unique identifier assigned to this permission.", - "requirements": "Allows permission to be distinguished and referenced.", - "min": 0, - "max": "*", - "base": { - "path": "Permission.identifier", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Identifier" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "w5", - "map": "FiveWs.identifier" - } - ] - }, - { - "id": "Permission.status", - "path": "Permission.status", - "short": "active | entered-in-error | draft | rejected", - "definition": "Status.", - "min": 1, - "max": "1", - "base": { - "path": "Permission.status", - "min": 1, - "max": "1" - }, - "type": [ - { - "code": "code" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "PermissionStatus" - } - ], - "strength": "required", - "description": "Codes identifying the lifecycle stage of a product.", - "valueSet": "http://hl7.org/fhir/ValueSet/permission-status|6.0.0-ballot3" - }, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.status" - } - ] - }, - { - "id": "Permission.asserter", - "path": "Permission.asserter", - "short": "The person or entity that asserts the permission", - "definition": "The person or entity that asserts the permission.", - "min": 0, - "max": "1", - "base": { - "path": "Permission.asserter", - "min": 0, - "max": "1" - }, - "type": [ - { - "code": "Reference", - "targetProfile": [ - "http://hl7.org/fhir/StructureDefinition/Practitioner", - "http://hl7.org/fhir/StructureDefinition/PractitionerRole", - "http://hl7.org/fhir/StructureDefinition/Organization", - "http://hl7.org/fhir/StructureDefinition/CareTeam", - "http://hl7.org/fhir/StructureDefinition/Patient", - "http://hl7.org/fhir/StructureDefinition/RelatedPerson", - "http://hl7.org/fhir/StructureDefinition/HealthcareService" - ] - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.grantor, Consent.grantee, Consent.manager, Consent.controller" - } - ] - }, - { - "id": "Permission.date", - "path": "Permission.date", - "short": "The date that permission was asserted", - "definition": "The date that permission was asserted.", - "alias": [ - "class" - ], - "min": 0, - "max": "*", - "base": { - "path": "Permission.date", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "dateTime" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.dateTime" - } - ] - }, - { - "id": "Permission.validity", - "path": "Permission.validity", - "short": "The period in which the permission is active", - "definition": "The period in which the permission is active.", - "alias": [ - "type" - ], - "min": 0, - "max": "1", - "base": { - "path": "Permission.validity", - "min": 0, - "max": "1" - }, - "type": [ - { - "code": "Period" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.period" - } - ] - }, - { - "id": "Permission.justification", - "path": "Permission.justification", - "short": "The asserted justification for using the data", - "definition": "The asserted justification for using the data.", - "min": 0, - "max": "1", - "base": { - "path": "Permission.justification", - "min": 0, - "max": "1" - }, - "type": [ - { - "code": "BackboneElement" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children or both", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true - }, - { - "id": "Permission.justification.id", - "path": "Permission.justification.id", - "representation": [ - "xmlAttr" - ], - "short": "Unique id for inter-element referencing", - "definition": "Unique id for the element within a resource (for internal references). This may be any string value that does not contain spaces.", - "min": 0, - "max": "1", - "base": { - "path": "Element.id", - "min": 0, - "max": "1" - }, - "type": [ - { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type", - "valueUrl": "string" - } - ], - "code": "http://hl7.org/fhirpath/System.String" - } - ], - "condition": [ - "ele-1" - ], - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "rim", - "map": "n/a" - } - ] - }, - { - "id": "Permission.justification.extension", - "path": "Permission.justification.extension", - "short": "Additional content defined by implementations", - "definition": "May be used to represent additional information that is not part of the basic definition of the element. To make the use of extensions safe and managable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension.", - "comment": "There can be no stigma associated with the use of extensions by any application, project, or standard - regardless of the institution or jurisdiction that uses or defines the extensions. The use of extensions is what allows the FHIR specification to retain a core level of simplicity for everyone.", - "alias": [ - "extensions", - "user content" - ], - "min": 0, - "max": "*", - "base": { - "path": "Element.extension", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Extension" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "rim", - "map": "n/a" - } - ] - }, - { - "id": "Permission.justification.modifierExtension", - "path": "Permission.justification.modifierExtension", - "short": "Extensions that cannot be ignored even if unrecognized", - "definition": "May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element\u0027s descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and managable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).", - "comment": "There can be no stigma associated with the use of extensions by any application, project, or standard - regardless of the institution or jurisdiction that uses or defines the extensions. The use of extensions is what allows the FHIR specification to retain a core level of simplicity for everyone.", - "requirements": "Modifier extensions allow for extensions that *cannot* be safely ignored to be clearly distinguished from the vast majority of extensions which can be safely ignored. This promotes interoperability by eliminating the need for implementers to prohibit the presence of extensions. For further information, see the [definition of modifier extensions](extensibility.html#modifierExtension).", - "alias": [ - "extensions", - "user content", - "modifiers" - ], - "min": 0, - "max": "*", - "base": { - "path": "BackboneElement.modifierExtension", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Extension" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "isModifier": true, - "isModifierReason": "Modifier extensions are expected to modify the meaning or interpretation of the element that contains them", - "isSummary": true, - "mapping": [ - { - "identity": "rim", - "map": "N/A" - } - ] - }, - { - "id": "Permission.justification.basis", - "path": "Permission.justification.basis", - "short": "The regulatory grounds upon which this Permission builds", - "definition": "This would be a codeableconcept, or a coding, which can be constrained to , for example, the 6 grounds for processing in GDPR.", - "min": 0, - "max": "*", - "base": { - "path": "Permission.justification.basis", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "CodeableConcept" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "ConsentRegulatoryBasis" - } - ], - "strength": "example", - "description": "Regulatory policy examples", - "valueSet": "http://hl7.org/fhir/ValueSet/consent-policy" - }, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.regulatoryBasis" - } - ] - }, - { - "id": "Permission.justification.evidence", - "path": "Permission.justification.evidence", - "short": "Justifing rational", - "definition": "Justifing rational.", - "comment": "While any resource may be used, DocumentReference, Consent, PlanDefinition, and Contract would be most frequent", - "min": 0, - "max": "*", - "base": { - "path": "Permission.justification.evidence", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Reference", - "targetProfile": [ - "http://hl7.org/fhir/StructureDefinition/Resource" - ] - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.policyBasis.reference" - } - ] - }, - { - "id": "Permission.combining", - "path": "Permission.combining", - "short": "deny-overrides | permit-overrides | ordered-deny-overrides | ordered-permit-overrides | deny-unless-permit | permit-unless-deny", - "definition": "Defines a procedure for arriving at an access decision given the set of rules.", - "comment": "see [XACML Combining Rules](http://docs.oasis-open.org/xacml/3.0/xacml-3.0-core-spec-cos01-en.html#_Toc325047267)", - "min": 1, - "max": "1", - "base": { - "path": "Permission.combining", - "min": 1, - "max": "1" - }, - "type": [ - { - "code": "code" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": true, - "isModifierReason": "Defines how the rules are to be combined.", - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "PermissionCombining" - } - ], - "strength": "required", - "description": "How the rules are to be combined.", - "valueSet": "http://hl7.org/fhir/ValueSet/permission-rule-combining|6.0.0-ballot3" - } - }, - { - "id": "Permission.rule", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-explicit-type-name", - "valueString": "Rule" - } - ], - "path": "Permission.rule", - "short": "Constraints to the Permission", - "definition": "A set of rules.", - "comment": "Each `.rule` is evaluated within the combining rule identified in the `.combining` element.", - "min": 0, - "max": "*", - "base": { - "path": "Permission.rule", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "BackboneElement" - } - ], - "orderMeaning": "The order of the rules processing is defined in rule combining selected in .combining element.", - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children or both", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - }, - { - "key": "prm-1", - "severity": "error", - "human": "If the import element is populated then the type, data, and activity shall not be populated", - "expression": "import.exists() implies type.exists().not() and data.exists().not() and activity.exists().not()", - "source": "http://hl7.org/fhir/StructureDefinition/Permission" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true - }, - { - "id": "Permission.rule.id", - "path": "Permission.rule.id", - "representation": [ - "xmlAttr" - ], - "short": "Unique id for inter-element referencing", - "definition": "Unique id for the element within a resource (for internal references). This may be any string value that does not contain spaces.", - "min": 0, - "max": "1", - "base": { - "path": "Element.id", - "min": 0, - "max": "1" - }, - "type": [ - { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type", - "valueUrl": "string" - } - ], - "code": "http://hl7.org/fhirpath/System.String" - } - ], - "condition": [ - "ele-1" - ], - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "rim", - "map": "n/a" - } - ] - }, - { - "id": "Permission.rule.extension", - "path": "Permission.rule.extension", - "short": "Additional content defined by implementations", - "definition": "May be used to represent additional information that is not part of the basic definition of the element. To make the use of extensions safe and managable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension.", - "comment": "There can be no stigma associated with the use of extensions by any application, project, or standard - regardless of the institution or jurisdiction that uses or defines the extensions. The use of extensions is what allows the FHIR specification to retain a core level of simplicity for everyone.", - "alias": [ - "extensions", - "user content" - ], - "min": 0, - "max": "*", - "base": { - "path": "Element.extension", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Extension" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "rim", - "map": "n/a" - } - ] - }, - { - "id": "Permission.rule.modifierExtension", - "path": "Permission.rule.modifierExtension", - "short": "Extensions that cannot be ignored even if unrecognized", - "definition": "May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element\u0027s descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and managable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).", - "comment": "There can be no stigma associated with the use of extensions by any application, project, or standard - regardless of the institution or jurisdiction that uses or defines the extensions. The use of extensions is what allows the FHIR specification to retain a core level of simplicity for everyone.", - "requirements": "Modifier extensions allow for extensions that *cannot* be safely ignored to be clearly distinguished from the vast majority of extensions which can be safely ignored. This promotes interoperability by eliminating the need for implementers to prohibit the presence of extensions. For further information, see the [definition of modifier extensions](extensibility.html#modifierExtension).", - "alias": [ - "extensions", - "user content", - "modifiers" - ], - "min": 0, - "max": "*", - "base": { - "path": "BackboneElement.modifierExtension", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Extension" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "isModifier": true, - "isModifierReason": "Modifier extensions are expected to modify the meaning or interpretation of the element that contains them", - "isSummary": true, - "mapping": [ - { - "identity": "rim", - "map": "N/A" - } - ] - }, - { - "id": "Permission.rule.import", - "path": "Permission.rule.import", - "short": "Reference to a Permission", - "definition": "This rule is expressed in another Permission resource.", - "min": 0, - "max": "1", - "base": { - "path": "Permission.rule.import", - "min": 0, - "max": "1" - }, - "type": [ - { - "code": "Reference", - "targetProfile": [ - "http://hl7.org/fhir/StructureDefinition/Permission" - ] - } - ], - "condition": [ - "prm-1" - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true - }, - { - "id": "Permission.rule.type", - "path": "Permission.rule.type", - "short": "deny | permit", - "definition": "deny | permit.", - "min": 0, - "max": "1", - "base": { - "path": "Permission.rule.type", - "min": 0, - "max": "1" - }, - "type": [ - { - "code": "code" - } - ], - "condition": [ - "prm-1" - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": true, - "isModifierReason": "Sets the context for the meaning of the rules.", - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "PermissionProvisionType" - } - ], - "strength": "required", - "description": "How a rule statement is applied.", - "valueSet": "http://hl7.org/fhir/ValueSet/consent-provision-type|6.0.0-ballot3" - }, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.type" - } - ] - }, - { - "id": "Permission.rule.data", - "path": "Permission.rule.data", - "short": "The selection criteria to identify data that is within scope of this provision", - "definition": "A description or definition of which activities are allowed to be done on the data.", - "comment": "Within a `.rule` any repetitions of the `.data` element are in an OR relationship. That is to say that the data identified by the rule is all the data identified by all repetitions of `.data`. Thus to identify one rule that applies to data tagged with `STD` and data that is tagged with `HIV`, one would repeat this at the `.data` level. Within the `.data` element, all elements and all repetitions of elements, are in an AND relationship. Thus to select data that has both `STD` and `HIV` one puts both into one `.rule`. To have different rules for `STD` from `HIV`, one would need to have two `.rule` elements. To have a rule that applies to both, those that have just `STD` and just `HIV`, this repetition may also be done at the data level as described above.", - "min": 0, - "max": "*", - "base": { - "path": "Permission.rule.data", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "BackboneElement" - } - ], - "condition": [ - "prm-1" - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children or both", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true - }, - { - "id": "Permission.rule.data.id", - "path": "Permission.rule.data.id", - "representation": [ - "xmlAttr" - ], - "short": "Unique id for inter-element referencing", - "definition": "Unique id for the element within a resource (for internal references). This may be any string value that does not contain spaces.", - "min": 0, - "max": "1", - "base": { - "path": "Element.id", - "min": 0, - "max": "1" - }, - "type": [ - { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type", - "valueUrl": "string" - } - ], - "code": "http://hl7.org/fhirpath/System.String" - } - ], - "condition": [ - "ele-1" - ], - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "rim", - "map": "n/a" - } - ] - }, - { - "id": "Permission.rule.data.extension", - "path": "Permission.rule.data.extension", - "short": "Additional content defined by implementations", - "definition": "May be used to represent additional information that is not part of the basic definition of the element. To make the use of extensions safe and managable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension.", - "comment": "There can be no stigma associated with the use of extensions by any application, project, or standard - regardless of the institution or jurisdiction that uses or defines the extensions. The use of extensions is what allows the FHIR specification to retain a core level of simplicity for everyone.", - "alias": [ - "extensions", - "user content" - ], - "min": 0, - "max": "*", - "base": { - "path": "Element.extension", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Extension" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "rim", - "map": "n/a" - } - ] - }, - { - "id": "Permission.rule.data.modifierExtension", - "path": "Permission.rule.data.modifierExtension", - "short": "Extensions that cannot be ignored even if unrecognized", - "definition": "May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element\u0027s descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and managable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).", - "comment": "There can be no stigma associated with the use of extensions by any application, project, or standard - regardless of the institution or jurisdiction that uses or defines the extensions. The use of extensions is what allows the FHIR specification to retain a core level of simplicity for everyone.", - "requirements": "Modifier extensions allow for extensions that *cannot* be safely ignored to be clearly distinguished from the vast majority of extensions which can be safely ignored. This promotes interoperability by eliminating the need for implementers to prohibit the presence of extensions. For further information, see the [definition of modifier extensions](extensibility.html#modifierExtension).", - "alias": [ - "extensions", - "user content", - "modifiers" - ], - "min": 0, - "max": "*", - "base": { - "path": "BackboneElement.modifierExtension", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Extension" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "isModifier": true, - "isModifierReason": "Modifier extensions are expected to modify the meaning or interpretation of the element that contains them", - "isSummary": true, - "mapping": [ - { - "identity": "rim", - "map": "N/A" - } - ] - }, - { - "id": "Permission.rule.data.resource", - "path": "Permission.rule.data.resource", - "short": "Explicit FHIR Resource references", - "definition": "Explicit FHIR Resource references.", - "min": 0, - "max": "*", - "base": { - "path": "Permission.rule.data.resource", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "BackboneElement" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children or both", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.data" - } - ] - }, - { - "id": "Permission.rule.data.resource.id", - "path": "Permission.rule.data.resource.id", - "representation": [ - "xmlAttr" - ], - "short": "Unique id for inter-element referencing", - "definition": "Unique id for the element within a resource (for internal references). This may be any string value that does not contain spaces.", - "min": 0, - "max": "1", - "base": { - "path": "Element.id", - "min": 0, - "max": "1" - }, - "type": [ - { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type", - "valueUrl": "string" - } - ], - "code": "http://hl7.org/fhirpath/System.String" - } - ], - "condition": [ - "ele-1" - ], - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "rim", - "map": "n/a" - } - ] - }, - { - "id": "Permission.rule.data.resource.extension", - "path": "Permission.rule.data.resource.extension", - "short": "Additional content defined by implementations", - "definition": "May be used to represent additional information that is not part of the basic definition of the element. To make the use of extensions safe and managable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension.", - "comment": "There can be no stigma associated with the use of extensions by any application, project, or standard - regardless of the institution or jurisdiction that uses or defines the extensions. The use of extensions is what allows the FHIR specification to retain a core level of simplicity for everyone.", - "alias": [ - "extensions", - "user content" - ], - "min": 0, - "max": "*", - "base": { - "path": "Element.extension", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Extension" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "rim", - "map": "n/a" - } - ] - }, - { - "id": "Permission.rule.data.resource.modifierExtension", - "path": "Permission.rule.data.resource.modifierExtension", - "short": "Extensions that cannot be ignored even if unrecognized", - "definition": "May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element\u0027s descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and managable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).", - "comment": "There can be no stigma associated with the use of extensions by any application, project, or standard - regardless of the institution or jurisdiction that uses or defines the extensions. The use of extensions is what allows the FHIR specification to retain a core level of simplicity for everyone.", - "requirements": "Modifier extensions allow for extensions that *cannot* be safely ignored to be clearly distinguished from the vast majority of extensions which can be safely ignored. This promotes interoperability by eliminating the need for implementers to prohibit the presence of extensions. For further information, see the [definition of modifier extensions](extensibility.html#modifierExtension).", - "alias": [ - "extensions", - "user content", - "modifiers" - ], - "min": 0, - "max": "*", - "base": { - "path": "BackboneElement.modifierExtension", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Extension" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "isModifier": true, - "isModifierReason": "Modifier extensions are expected to modify the meaning or interpretation of the element that contains them", - "isSummary": true, - "mapping": [ - { - "identity": "rim", - "map": "N/A" - } - ] - }, - { - "id": "Permission.rule.data.resource.meaning", - "path": "Permission.rule.data.resource.meaning", - "short": "instance | related | dependents | authoredby", - "definition": "How the resource reference is interpreted when testing consent restrictions.", - "min": 1, - "max": "1", - "base": { - "path": "Permission.rule.data.resource.meaning", - "min": 1, - "max": "1" - }, - "type": [ - { - "code": "code" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "ConsentDataMeaning" - } - ], - "strength": "required", - "description": "How a resource reference is interpreted when testing consent restrictions.", - "valueSet": "http://hl7.org/fhir/ValueSet/consent-data-meaning|6.0.0-ballot3" - } - }, - { - "id": "Permission.rule.data.resource.reference", - "path": "Permission.rule.data.resource.reference", - "short": "The actual data reference", - "definition": "A reference to a specific resource that defines which resources are covered by this consent.", - "min": 1, - "max": "1", - "base": { - "path": "Permission.rule.data.resource.reference", - "min": 1, - "max": "1" - }, - "type": [ - { - "code": "Reference", - "targetProfile": [ - "http://hl7.org/fhir/StructureDefinition/Resource" - ] - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true - }, - { - "id": "Permission.rule.data.resourceType", - "path": "Permission.rule.data.resourceType", - "short": "e.g. Resource Type, Profile, etc", - "definition": "The resourceType(s) covered by this rule. The type can be a FHIR resource type or a profile on a type that indicates what information the rule applies to.", - "comment": "The intention of the resourceType element is that the codes refer to profiles or document types defined in a standard or an implementation guide somewhere.", - "min": 0, - "max": "*", - "base": { - "path": "Permission.rule.data.resourceType", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Coding" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-isCommonBinding", - "valueBoolean": true - } - ], - "strength": "extensible", - "description": "The resource types a consent provision covers.", - "valueSet": "http://hl7.org/fhir/ValueSet/resource-types" - } - }, - { - "id": "Permission.rule.data.security", - "path": "Permission.rule.data.security", - "short": "Security tag code on .meta.security", - "definition": "The data in scope are those with the given codes present in that data .meta.security element.", - "comment": "Note the ConfidentialityCode vocabulary indicates the highest value, thus a security label of \"R\" then it applies to all resources that are labeled \"R\" or lower. E.g. for Confidentiality, it\u0027s a high water mark. For other kinds of security labels, subsumption logic applies. When the purpose of use tag is on the data, access request purpose of use shall not conflict.", - "min": 0, - "max": "*", - "base": { - "path": "Permission.rule.data.security", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Coding" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.securityLabel" - } - ] - }, - { - "id": "Permission.rule.data.period", - "path": "Permission.rule.data.period", - "short": "Timeframe encompasing data create/update", - "definition": "Clinical or Operational Relevant period of time that bounds the data controlled by this rule.", - "comment": "This has a different sense to the .validity.", - "min": 0, - "max": "1", - "base": { - "path": "Permission.rule.data.period", - "min": 0, - "max": "1" - }, - "type": [ - { - "code": "Period" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.dataPeriod" - } - ] - }, - { - "id": "Permission.rule.data.expression", - "path": "Permission.rule.data.expression", - "short": "Expression identifying the data", - "definition": "Used when other data selection elements are insufficient.", - "min": 0, - "max": "1", - "base": { - "path": "Permission.rule.data.expression", - "min": 0, - "max": "1" - }, - "type": [ - { - "code": "Expression" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.class, Consent.provision.code, Consent.provision.expression" - } - ] - }, - { - "id": "Permission.rule.activity", - "path": "Permission.rule.activity", - "short": "A description or definition of which activities are allowed to be done on the data", - "definition": "A description or definition of which activities are allowed to be done on the data.", - "comment": "Within a `.rule` any repetitions of the `.activity` element are in an OR relationship. That is to say that the rule applies to all the repetitions of `.activity`. Thus to identify one rule that applies to both `TREAT` and `HOPERAT`, one would have one rule with repetitions at the .activity level. Within the `.activity` element, all elements and all repetitions of elements, are in an AND relationship. Thus to control an actity that is covering purpose of both `TREAT` and `HOPERAT`, one rule with an `.activity` `.purpose` holding both `TREAT` and `HOPERAT` can define that rule. However this will not cover activities covering only `TREAT`, for that repeat at the `.activity` with just a `.purpose` of `TREAT`.", - "min": 0, - "max": "*", - "base": { - "path": "Permission.rule.activity", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "BackboneElement" - } - ], - "condition": [ - "prm-1" - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children or both", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true - }, - { - "id": "Permission.rule.activity.id", - "path": "Permission.rule.activity.id", - "representation": [ - "xmlAttr" - ], - "short": "Unique id for inter-element referencing", - "definition": "Unique id for the element within a resource (for internal references). This may be any string value that does not contain spaces.", - "min": 0, - "max": "1", - "base": { - "path": "Element.id", - "min": 0, - "max": "1" - }, - "type": [ - { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type", - "valueUrl": "string" - } - ], - "code": "http://hl7.org/fhirpath/System.String" - } - ], - "condition": [ - "ele-1" - ], - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "rim", - "map": "n/a" - } - ] - }, - { - "id": "Permission.rule.activity.extension", - "path": "Permission.rule.activity.extension", - "short": "Additional content defined by implementations", - "definition": "May be used to represent additional information that is not part of the basic definition of the element. To make the use of extensions safe and managable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension.", - "comment": "There can be no stigma associated with the use of extensions by any application, project, or standard - regardless of the institution or jurisdiction that uses or defines the extensions. The use of extensions is what allows the FHIR specification to retain a core level of simplicity for everyone.", - "alias": [ - "extensions", - "user content" - ], - "min": 0, - "max": "*", - "base": { - "path": "Element.extension", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Extension" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "rim", - "map": "n/a" - } - ] - }, - { - "id": "Permission.rule.activity.modifierExtension", - "path": "Permission.rule.activity.modifierExtension", - "short": "Extensions that cannot be ignored even if unrecognized", - "definition": "May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element\u0027s descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and managable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).", - "comment": "There can be no stigma associated with the use of extensions by any application, project, or standard - regardless of the institution or jurisdiction that uses or defines the extensions. The use of extensions is what allows the FHIR specification to retain a core level of simplicity for everyone.", - "requirements": "Modifier extensions allow for extensions that *cannot* be safely ignored to be clearly distinguished from the vast majority of extensions which can be safely ignored. This promotes interoperability by eliminating the need for implementers to prohibit the presence of extensions. For further information, see the [definition of modifier extensions](extensibility.html#modifierExtension).", - "alias": [ - "extensions", - "user content", - "modifiers" - ], - "min": 0, - "max": "*", - "base": { - "path": "BackboneElement.modifierExtension", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Extension" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "isModifier": true, - "isModifierReason": "Modifier extensions are expected to modify the meaning or interpretation of the element that contains them", - "isSummary": true, - "mapping": [ - { - "identity": "rim", - "map": "N/A" - } - ] - }, - { - "id": "Permission.rule.activity.actor", - "path": "Permission.rule.activity.actor", - "short": "Who|what is controlled by this rule", - "definition": "Who or what is controlled by this rule. Use group to identify a set of actors by some property they share (e.g. \u0027admitting officers\u0027).", - "comment": "When both reference and role are given the actor is only selected when that reference actor is functionally carrying out that role.", - "min": 0, - "max": "*", - "base": { - "path": "Permission.rule.activity.actor", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "BackboneElement" - } - ], - "meaningWhenMissing": "There is no specific actor associated with the rule", - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children or both", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.actor" - } - ] - }, - { - "id": "Permission.rule.activity.actor.id", - "path": "Permission.rule.activity.actor.id", - "representation": [ - "xmlAttr" - ], - "short": "Unique id for inter-element referencing", - "definition": "Unique id for the element within a resource (for internal references). This may be any string value that does not contain spaces.", - "min": 0, - "max": "1", - "base": { - "path": "Element.id", - "min": 0, - "max": "1" - }, - "type": [ - { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type", - "valueUrl": "string" - } - ], - "code": "http://hl7.org/fhirpath/System.String" - } - ], - "condition": [ - "ele-1" - ], - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "rim", - "map": "n/a" - } - ] - }, - { - "id": "Permission.rule.activity.actor.extension", - "path": "Permission.rule.activity.actor.extension", - "short": "Additional content defined by implementations", - "definition": "May be used to represent additional information that is not part of the basic definition of the element. To make the use of extensions safe and managable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension.", - "comment": "There can be no stigma associated with the use of extensions by any application, project, or standard - regardless of the institution or jurisdiction that uses or defines the extensions. The use of extensions is what allows the FHIR specification to retain a core level of simplicity for everyone.", - "alias": [ - "extensions", - "user content" - ], - "min": 0, - "max": "*", - "base": { - "path": "Element.extension", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Extension" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "rim", - "map": "n/a" - } - ] - }, - { - "id": "Permission.rule.activity.actor.modifierExtension", - "path": "Permission.rule.activity.actor.modifierExtension", - "short": "Extensions that cannot be ignored even if unrecognized", - "definition": "May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element\u0027s descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and managable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).", - "comment": "There can be no stigma associated with the use of extensions by any application, project, or standard - regardless of the institution or jurisdiction that uses or defines the extensions. The use of extensions is what allows the FHIR specification to retain a core level of simplicity for everyone.", - "requirements": "Modifier extensions allow for extensions that *cannot* be safely ignored to be clearly distinguished from the vast majority of extensions which can be safely ignored. This promotes interoperability by eliminating the need for implementers to prohibit the presence of extensions. For further information, see the [definition of modifier extensions](extensibility.html#modifierExtension).", - "alias": [ - "extensions", - "user content", - "modifiers" - ], - "min": 0, - "max": "*", - "base": { - "path": "BackboneElement.modifierExtension", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Extension" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "isModifier": true, - "isModifierReason": "Modifier extensions are expected to modify the meaning or interpretation of the element that contains them", - "isSummary": true, - "mapping": [ - { - "identity": "rim", - "map": "N/A" - } - ] - }, - { - "id": "Permission.rule.activity.actor.role", - "path": "Permission.rule.activity.actor.role", - "short": "How the actor is involved", - "definition": "How the individual is involved in the activity that is described in the rule.", - "min": 0, - "max": "1", - "base": { - "path": "Permission.rule.activity.actor.role", - "min": 0, - "max": "1" - }, - "type": [ - { - "code": "CodeableConcept" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": false, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "ActorRole" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-isCommonBinding", - "valueBoolean": true - } - ], - "strength": "extensible", - "description": "How an actor is involved in the rule.", - "valueSet": "http://hl7.org/fhir/ValueSet/participation-role-type" - }, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.actor.role" - } - ] - }, - { - "id": "Permission.rule.activity.actor.reference", - "path": "Permission.rule.activity.actor.reference", - "short": "Authorized actor(s)", - "definition": "The actor(s) authorized for the defined activity.", - "min": 0, - "max": "1", - "base": { - "path": "Permission.rule.activity.actor.reference", - "min": 0, - "max": "1" - }, - "type": [ - { - "code": "Reference", - "targetProfile": [ - "http://hl7.org/fhir/StructureDefinition/Device", - "http://hl7.org/fhir/StructureDefinition/Group", - "http://hl7.org/fhir/StructureDefinition/CareTeam", - "http://hl7.org/fhir/StructureDefinition/Organization", - "http://hl7.org/fhir/StructureDefinition/Patient", - "http://hl7.org/fhir/StructureDefinition/Practitioner", - "http://hl7.org/fhir/StructureDefinition/RelatedPerson", - "http://hl7.org/fhir/StructureDefinition/PractitionerRole", - "http://hl7.org/fhir/StructureDefinition/DeviceDefinition", - "http://hl7.org/fhir/StructureDefinition/HealthcareService" - ] - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.actor.reference" - } - ] - }, - { - "id": "Permission.rule.activity.action", - "path": "Permission.rule.activity.action", - "short": "Actions controlled by this rule", - "definition": "Actions controlled by this Rule.", - "comment": "Note that this is the direct action (not the grounds for the action covered in the purpose element). At present, the only action in the understood and tested scope of this resource is \u0027read\u0027.", - "min": 0, - "max": "*", - "base": { - "path": "Permission.rule.activity.action", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "CodeableConcept" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "ProcessingActivityAction" - } - ], - "strength": "preferred", - "description": "Detailed codes for the action.", - "valueSet": "http://hl7.org/fhir/ValueSet/type-restful-interaction" - }, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.action" - } - ] - }, - { - "id": "Permission.rule.activity.purpose", - "path": "Permission.rule.activity.purpose", - "short": "The purpose for which the permission is given", - "definition": "The purpose for which the permission is given.", - "min": 0, - "max": "*", - "base": { - "path": "Permission.rule.activity.purpose", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "CodeableConcept" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "PurposeOfUse" - } - ], - "strength": "preferred", - "description": "What purposes of use are controlled by this exception. If more than one label is specified, operations must have all the specified labels.", - "valueSet": "http://terminology.hl7.org/ValueSet/v3-PurposeOfUse" - }, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.purpose" - } - ] - }, - { - "id": "Permission.rule.limit", - "path": "Permission.rule.limit", - "short": "What limits apply to the use of the data", - "definition": "What restrictions must be applied to the use of the data by the actor.", - "comment": "Within a `.rule` all repetitions of the `.limit` all apply to the rule. That is to say if there are multiple limits, and the rule permits the activity, then all the identified limits are applied to that authorized activity.", - "min": 0, - "max": "*", - "base": { - "path": "Permission.rule.limit", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "BackboneElement" - } - ], - "meaningWhenMissing": "There is no limit beyond those specified in the authorized activity to the authorized data.", - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children or both", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": false - }, - { - "id": "Permission.rule.limit.id", - "path": "Permission.rule.limit.id", - "representation": [ - "xmlAttr" - ], - "short": "Unique id for inter-element referencing", - "definition": "Unique id for the element within a resource (for internal references). This may be any string value that does not contain spaces.", - "min": 0, - "max": "1", - "base": { - "path": "Element.id", - "min": 0, - "max": "1" - }, - "type": [ - { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type", - "valueUrl": "string" - } - ], - "code": "http://hl7.org/fhirpath/System.String" - } - ], - "condition": [ - "ele-1" - ], - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "rim", - "map": "n/a" - } - ] - }, - { - "id": "Permission.rule.limit.extension", - "path": "Permission.rule.limit.extension", - "short": "Additional content defined by implementations", - "definition": "May be used to represent additional information that is not part of the basic definition of the element. To make the use of extensions safe and managable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension.", - "comment": "There can be no stigma associated with the use of extensions by any application, project, or standard - regardless of the institution or jurisdiction that uses or defines the extensions. The use of extensions is what allows the FHIR specification to retain a core level of simplicity for everyone.", - "alias": [ - "extensions", - "user content" - ], - "min": 0, - "max": "*", - "base": { - "path": "Element.extension", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Extension" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "rim", - "map": "n/a" - } - ] - }, - { - "id": "Permission.rule.limit.modifierExtension", - "path": "Permission.rule.limit.modifierExtension", - "short": "Extensions that cannot be ignored even if unrecognized", - "definition": "May be used to represent additional information that is not part of the basic definition of the element and that modifies the understanding of the element in which it is contained and/or the understanding of the containing element\u0027s descendants. Usually modifier elements provide negation or qualification. To make the use of extensions safe and managable, there is a strict set of governance applied to the definition and use of extensions. Though any implementer can define an extension, there is a set of requirements that SHALL be met as part of the definition of the extension. Applications processing a resource are required to check for modifier extensions.\n\nModifier extensions SHALL NOT change the meaning of any elements on Resource or DomainResource (including cannot change the meaning of modifierExtension itself).", - "comment": "There can be no stigma associated with the use of extensions by any application, project, or standard - regardless of the institution or jurisdiction that uses or defines the extensions. The use of extensions is what allows the FHIR specification to retain a core level of simplicity for everyone.", - "requirements": "Modifier extensions allow for extensions that *cannot* be safely ignored to be clearly distinguished from the vast majority of extensions which can be safely ignored. This promotes interoperability by eliminating the need for implementers to prohibit the presence of extensions. For further information, see the [definition of modifier extensions](extensibility.html#modifierExtension).", - "alias": [ - "extensions", - "user content", - "modifiers" - ], - "min": 0, - "max": "*", - "base": { - "path": "BackboneElement.modifierExtension", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Extension" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "isModifier": true, - "isModifierReason": "Modifier extensions are expected to modify the meaning or interpretation of the element that contains them", - "isSummary": true, - "mapping": [ - { - "identity": "rim", - "map": "N/A" - } - ] - }, - { - "id": "Permission.rule.limit.control", - "path": "Permission.rule.limit.control", - "short": "What coded limits apply to the use of the data", - "definition": "One or more coded restriction such as a refrain or obligation.", - "min": 0, - "max": "*", - "base": { - "path": "Permission.rule.limit.control", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "CodeableConcept" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "PermissionUsageLimits" - } - ], - "strength": "preferred", - "description": "Obligations and Refrains", - "valueSet": "http://terminology.hl7.org/ValueSet/v3-SecurityControlObservationValue" - } - }, - { - "id": "Permission.rule.limit.tag", - "path": "Permission.rule.limit.tag", - "short": "The sensitivity codes that must be removed from the data", - "definition": "When this rule authorized data use, any data that is tagged with the code here must be redacted from the data provided for that authorized use.", - "min": 0, - "max": "*", - "base": { - "path": "Permission.rule.limit.tag", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "Coding" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "PermissionUsageTags" - } - ], - "strength": "preferred", - "description": "Sensitivity tags", - "valueSet": "http://terminology.hl7.org/ValueSet/v3-InformationSensitivityPolicy" - } - }, - { - "id": "Permission.rule.limit.element", - "path": "Permission.rule.limit.element", - "short": "What data elements that must be removed from the data", - "definition": "When this rule authorized data use, the data at the path indicated here, must be redacted from the authorized data provided for that authorized use.", - "comment": "The path identifies the element and is expressed as a `.` separated list of ancestor elements, beginning with the name of the resource or extension.", - "min": 0, - "max": "*", - "base": { - "path": "Permission.rule.limit.element", - "min": 0, - "max": "*" - }, - "type": [ - { - "code": "string" - } - ], - "constraint": [ - { - "key": "ele-1", - "severity": "error", - "human": "All FHIR elements must have a @value or children", - "expression": "hasValue() or (children().count() \u003e id.count())", - "source": "http://hl7.org/fhir/StructureDefinition/Element" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true - } - ] - }, - "differential": { - "element": [ - { - "id": "Permission", - "path": "Permission", - "short": "Access Rules", - "definition": "Permission resource holds access rules for a given data and access request context.", - "min": 0, - "max": "*", - "mustSupport": false, - "isModifier": false, - "mapping": [ - { - "identity": "w5", - "map": "infrastructure.information" - } - ] - }, - { - "id": "Permission.identifier", - "path": "Permission.identifier", - "short": "Business Identifier for permission", - "definition": "A unique identifier assigned to this permission.", - "requirements": "Allows permission to be distinguished and referenced.", - "min": 0, - "max": "*", - "type": [ - { - "code": "Identifier" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "w5", - "map": "FiveWs.identifier" - } - ] - }, - { - "id": "Permission.status", - "path": "Permission.status", - "short": "active | entered-in-error | draft | rejected", - "definition": "Status.", - "min": 1, - "max": "1", - "type": [ - { - "code": "code" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "PermissionStatus" - } - ], - "strength": "required", - "description": "Codes identifying the lifecycle stage of a product.", - "valueSet": "http://hl7.org/fhir/ValueSet/permission-status|6.0.0-ballot3" - }, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.status" - } - ] - }, - { - "id": "Permission.asserter", - "path": "Permission.asserter", - "short": "The person or entity that asserts the permission", - "definition": "The person or entity that asserts the permission.", - "min": 0, - "max": "1", - "type": [ - { - "code": "Reference", - "targetProfile": [ - "http://hl7.org/fhir/StructureDefinition/Practitioner", - "http://hl7.org/fhir/StructureDefinition/PractitionerRole", - "http://hl7.org/fhir/StructureDefinition/Organization", - "http://hl7.org/fhir/StructureDefinition/CareTeam", - "http://hl7.org/fhir/StructureDefinition/Patient", - "http://hl7.org/fhir/StructureDefinition/RelatedPerson", - "http://hl7.org/fhir/StructureDefinition/HealthcareService" - ] - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.grantor, Consent.grantee, Consent.manager, Consent.controller" - } - ] - }, - { - "id": "Permission.date", - "path": "Permission.date", - "short": "The date that permission was asserted", - "definition": "The date that permission was asserted.", - "alias": [ - "class" - ], - "min": 0, - "max": "*", - "type": [ - { - "code": "dateTime" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.dateTime" - } - ] - }, - { - "id": "Permission.validity", - "path": "Permission.validity", - "short": "The period in which the permission is active", - "definition": "The period in which the permission is active.", - "alias": [ - "type" - ], - "min": 0, - "max": "1", - "type": [ - { - "code": "Period" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.period" - } - ] - }, - { - "id": "Permission.justification", - "path": "Permission.justification", - "short": "The asserted justification for using the data", - "definition": "The asserted justification for using the data.", - "min": 0, - "max": "1", - "type": [ - { - "code": "BackboneElement" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true - }, - { - "id": "Permission.justification.basis", - "path": "Permission.justification.basis", - "short": "The regulatory grounds upon which this Permission builds", - "definition": "This would be a codeableconcept, or a coding, which can be constrained to , for example, the 6 grounds for processing in GDPR.", - "min": 0, - "max": "*", - "type": [ - { - "code": "CodeableConcept" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "ConsentRegulatoryBasis" - } - ], - "strength": "example", - "description": "Regulatory policy examples", - "valueSet": "http://hl7.org/fhir/ValueSet/consent-policy" - }, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.regulatoryBasis" - } - ] - }, - { - "id": "Permission.justification.evidence", - "path": "Permission.justification.evidence", - "short": "Justifing rational", - "definition": "Justifing rational.", - "comment": "While any resource may be used, DocumentReference, Consent, PlanDefinition, and Contract would be most frequent", - "min": 0, - "max": "*", - "type": [ - { - "code": "Reference", - "targetProfile": [ - "http://hl7.org/fhir/StructureDefinition/Resource" - ] - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.policyBasis.reference" - } - ] - }, - { - "id": "Permission.combining", - "path": "Permission.combining", - "short": "deny-overrides | permit-overrides | ordered-deny-overrides | ordered-permit-overrides | deny-unless-permit | permit-unless-deny", - "definition": "Defines a procedure for arriving at an access decision given the set of rules.", - "comment": "see [XACML Combining Rules](http://docs.oasis-open.org/xacml/3.0/xacml-3.0-core-spec-cos01-en.html#_Toc325047267)", - "min": 1, - "max": "1", - "type": [ - { - "code": "code" - } - ], - "mustSupport": false, - "isModifier": true, - "isModifierReason": "Defines how the rules are to be combined.", - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "PermissionCombining" - } - ], - "strength": "required", - "description": "How the rules are to be combined.", - "valueSet": "http://hl7.org/fhir/ValueSet/permission-rule-combining|6.0.0-ballot3" - } - }, - { - "id": "Permission.rule", - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-explicit-type-name", - "valueString": "Rule" - } - ], - "path": "Permission.rule", - "short": "Constraints to the Permission", - "definition": "A set of rules.", - "comment": "Each `.rule` is evaluated within the combining rule identified in the `.combining` element.", - "min": 0, - "max": "*", - "type": [ - { - "code": "BackboneElement" - } - ], - "orderMeaning": "The order of the rules processing is defined in rule combining selected in .combining element.", - "constraint": [ - { - "key": "prm-1", - "severity": "error", - "human": "If the import element is populated then the type, data, and activity shall not be populated", - "expression": "import.exists() implies type.exists().not() and data.exists().not() and activity.exists().not()", - "source": "http://hl7.org/fhir/StructureDefinition/Permission" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true - }, - { - "id": "Permission.rule.import", - "path": "Permission.rule.import", - "short": "Reference to a Permission", - "definition": "This rule is expressed in another Permission resource.", - "min": 0, - "max": "1", - "type": [ - { - "code": "Reference", - "targetProfile": [ - "http://hl7.org/fhir/StructureDefinition/Permission" - ] - } - ], - "condition": [ - "prm-1" - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true - }, - { - "id": "Permission.rule.type", - "path": "Permission.rule.type", - "short": "deny | permit", - "definition": "deny | permit.", - "min": 0, - "max": "1", - "type": [ - { - "code": "code" - } - ], - "condition": [ - "prm-1" - ], - "mustSupport": false, - "isModifier": true, - "isModifierReason": "Sets the context for the meaning of the rules.", - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "PermissionProvisionType" - } - ], - "strength": "required", - "description": "How a rule statement is applied.", - "valueSet": "http://hl7.org/fhir/ValueSet/consent-provision-type|6.0.0-ballot3" - }, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.type" - } - ] - }, - { - "id": "Permission.rule.data", - "path": "Permission.rule.data", - "short": "The selection criteria to identify data that is within scope of this provision", - "definition": "A description or definition of which activities are allowed to be done on the data.", - "comment": "Within a `.rule` any repetitions of the `.data` element are in an OR relationship. That is to say that the data identified by the rule is all the data identified by all repetitions of `.data`. Thus to identify one rule that applies to data tagged with `STD` and data that is tagged with `HIV`, one would repeat this at the `.data` level. Within the `.data` element, all elements and all repetitions of elements, are in an AND relationship. Thus to select data that has both `STD` and `HIV` one puts both into one `.rule`. To have different rules for `STD` from `HIV`, one would need to have two `.rule` elements. To have a rule that applies to both, those that have just `STD` and just `HIV`, this repetition may also be done at the data level as described above.", - "min": 0, - "max": "*", - "type": [ - { - "code": "BackboneElement" - } - ], - "condition": [ - "prm-1" - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true - }, - { - "id": "Permission.rule.data.resource", - "path": "Permission.rule.data.resource", - "short": "Explicit FHIR Resource references", - "definition": "Explicit FHIR Resource references.", - "min": 0, - "max": "*", - "type": [ - { - "code": "BackboneElement" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.data" - } - ] - }, - { - "id": "Permission.rule.data.resource.meaning", - "path": "Permission.rule.data.resource.meaning", - "short": "instance | related | dependents | authoredby", - "definition": "How the resource reference is interpreted when testing consent restrictions.", - "min": 1, - "max": "1", - "type": [ - { - "code": "code" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "ConsentDataMeaning" - } - ], - "strength": "required", - "description": "How a resource reference is interpreted when testing consent restrictions.", - "valueSet": "http://hl7.org/fhir/ValueSet/consent-data-meaning|6.0.0-ballot3" - } - }, - { - "id": "Permission.rule.data.resource.reference", - "path": "Permission.rule.data.resource.reference", - "short": "The actual data reference", - "definition": "A reference to a specific resource that defines which resources are covered by this consent.", - "min": 1, - "max": "1", - "type": [ - { - "code": "Reference", - "targetProfile": [ - "http://hl7.org/fhir/StructureDefinition/Resource" - ] - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true - }, - { - "id": "Permission.rule.data.resourceType", - "path": "Permission.rule.data.resourceType", - "short": "e.g. Resource Type, Profile, etc", - "definition": "The resourceType(s) covered by this rule. The type can be a FHIR resource type or a profile on a type that indicates what information the rule applies to.", - "comment": "The intention of the resourceType element is that the codes refer to profiles or document types defined in a standard or an implementation guide somewhere.", - "min": 0, - "max": "*", - "type": [ - { - "code": "Coding" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-isCommonBinding", - "valueBoolean": true - } - ], - "strength": "extensible", - "description": "The resource types a consent provision covers.", - "valueSet": "http://hl7.org/fhir/ValueSet/resource-types" - } - }, - { - "id": "Permission.rule.data.security", - "path": "Permission.rule.data.security", - "short": "Security tag code on .meta.security", - "definition": "The data in scope are those with the given codes present in that data .meta.security element.", - "comment": "Note the ConfidentialityCode vocabulary indicates the highest value, thus a security label of \"R\" then it applies to all resources that are labeled \"R\" or lower. E.g. for Confidentiality, it\u0027s a high water mark. For other kinds of security labels, subsumption logic applies. When the purpose of use tag is on the data, access request purpose of use shall not conflict.", - "min": 0, - "max": "*", - "type": [ - { - "code": "Coding" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.securityLabel" - } - ] - }, - { - "id": "Permission.rule.data.period", - "path": "Permission.rule.data.period", - "short": "Timeframe encompasing data create/update", - "definition": "Clinical or Operational Relevant period of time that bounds the data controlled by this rule.", - "comment": "This has a different sense to the .validity.", - "min": 0, - "max": "1", - "type": [ - { - "code": "Period" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.dataPeriod" - } - ] - }, - { - "id": "Permission.rule.data.expression", - "path": "Permission.rule.data.expression", - "short": "Expression identifying the data", - "definition": "Used when other data selection elements are insufficient.", - "min": 0, - "max": "1", - "type": [ - { - "code": "Expression" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.class, Consent.provision.code, Consent.provision.expression" - } - ] - }, - { - "id": "Permission.rule.activity", - "path": "Permission.rule.activity", - "short": "A description or definition of which activities are allowed to be done on the data", - "definition": "A description or definition of which activities are allowed to be done on the data.", - "comment": "Within a `.rule` any repetitions of the `.activity` element are in an OR relationship. That is to say that the rule applies to all the repetitions of `.activity`. Thus to identify one rule that applies to both `TREAT` and `HOPERAT`, one would have one rule with repetitions at the .activity level. Within the `.activity` element, all elements and all repetitions of elements, are in an AND relationship. Thus to control an actity that is covering purpose of both `TREAT` and `HOPERAT`, one rule with an `.activity` `.purpose` holding both `TREAT` and `HOPERAT` can define that rule. However this will not cover activities covering only `TREAT`, for that repeat at the `.activity` with just a `.purpose` of `TREAT`.", - "min": 0, - "max": "*", - "type": [ - { - "code": "BackboneElement" - } - ], - "condition": [ - "prm-1" - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true - }, - { - "id": "Permission.rule.activity.actor", - "path": "Permission.rule.activity.actor", - "short": "Who|what is controlled by this rule", - "definition": "Who or what is controlled by this rule. Use group to identify a set of actors by some property they share (e.g. \u0027admitting officers\u0027).", - "comment": "When both reference and role are given the actor is only selected when that reference actor is functionally carrying out that role.", - "min": 0, - "max": "*", - "type": [ - { - "code": "BackboneElement" - } - ], - "meaningWhenMissing": "There is no specific actor associated with the rule", - "mustSupport": false, - "isModifier": false, - "isSummary": false, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.actor" - } - ] - }, - { - "id": "Permission.rule.activity.actor.role", - "path": "Permission.rule.activity.actor.role", - "short": "How the actor is involved", - "definition": "How the individual is involved in the activity that is described in the rule.", - "min": 0, - "max": "1", - "type": [ - { - "code": "CodeableConcept" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": false, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "ActorRole" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-isCommonBinding", - "valueBoolean": true - } - ], - "strength": "extensible", - "description": "How an actor is involved in the rule.", - "valueSet": "http://hl7.org/fhir/ValueSet/participation-role-type" - }, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.actor.role" - } - ] - }, - { - "id": "Permission.rule.activity.actor.reference", - "path": "Permission.rule.activity.actor.reference", - "short": "Authorized actor(s)", - "definition": "The actor(s) authorized for the defined activity.", - "min": 0, - "max": "1", - "type": [ - { - "code": "Reference", - "targetProfile": [ - "http://hl7.org/fhir/StructureDefinition/Device", - "http://hl7.org/fhir/StructureDefinition/Group", - "http://hl7.org/fhir/StructureDefinition/CareTeam", - "http://hl7.org/fhir/StructureDefinition/Organization", - "http://hl7.org/fhir/StructureDefinition/Patient", - "http://hl7.org/fhir/StructureDefinition/Practitioner", - "http://hl7.org/fhir/StructureDefinition/RelatedPerson", - "http://hl7.org/fhir/StructureDefinition/PractitionerRole", - "http://hl7.org/fhir/StructureDefinition/DeviceDefinition", - "http://hl7.org/fhir/StructureDefinition/HealthcareService" - ] - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.actor.reference" - } - ] - }, - { - "id": "Permission.rule.activity.action", - "path": "Permission.rule.activity.action", - "short": "Actions controlled by this rule", - "definition": "Actions controlled by this Rule.", - "comment": "Note that this is the direct action (not the grounds for the action covered in the purpose element). At present, the only action in the understood and tested scope of this resource is \u0027read\u0027.", - "min": 0, - "max": "*", - "type": [ - { - "code": "CodeableConcept" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "ProcessingActivityAction" - } - ], - "strength": "preferred", - "description": "Detailed codes for the action.", - "valueSet": "http://hl7.org/fhir/ValueSet/type-restful-interaction" - }, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.action" - } - ] - }, - { - "id": "Permission.rule.activity.purpose", - "path": "Permission.rule.activity.purpose", - "short": "The purpose for which the permission is given", - "definition": "The purpose for which the permission is given.", - "min": 0, - "max": "*", - "type": [ - { - "code": "CodeableConcept" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "PurposeOfUse" - } - ], - "strength": "preferred", - "description": "What purposes of use are controlled by this exception. If more than one label is specified, operations must have all the specified labels.", - "valueSet": "http://terminology.hl7.org/ValueSet/v3-PurposeOfUse" - }, - "mapping": [ - { - "identity": "fhirconsent", - "map": "Consent.provision.purpose" - } - ] - }, - { - "id": "Permission.rule.limit", - "path": "Permission.rule.limit", - "short": "What limits apply to the use of the data", - "definition": "What restrictions must be applied to the use of the data by the actor.", - "comment": "Within a `.rule` all repetitions of the `.limit` all apply to the rule. That is to say if there are multiple limits, and the rule permits the activity, then all the identified limits are applied to that authorized activity.", - "min": 0, - "max": "*", - "type": [ - { - "code": "BackboneElement" - } - ], - "meaningWhenMissing": "There is no limit beyond those specified in the authorized activity to the authorized data.", - "mustSupport": false, - "isModifier": false, - "isSummary": false - }, - { - "id": "Permission.rule.limit.control", - "path": "Permission.rule.limit.control", - "short": "What coded limits apply to the use of the data", - "definition": "One or more coded restriction such as a refrain or obligation.", - "min": 0, - "max": "*", - "type": [ - { - "code": "CodeableConcept" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "PermissionUsageLimits" - } - ], - "strength": "preferred", - "description": "Obligations and Refrains", - "valueSet": "http://terminology.hl7.org/ValueSet/v3-SecurityControlObservationValue" - } - }, - { - "id": "Permission.rule.limit.tag", - "path": "Permission.rule.limit.tag", - "short": "The sensitivity codes that must be removed from the data", - "definition": "When this rule authorized data use, any data that is tagged with the code here must be redacted from the data provided for that authorized use.", - "min": 0, - "max": "*", - "type": [ - { - "code": "Coding" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true, - "binding": { - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName", - "valueString": "PermissionUsageTags" - } - ], - "strength": "preferred", - "description": "Sensitivity tags", - "valueSet": "http://terminology.hl7.org/ValueSet/v3-InformationSensitivityPolicy" - } - }, - { - "id": "Permission.rule.limit.element", - "path": "Permission.rule.limit.element", - "short": "What data elements that must be removed from the data", - "definition": "When this rule authorized data use, the data at the path indicated here, must be redacted from the authorized data provided for that authorized use.", - "comment": "The path identifies the element and is expressed as a `.` separated list of ancestor elements, beginning with the name of the resource or extension.", - "min": 0, - "max": "*", - "type": [ - { - "code": "string" - } - ], - "mustSupport": false, - "isModifier": false, - "isSummary": true - } - ] - } -} \ No newline at end of file diff --git a/crates/fhir/tests/data/R6/sc-valueset-permission-status.json b/crates/fhir/tests/data/R6/sc-valueset-permission-status.json deleted file mode 100644 index b1eefc861..000000000 --- a/crates/fhir/tests/data/R6/sc-valueset-permission-status.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "resourceType": "ConceptMap", - "id": "sc-permission-status", - "text": { - "status": "generated", - "div": "\u003cdiv xmlns\u003d\"http://www.w3.org/1999/xhtml\"\u003e\u003cp class\u003d\"res-header-id\"\u003e\u003cb\u003eGenerated Narrative: ConceptMap sc-permission-status\u003c/b\u003e\u003c/p\u003e\u003ca name\u003d\"sc-permission-status\"\u003e \u003c/a\u003e\u003ca name\u003d\"hcsc-permission-status\"\u003e \u003c/a\u003e\u003cp\u003eMapping from \u003ca href\u003d\"valueset-permission-status.html\"\u003ePermission Status\u003c/a\u003e to \u003ca href\u003d\"valueset-resource-status.html\"\u003eCanonical Status Codes for FHIR Resources\u003c/a\u003e\u003c/p\u003e\u003cbr/\u003e\u003cp\u003e\u003cb\u003eGroup 1 \u003c/b\u003eMapping from \u003ca href\u003d\"codesystem-permission-status.html\"\u003ePermission Status\u003c/a\u003e to \u003ca href\u003d\"codesystem-resource-status.html\"\u003eCanonical Status Codes for FHIR Resources\u003c/a\u003e\u003c/p\u003e\u003ctable class\u003d\"grid\"\u003e\u003ctr\u003e\u003ctd\u003e\u003cb\u003eSource Code\u003c/b\u003e\u003c/td\u003e\u003ctd\u003e\u003cb\u003eRelationship\u003c/b\u003e\u003c/td\u003e\u003ctd\u003e\u003cb\u003eTarget Code\u003c/b\u003e\u003c/td\u003e\u003c/tr\u003e\u003ctr\u003e\u003ctd\u003eentered-in-error\u003c/td\u003e\u003ctd\u003e\u003ca href\u003d\"codesystem-concept-map-relationship.html#equivalent\" title\u003d\"equivalent\"\u003eis equivalent to\u003c/a\u003e\u003c/td\u003e\u003ctd\u003eerror\u003c/td\u003e\u003c/tr\u003e\u003ctr\u003e\u003ctd\u003edraft\u003c/td\u003e\u003ctd\u003e\u003ca href\u003d\"codesystem-concept-map-relationship.html#equivalent\" title\u003d\"equivalent\"\u003eis equivalent to\u003c/a\u003e\u003c/td\u003e\u003ctd\u003edraft\u003c/td\u003e\u003c/tr\u003e\u003ctr\u003e\u003ctd\u003erejected\u003c/td\u003e\u003ctd\u003e\u003ca href\u003d\"codesystem-concept-map-relationship.html#equivalent\" title\u003d\"equivalent\"\u003eis equivalent to\u003c/a\u003e\u003c/td\u003e\u003ctd\u003edeclined\u003c/td\u003e\u003c/tr\u003e\u003ctr\u003e\u003ctd\u003eactive\u003c/td\u003e\u003ctd\u003e\u003ca href\u003d\"codesystem-concept-map-relationship.html#equivalent\" title\u003d\"equivalent\"\u003eis equivalent to\u003c/a\u003e\u003c/td\u003e\u003ctd\u003eactive\u003c/td\u003e\u003c/tr\u003e\u003c/table\u003e\u003c/div\u003e" - }, - "url": "http://hl7.org/fhir/ConceptMap/sc-permission-status", - "version": "6.0.0-ballot3", - "name": "PermissionStatusCanonicalMap", - "title": "Canonical Mapping for \"Permission Status\"", - "status": "draft", - "experimental": false, - "date": "2020-12-28T05:55:11+00:00", - "publisher": "HL7 (FHIR Project)", - "contact": [ - { - "telecom": [ - { - "system": "url", - "value": "http://hl7.org/fhir" - }, - { - "system": "email", - "value": "fhir@lists.hl7.org" - } - ] - } - ], - "description": "Canonical Mapping for \"Codes identifying the lifecycle stage of a product.\"", - "jurisdiction": [ - { - "coding": [ - { - "system": "http://unstats.un.org/unsd/methods/m49/m49.htm", - "code": "001", - "display": "World" - } - ] - } - ], - "sourceScopeCanonical": "http://hl7.org/fhir/ValueSet/permission-status", - "targetScopeCanonical": "http://hl7.org/fhir/ValueSet/resource-status", - "group": [ - { - "source": "http://hl7.org/fhir/permission-status", - "target": "http://hl7.org/fhir/resource-status", - "element": [ - { - "code": "entered-in-error", - "target": [ - { - "code": "error", - "relationship": "equivalent" - } - ] - }, - { - "code": "draft", - "target": [ - { - "code": "draft", - "relationship": "equivalent" - } - ] - }, - { - "code": "rejected", - "target": [ - { - "code": "declined", - "relationship": "equivalent" - } - ] - }, - { - "code": "active", - "target": [ - { - "code": "active", - "relationship": "equivalent" - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/crates/fhir/tests/data/R6/valueset-permission-rule-combining.json b/crates/fhir/tests/data/R6/valueset-permission-rule-combining.json deleted file mode 100644 index 78dcb4648..000000000 --- a/crates/fhir/tests/data/R6/valueset-permission-rule-combining.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "resourceType": "ValueSet", - "id": "permission-rule-combining", - "meta": { - "lastUpdated": "2025-11-17T19:23:40.261+00:00" - }, - "text": { - "status": "generated", - "div": "\u003cdiv xmlns\u003d\"http://www.w3.org/1999/xhtml\"\u003e\u003cp class\u003d\"res-header-id\"\u003e\u003cb\u003eGenerated Narrative: ValueSet permission-rule-combining\u003c/b\u003e\u003c/p\u003e\u003ca name\u003d\"permission-rule-combining\"\u003e \u003c/a\u003e\u003ca name\u003d\"hcpermission-rule-combining\"\u003e \u003c/a\u003e\u003cul\u003e\u003cli\u003eInclude all codes defined in \u003ca href\u003d\"codesystem-permission-rule-combining.html\"\u003e\u003ccode\u003ehttp://hl7.org/fhir/permission-rule-combining\u003c/code\u003e\u003c/a\u003e\u003cspan title\u003d\"Version is not explicitly stated, which means it is fixed to the version provided in this specification\"\u003e version \u0026#x1F4E6;6.0.0-ballot3\u003c/span\u003e\u003c/li\u003e\u003c/ul\u003e\u003c/div\u003e" - }, - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg", - "valueCode": "sec" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status", - "valueCode": "normative" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm", - "valueInteger": 1 - } - ], - "url": "http://hl7.org/fhir/ValueSet/permission-rule-combining", - "identifier": [ - { - "system": "urn:ietf:rfc:3986", - "value": "urn:oid:2.16.840.1.113883.4.642.3.3231" - } - ], - "version": "6.0.0-ballot3", - "name": "PermissionRuleCombining", - "title": "Permission Rule Combining", - "status": "active", - "experimental": false, - "date": "2022-08-05T16:55:11+11:00", - "publisher": "HL7 (FHIR Project)", - "contact": [ - { - "telecom": [ - { - "system": "url", - "value": "http://hl7.org/fhir" - }, - { - "system": "email", - "value": "fhir@lists.hl7.org" - } - ] - } - ], - "description": "Codes identifying rule combining algorithm.", - "jurisdiction": [ - { - "coding": [ - { - "system": "http://unstats.un.org/unsd/methods/m49/m49.htm", - "code": "001", - "display": "World" - } - ] - } - ], - "immutable": true, - "compose": { - "include": [ - { - "system": "http://hl7.org/fhir/permission-rule-combining" - } - ] - } -} \ No newline at end of file diff --git a/crates/fhir/tests/data/R6/valueset-permission-status.json b/crates/fhir/tests/data/R6/valueset-permission-status.json deleted file mode 100644 index 07ba8fcaa..000000000 --- a/crates/fhir/tests/data/R6/valueset-permission-status.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "resourceType": "ValueSet", - "id": "permission-status", - "meta": { - "lastUpdated": "2025-11-17T19:23:40.261+00:00" - }, - "text": { - "status": "generated", - "div": "\u003cdiv xmlns\u003d\"http://www.w3.org/1999/xhtml\"\u003e\u003cp class\u003d\"res-header-id\"\u003e\u003cb\u003eGenerated Narrative: ValueSet permission-status\u003c/b\u003e\u003c/p\u003e\u003ca name\u003d\"permission-status\"\u003e \u003c/a\u003e\u003ca name\u003d\"hcpermission-status\"\u003e \u003c/a\u003e\u003cul\u003e\u003cli\u003eInclude all codes defined in \u003ca href\u003d\"codesystem-permission-status.html\"\u003e\u003ccode\u003ehttp://hl7.org/fhir/permission-status\u003c/code\u003e\u003c/a\u003e\u003cspan title\u003d\"Version is not explicitly stated, which means it is fixed to the version provided in this specification\"\u003e version \u0026#x1F4E6;6.0.0-ballot3\u003c/span\u003e\u003c/li\u003e\u003c/ul\u003e\u003c/div\u003e" - }, - "extension": [ - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-wg", - "valueCode": "sec" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status", - "valueCode": "normative" - }, - { - "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm", - "valueInteger": 1 - } - ], - "url": "http://hl7.org/fhir/ValueSet/permission-status", - "identifier": [ - { - "system": "urn:ietf:rfc:3986", - "value": "urn:oid:2.16.840.1.113883.4.642.3.3232" - } - ], - "version": "6.0.0-ballot3", - "name": "PermissionStatus", - "title": "Permission Status", - "status": "active", - "experimental": false, - "date": "2020-12-28T16:55:11+11:00", - "publisher": "HL7 (FHIR Project)", - "contact": [ - { - "telecom": [ - { - "system": "url", - "value": "http://hl7.org/fhir" - }, - { - "system": "email", - "value": "fhir@lists.hl7.org" - } - ] - } - ], - "description": "Codes identifying the lifecycle stage of a product.", - "jurisdiction": [ - { - "coding": [ - { - "system": "http://unstats.un.org/unsd/methods/m49/m49.htm", - "code": "001", - "display": "World" - } - ] - } - ], - "immutable": true, - "compose": { - "include": [ - { - "system": "http://hl7.org/fhir/permission-status" - } - ] - } -} \ No newline at end of file diff --git a/crates/fhir/tests/data/R4/account-example-with-guarantor.json b/crates/fhir/tests/data/json/R4/account-example-with-guarantor.json similarity index 100% rename from crates/fhir/tests/data/R4/account-example-with-guarantor.json rename to crates/fhir/tests/data/json/R4/account-example-with-guarantor.json diff --git a/crates/fhir/tests/data/R4/account-example.json b/crates/fhir/tests/data/json/R4/account-example.json similarity index 100% rename from crates/fhir/tests/data/R4/account-example.json rename to crates/fhir/tests/data/json/R4/account-example.json diff --git a/crates/fhir/tests/data/R4/account-questionnaire.json b/crates/fhir/tests/data/json/R4/account-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/account-questionnaire.json rename to crates/fhir/tests/data/json/R4/account-questionnaire.json diff --git a/crates/fhir/tests/data/R4/account.profile.json b/crates/fhir/tests/data/json/R4/account.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/account.profile.json rename to crates/fhir/tests/data/json/R4/account.profile.json diff --git a/crates/fhir/tests/data/R4/activitydefinition-administer-zika-virus-exposure-assessment.json b/crates/fhir/tests/data/json/R4/activitydefinition-administer-zika-virus-exposure-assessment.json similarity index 100% rename from crates/fhir/tests/data/R4/activitydefinition-administer-zika-virus-exposure-assessment.json rename to crates/fhir/tests/data/json/R4/activitydefinition-administer-zika-virus-exposure-assessment.json diff --git a/crates/fhir/tests/data/R4/activitydefinition-example.json b/crates/fhir/tests/data/json/R4/activitydefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4/activitydefinition-example.json rename to crates/fhir/tests/data/json/R4/activitydefinition-example.json diff --git a/crates/fhir/tests/data/R4/activitydefinition-medicationorder-example.json b/crates/fhir/tests/data/json/R4/activitydefinition-medicationorder-example.json similarity index 100% rename from crates/fhir/tests/data/R4/activitydefinition-medicationorder-example.json rename to crates/fhir/tests/data/json/R4/activitydefinition-medicationorder-example.json diff --git a/crates/fhir/tests/data/R4/activitydefinition-order-serum-dengue-virus-igm.json b/crates/fhir/tests/data/json/R4/activitydefinition-order-serum-dengue-virus-igm.json similarity index 100% rename from crates/fhir/tests/data/R4/activitydefinition-order-serum-dengue-virus-igm.json rename to crates/fhir/tests/data/json/R4/activitydefinition-order-serum-dengue-virus-igm.json diff --git a/crates/fhir/tests/data/R4/activitydefinition-order-serum-zika-dengue-virus-igm.json b/crates/fhir/tests/data/json/R4/activitydefinition-order-serum-zika-dengue-virus-igm.json similarity index 100% rename from crates/fhir/tests/data/R4/activitydefinition-order-serum-zika-dengue-virus-igm.json rename to crates/fhir/tests/data/json/R4/activitydefinition-order-serum-zika-dengue-virus-igm.json diff --git a/crates/fhir/tests/data/R4/activitydefinition-predecessor-example.json b/crates/fhir/tests/data/json/R4/activitydefinition-predecessor-example.json similarity index 100% rename from crates/fhir/tests/data/R4/activitydefinition-predecessor-example.json rename to crates/fhir/tests/data/json/R4/activitydefinition-predecessor-example.json diff --git a/crates/fhir/tests/data/R4/activitydefinition-provide-mosquito-prevention-advice.json b/crates/fhir/tests/data/json/R4/activitydefinition-provide-mosquito-prevention-advice.json similarity index 100% rename from crates/fhir/tests/data/R4/activitydefinition-provide-mosquito-prevention-advice.json rename to crates/fhir/tests/data/json/R4/activitydefinition-provide-mosquito-prevention-advice.json diff --git a/crates/fhir/tests/data/R4/activitydefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/activitydefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/activitydefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/activitydefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/activitydefinition-servicerequest-example.json b/crates/fhir/tests/data/json/R4/activitydefinition-servicerequest-example.json similarity index 100% rename from crates/fhir/tests/data/R4/activitydefinition-servicerequest-example.json rename to crates/fhir/tests/data/json/R4/activitydefinition-servicerequest-example.json diff --git a/crates/fhir/tests/data/R4/activitydefinition-supplyrequest-example.json b/crates/fhir/tests/data/json/R4/activitydefinition-supplyrequest-example.json similarity index 100% rename from crates/fhir/tests/data/R4/activitydefinition-supplyrequest-example.json rename to crates/fhir/tests/data/json/R4/activitydefinition-supplyrequest-example.json diff --git a/crates/fhir/tests/data/R4/activitydefinition.profile.json b/crates/fhir/tests/data/json/R4/activitydefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/activitydefinition.profile.json rename to crates/fhir/tests/data/json/R4/activitydefinition.profile.json diff --git a/crates/fhir/tests/data/R4/actualgroup-questionnaire.json b/crates/fhir/tests/data/json/R4/actualgroup-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/actualgroup-questionnaire.json rename to crates/fhir/tests/data/json/R4/actualgroup-questionnaire.json diff --git a/crates/fhir/tests/data/R4/actualgroup.profile.json b/crates/fhir/tests/data/json/R4/actualgroup.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/actualgroup.profile.json rename to crates/fhir/tests/data/json/R4/actualgroup.profile.json diff --git a/crates/fhir/tests/data/R4/address.profile.json b/crates/fhir/tests/data/json/R4/address.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/address.profile.json rename to crates/fhir/tests/data/json/R4/address.profile.json diff --git a/crates/fhir/tests/data/R4/adverseevent-example.json b/crates/fhir/tests/data/json/R4/adverseevent-example.json similarity index 100% rename from crates/fhir/tests/data/R4/adverseevent-example.json rename to crates/fhir/tests/data/json/R4/adverseevent-example.json diff --git a/crates/fhir/tests/data/R4/adverseevent-questionnaire.json b/crates/fhir/tests/data/json/R4/adverseevent-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/adverseevent-questionnaire.json rename to crates/fhir/tests/data/json/R4/adverseevent-questionnaire.json diff --git a/crates/fhir/tests/data/R4/adverseevent.profile.json b/crates/fhir/tests/data/json/R4/adverseevent.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/adverseevent.profile.json rename to crates/fhir/tests/data/json/R4/adverseevent.profile.json diff --git a/crates/fhir/tests/data/R4/age.profile.json b/crates/fhir/tests/data/json/R4/age.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/age.profile.json rename to crates/fhir/tests/data/json/R4/age.profile.json diff --git a/crates/fhir/tests/data/R4/allergyintolerance-example.json b/crates/fhir/tests/data/json/R4/allergyintolerance-example.json similarity index 100% rename from crates/fhir/tests/data/R4/allergyintolerance-example.json rename to crates/fhir/tests/data/json/R4/allergyintolerance-example.json diff --git a/crates/fhir/tests/data/R4/allergyintolerance-fishallergy.json b/crates/fhir/tests/data/json/R4/allergyintolerance-fishallergy.json similarity index 100% rename from crates/fhir/tests/data/R4/allergyintolerance-fishallergy.json rename to crates/fhir/tests/data/json/R4/allergyintolerance-fishallergy.json diff --git a/crates/fhir/tests/data/R4/allergyintolerance-medication.json b/crates/fhir/tests/data/json/R4/allergyintolerance-medication.json similarity index 100% rename from crates/fhir/tests/data/R4/allergyintolerance-medication.json rename to crates/fhir/tests/data/json/R4/allergyintolerance-medication.json diff --git a/crates/fhir/tests/data/R4/allergyintolerance-nka.json b/crates/fhir/tests/data/json/R4/allergyintolerance-nka.json similarity index 100% rename from crates/fhir/tests/data/R4/allergyintolerance-nka.json rename to crates/fhir/tests/data/json/R4/allergyintolerance-nka.json diff --git a/crates/fhir/tests/data/R4/allergyintolerance-nkda.json b/crates/fhir/tests/data/json/R4/allergyintolerance-nkda.json similarity index 100% rename from crates/fhir/tests/data/R4/allergyintolerance-nkda.json rename to crates/fhir/tests/data/json/R4/allergyintolerance-nkda.json diff --git a/crates/fhir/tests/data/R4/allergyintolerance-nkla.json b/crates/fhir/tests/data/json/R4/allergyintolerance-nkla.json similarity index 100% rename from crates/fhir/tests/data/R4/allergyintolerance-nkla.json rename to crates/fhir/tests/data/json/R4/allergyintolerance-nkla.json diff --git a/crates/fhir/tests/data/R4/allergyintolerance-questionnaire.json b/crates/fhir/tests/data/json/R4/allergyintolerance-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/allergyintolerance-questionnaire.json rename to crates/fhir/tests/data/json/R4/allergyintolerance-questionnaire.json diff --git a/crates/fhir/tests/data/R4/allergyintolerance.profile.json b/crates/fhir/tests/data/json/R4/allergyintolerance.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/allergyintolerance.profile.json rename to crates/fhir/tests/data/json/R4/allergyintolerance.profile.json diff --git a/crates/fhir/tests/data/R4/annotation.profile.json b/crates/fhir/tests/data/json/R4/annotation.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/annotation.profile.json rename to crates/fhir/tests/data/json/R4/annotation.profile.json diff --git a/crates/fhir/tests/data/R4/appointment-example-request.json b/crates/fhir/tests/data/json/R4/appointment-example-request.json similarity index 100% rename from crates/fhir/tests/data/R4/appointment-example-request.json rename to crates/fhir/tests/data/json/R4/appointment-example-request.json diff --git a/crates/fhir/tests/data/R4/appointment-example.json b/crates/fhir/tests/data/json/R4/appointment-example.json similarity index 100% rename from crates/fhir/tests/data/R4/appointment-example.json rename to crates/fhir/tests/data/json/R4/appointment-example.json diff --git a/crates/fhir/tests/data/R4/appointment-example2doctors.json b/crates/fhir/tests/data/json/R4/appointment-example2doctors.json similarity index 100% rename from crates/fhir/tests/data/R4/appointment-example2doctors.json rename to crates/fhir/tests/data/json/R4/appointment-example2doctors.json diff --git a/crates/fhir/tests/data/R4/appointment-questionnaire.json b/crates/fhir/tests/data/json/R4/appointment-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/appointment-questionnaire.json rename to crates/fhir/tests/data/json/R4/appointment-questionnaire.json diff --git a/crates/fhir/tests/data/R4/appointment.profile.json b/crates/fhir/tests/data/json/R4/appointment.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/appointment.profile.json rename to crates/fhir/tests/data/json/R4/appointment.profile.json diff --git a/crates/fhir/tests/data/R4/appointmentresponse-example-req.json b/crates/fhir/tests/data/json/R4/appointmentresponse-example-req.json similarity index 100% rename from crates/fhir/tests/data/R4/appointmentresponse-example-req.json rename to crates/fhir/tests/data/json/R4/appointmentresponse-example-req.json diff --git a/crates/fhir/tests/data/R4/appointmentresponse-example.json b/crates/fhir/tests/data/json/R4/appointmentresponse-example.json similarity index 100% rename from crates/fhir/tests/data/R4/appointmentresponse-example.json rename to crates/fhir/tests/data/json/R4/appointmentresponse-example.json diff --git a/crates/fhir/tests/data/R4/appointmentresponse-questionnaire.json b/crates/fhir/tests/data/json/R4/appointmentresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/appointmentresponse-questionnaire.json rename to crates/fhir/tests/data/json/R4/appointmentresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R4/appointmentresponse.profile.json b/crates/fhir/tests/data/json/R4/appointmentresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/appointmentresponse.profile.json rename to crates/fhir/tests/data/json/R4/appointmentresponse.profile.json diff --git a/crates/fhir/tests/data/R4/attachment.profile.json b/crates/fhir/tests/data/json/R4/attachment.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/attachment.profile.json rename to crates/fhir/tests/data/json/R4/attachment.profile.json diff --git a/crates/fhir/tests/data/R4/audit-event-example-login.json b/crates/fhir/tests/data/json/R4/audit-event-example-login.json similarity index 100% rename from crates/fhir/tests/data/R4/audit-event-example-login.json rename to crates/fhir/tests/data/json/R4/audit-event-example-login.json diff --git a/crates/fhir/tests/data/R4/audit-event-example-logout.json b/crates/fhir/tests/data/json/R4/audit-event-example-logout.json similarity index 100% rename from crates/fhir/tests/data/R4/audit-event-example-logout.json rename to crates/fhir/tests/data/json/R4/audit-event-example-logout.json diff --git a/crates/fhir/tests/data/R4/audit-event-example-media.json b/crates/fhir/tests/data/json/R4/audit-event-example-media.json similarity index 100% rename from crates/fhir/tests/data/R4/audit-event-example-media.json rename to crates/fhir/tests/data/json/R4/audit-event-example-media.json diff --git a/crates/fhir/tests/data/R4/audit-event-example-pixQuery.json b/crates/fhir/tests/data/json/R4/audit-event-example-pixQuery.json similarity index 100% rename from crates/fhir/tests/data/R4/audit-event-example-pixQuery.json rename to crates/fhir/tests/data/json/R4/audit-event-example-pixQuery.json diff --git a/crates/fhir/tests/data/R4/audit-event-example-search.json b/crates/fhir/tests/data/json/R4/audit-event-example-search.json similarity index 100% rename from crates/fhir/tests/data/R4/audit-event-example-search.json rename to crates/fhir/tests/data/json/R4/audit-event-example-search.json diff --git a/crates/fhir/tests/data/R4/audit-event-example-vread.json b/crates/fhir/tests/data/json/R4/audit-event-example-vread.json similarity index 100% rename from crates/fhir/tests/data/R4/audit-event-example-vread.json rename to crates/fhir/tests/data/json/R4/audit-event-example-vread.json diff --git a/crates/fhir/tests/data/R4/auditevent-example-disclosure.json b/crates/fhir/tests/data/json/R4/auditevent-example-disclosure.json similarity index 100% rename from crates/fhir/tests/data/R4/auditevent-example-disclosure.json rename to crates/fhir/tests/data/json/R4/auditevent-example-disclosure.json diff --git a/crates/fhir/tests/data/R4/auditevent-example-error.json b/crates/fhir/tests/data/json/R4/auditevent-example-error.json similarity index 100% rename from crates/fhir/tests/data/R4/auditevent-example-error.json rename to crates/fhir/tests/data/json/R4/auditevent-example-error.json diff --git a/crates/fhir/tests/data/R4/auditevent-example.json b/crates/fhir/tests/data/json/R4/auditevent-example.json similarity index 100% rename from crates/fhir/tests/data/R4/auditevent-example.json rename to crates/fhir/tests/data/json/R4/auditevent-example.json diff --git a/crates/fhir/tests/data/R4/auditevent-questionnaire.json b/crates/fhir/tests/data/json/R4/auditevent-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/auditevent-questionnaire.json rename to crates/fhir/tests/data/json/R4/auditevent-questionnaire.json diff --git a/crates/fhir/tests/data/R4/auditevent.profile.json b/crates/fhir/tests/data/json/R4/auditevent.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/auditevent.profile.json rename to crates/fhir/tests/data/json/R4/auditevent.profile.json diff --git a/crates/fhir/tests/data/R4/backboneelement.profile.json b/crates/fhir/tests/data/json/R4/backboneelement.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/backboneelement.profile.json rename to crates/fhir/tests/data/json/R4/backboneelement.profile.json diff --git a/crates/fhir/tests/data/R4/base64binary.profile.json b/crates/fhir/tests/data/json/R4/base64binary.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/base64binary.profile.json rename to crates/fhir/tests/data/json/R4/base64binary.profile.json diff --git a/crates/fhir/tests/data/R4/basic-example-narrative.json b/crates/fhir/tests/data/json/R4/basic-example-narrative.json similarity index 100% rename from crates/fhir/tests/data/R4/basic-example-narrative.json rename to crates/fhir/tests/data/json/R4/basic-example-narrative.json diff --git a/crates/fhir/tests/data/R4/basic-example.json b/crates/fhir/tests/data/json/R4/basic-example.json similarity index 100% rename from crates/fhir/tests/data/R4/basic-example.json rename to crates/fhir/tests/data/json/R4/basic-example.json diff --git a/crates/fhir/tests/data/R4/basic-example2.json b/crates/fhir/tests/data/json/R4/basic-example2.json similarity index 100% rename from crates/fhir/tests/data/R4/basic-example2.json rename to crates/fhir/tests/data/json/R4/basic-example2.json diff --git a/crates/fhir/tests/data/R4/basic-questionnaire.json b/crates/fhir/tests/data/json/R4/basic-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/basic-questionnaire.json rename to crates/fhir/tests/data/json/R4/basic-questionnaire.json diff --git a/crates/fhir/tests/data/R4/basic.profile.json b/crates/fhir/tests/data/json/R4/basic.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/basic.profile.json rename to crates/fhir/tests/data/json/R4/basic.profile.json diff --git a/crates/fhir/tests/data/R4/binary-example.json b/crates/fhir/tests/data/json/R4/binary-example.json similarity index 100% rename from crates/fhir/tests/data/R4/binary-example.json rename to crates/fhir/tests/data/json/R4/binary-example.json diff --git a/crates/fhir/tests/data/R4/binary-f006.json b/crates/fhir/tests/data/json/R4/binary-f006.json similarity index 100% rename from crates/fhir/tests/data/R4/binary-f006.json rename to crates/fhir/tests/data/json/R4/binary-f006.json diff --git a/crates/fhir/tests/data/R4/binary-questionnaire.json b/crates/fhir/tests/data/json/R4/binary-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/binary-questionnaire.json rename to crates/fhir/tests/data/json/R4/binary-questionnaire.json diff --git a/crates/fhir/tests/data/R4/binary.profile.json b/crates/fhir/tests/data/json/R4/binary.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/binary.profile.json rename to crates/fhir/tests/data/json/R4/binary.profile.json diff --git a/crates/fhir/tests/data/R4/biologicallyderivedproduct-example.json b/crates/fhir/tests/data/json/R4/biologicallyderivedproduct-example.json similarity index 100% rename from crates/fhir/tests/data/R4/biologicallyderivedproduct-example.json rename to crates/fhir/tests/data/json/R4/biologicallyderivedproduct-example.json diff --git a/crates/fhir/tests/data/R4/biologicallyderivedproduct-questionnaire.json b/crates/fhir/tests/data/json/R4/biologicallyderivedproduct-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/biologicallyderivedproduct-questionnaire.json rename to crates/fhir/tests/data/json/R4/biologicallyderivedproduct-questionnaire.json diff --git a/crates/fhir/tests/data/R4/biologicallyderivedproduct.profile.json b/crates/fhir/tests/data/json/R4/biologicallyderivedproduct.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/biologicallyderivedproduct.profile.json rename to crates/fhir/tests/data/json/R4/biologicallyderivedproduct.profile.json diff --git a/crates/fhir/tests/data/R4/bmi-questionnaire.json b/crates/fhir/tests/data/json/R4/bmi-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/bmi-questionnaire.json rename to crates/fhir/tests/data/json/R4/bmi-questionnaire.json diff --git a/crates/fhir/tests/data/R4/bmi.profile.json b/crates/fhir/tests/data/json/R4/bmi.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/bmi.profile.json rename to crates/fhir/tests/data/json/R4/bmi.profile.json diff --git a/crates/fhir/tests/data/R4/bodyheight-questionnaire.json b/crates/fhir/tests/data/json/R4/bodyheight-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/bodyheight-questionnaire.json rename to crates/fhir/tests/data/json/R4/bodyheight-questionnaire.json diff --git a/crates/fhir/tests/data/R4/bodyheight.profile.json b/crates/fhir/tests/data/json/R4/bodyheight.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/bodyheight.profile.json rename to crates/fhir/tests/data/json/R4/bodyheight.profile.json diff --git a/crates/fhir/tests/data/R4/bodystructure-example-fetus.json b/crates/fhir/tests/data/json/R4/bodystructure-example-fetus.json similarity index 100% rename from crates/fhir/tests/data/R4/bodystructure-example-fetus.json rename to crates/fhir/tests/data/json/R4/bodystructure-example-fetus.json diff --git a/crates/fhir/tests/data/R4/bodystructure-example-skin-patch.json b/crates/fhir/tests/data/json/R4/bodystructure-example-skin-patch.json similarity index 100% rename from crates/fhir/tests/data/R4/bodystructure-example-skin-patch.json rename to crates/fhir/tests/data/json/R4/bodystructure-example-skin-patch.json diff --git a/crates/fhir/tests/data/R4/bodystructure-example-tumor.json b/crates/fhir/tests/data/json/R4/bodystructure-example-tumor.json similarity index 100% rename from crates/fhir/tests/data/R4/bodystructure-example-tumor.json rename to crates/fhir/tests/data/json/R4/bodystructure-example-tumor.json diff --git a/crates/fhir/tests/data/R4/bodystructure-questionnaire.json b/crates/fhir/tests/data/json/R4/bodystructure-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/bodystructure-questionnaire.json rename to crates/fhir/tests/data/json/R4/bodystructure-questionnaire.json diff --git a/crates/fhir/tests/data/R4/bodystructure.profile.json b/crates/fhir/tests/data/json/R4/bodystructure.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/bodystructure.profile.json rename to crates/fhir/tests/data/json/R4/bodystructure.profile.json diff --git a/crates/fhir/tests/data/R4/bodytemp-questionnaire.json b/crates/fhir/tests/data/json/R4/bodytemp-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/bodytemp-questionnaire.json rename to crates/fhir/tests/data/json/R4/bodytemp-questionnaire.json diff --git a/crates/fhir/tests/data/R4/bodytemp.profile.json b/crates/fhir/tests/data/json/R4/bodytemp.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/bodytemp.profile.json rename to crates/fhir/tests/data/json/R4/bodytemp.profile.json diff --git a/crates/fhir/tests/data/R4/bodyweight-questionnaire.json b/crates/fhir/tests/data/json/R4/bodyweight-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/bodyweight-questionnaire.json rename to crates/fhir/tests/data/json/R4/bodyweight-questionnaire.json diff --git a/crates/fhir/tests/data/R4/bodyweight.profile.json b/crates/fhir/tests/data/json/R4/bodyweight.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/bodyweight.profile.json rename to crates/fhir/tests/data/json/R4/bodyweight.profile.json diff --git a/crates/fhir/tests/data/R4/boolean.profile.json b/crates/fhir/tests/data/json/R4/boolean.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/boolean.profile.json rename to crates/fhir/tests/data/json/R4/boolean.profile.json diff --git a/crates/fhir/tests/data/R4/bp-questionnaire.json b/crates/fhir/tests/data/json/R4/bp-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/bp-questionnaire.json rename to crates/fhir/tests/data/json/R4/bp-questionnaire.json diff --git a/crates/fhir/tests/data/R4/bp.profile.json b/crates/fhir/tests/data/json/R4/bp.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/bp.profile.json rename to crates/fhir/tests/data/json/R4/bp.profile.json diff --git a/crates/fhir/tests/data/R4/bundle-example.json b/crates/fhir/tests/data/json/R4/bundle-example.json similarity index 100% rename from crates/fhir/tests/data/R4/bundle-example.json rename to crates/fhir/tests/data/json/R4/bundle-example.json diff --git a/crates/fhir/tests/data/R4/bundle-questionnaire.json b/crates/fhir/tests/data/json/R4/bundle-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/bundle-questionnaire.json rename to crates/fhir/tests/data/json/R4/bundle-questionnaire.json diff --git a/crates/fhir/tests/data/R4/bundle-references.json b/crates/fhir/tests/data/json/R4/bundle-references.json similarity index 100% rename from crates/fhir/tests/data/R4/bundle-references.json rename to crates/fhir/tests/data/json/R4/bundle-references.json diff --git a/crates/fhir/tests/data/R4/bundle-request-medsallergies.json b/crates/fhir/tests/data/json/R4/bundle-request-medsallergies.json similarity index 100% rename from crates/fhir/tests/data/R4/bundle-request-medsallergies.json rename to crates/fhir/tests/data/json/R4/bundle-request-medsallergies.json diff --git a/crates/fhir/tests/data/R4/bundle-request-simplesummary.json b/crates/fhir/tests/data/json/R4/bundle-request-simplesummary.json similarity index 100% rename from crates/fhir/tests/data/R4/bundle-request-simplesummary.json rename to crates/fhir/tests/data/json/R4/bundle-request-simplesummary.json diff --git a/crates/fhir/tests/data/R4/bundle-response-medsallergies.json b/crates/fhir/tests/data/json/R4/bundle-response-medsallergies.json similarity index 100% rename from crates/fhir/tests/data/R4/bundle-response-medsallergies.json rename to crates/fhir/tests/data/json/R4/bundle-response-medsallergies.json diff --git a/crates/fhir/tests/data/R4/bundle-response-simplesummary.json b/crates/fhir/tests/data/json/R4/bundle-response-simplesummary.json similarity index 100% rename from crates/fhir/tests/data/R4/bundle-response-simplesummary.json rename to crates/fhir/tests/data/json/R4/bundle-response-simplesummary.json diff --git a/crates/fhir/tests/data/R4/bundle-response.json b/crates/fhir/tests/data/json/R4/bundle-response.json similarity index 100% rename from crates/fhir/tests/data/R4/bundle-response.json rename to crates/fhir/tests/data/json/R4/bundle-response.json diff --git a/crates/fhir/tests/data/R4/bundle-search-warning.json b/crates/fhir/tests/data/json/R4/bundle-search-warning.json similarity index 100% rename from crates/fhir/tests/data/R4/bundle-search-warning.json rename to crates/fhir/tests/data/json/R4/bundle-search-warning.json diff --git a/crates/fhir/tests/data/R4/bundle-transaction.json b/crates/fhir/tests/data/json/R4/bundle-transaction.json similarity index 100% rename from crates/fhir/tests/data/R4/bundle-transaction.json rename to crates/fhir/tests/data/json/R4/bundle-transaction.json diff --git a/crates/fhir/tests/data/R4/bundle.profile.json b/crates/fhir/tests/data/json/R4/bundle.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/bundle.profile.json rename to crates/fhir/tests/data/json/R4/bundle.profile.json diff --git a/crates/fhir/tests/data/R4/canonical.profile.json b/crates/fhir/tests/data/json/R4/canonical.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/canonical.profile.json rename to crates/fhir/tests/data/json/R4/canonical.profile.json diff --git a/crates/fhir/tests/data/R4/capabilitystatement-base.json b/crates/fhir/tests/data/json/R4/capabilitystatement-base.json similarity index 100% rename from crates/fhir/tests/data/R4/capabilitystatement-base.json rename to crates/fhir/tests/data/json/R4/capabilitystatement-base.json diff --git a/crates/fhir/tests/data/R4/capabilitystatement-base2.json b/crates/fhir/tests/data/json/R4/capabilitystatement-base2.json similarity index 100% rename from crates/fhir/tests/data/R4/capabilitystatement-base2.json rename to crates/fhir/tests/data/json/R4/capabilitystatement-base2.json diff --git a/crates/fhir/tests/data/R4/capabilitystatement-example.json b/crates/fhir/tests/data/json/R4/capabilitystatement-example.json similarity index 100% rename from crates/fhir/tests/data/R4/capabilitystatement-example.json rename to crates/fhir/tests/data/json/R4/capabilitystatement-example.json diff --git a/crates/fhir/tests/data/R4/capabilitystatement-knowledge-repository.json b/crates/fhir/tests/data/json/R4/capabilitystatement-knowledge-repository.json similarity index 100% rename from crates/fhir/tests/data/R4/capabilitystatement-knowledge-repository.json rename to crates/fhir/tests/data/json/R4/capabilitystatement-knowledge-repository.json diff --git a/crates/fhir/tests/data/R4/capabilitystatement-measure-processor.json b/crates/fhir/tests/data/json/R4/capabilitystatement-measure-processor.json similarity index 100% rename from crates/fhir/tests/data/R4/capabilitystatement-measure-processor.json rename to crates/fhir/tests/data/json/R4/capabilitystatement-measure-processor.json diff --git a/crates/fhir/tests/data/R4/capabilitystatement-messagedefinition.json b/crates/fhir/tests/data/json/R4/capabilitystatement-messagedefinition.json similarity index 100% rename from crates/fhir/tests/data/R4/capabilitystatement-messagedefinition.json rename to crates/fhir/tests/data/json/R4/capabilitystatement-messagedefinition.json diff --git a/crates/fhir/tests/data/R4/capabilitystatement-phr-example.json b/crates/fhir/tests/data/json/R4/capabilitystatement-phr-example.json similarity index 100% rename from crates/fhir/tests/data/R4/capabilitystatement-phr-example.json rename to crates/fhir/tests/data/json/R4/capabilitystatement-phr-example.json diff --git a/crates/fhir/tests/data/R4/capabilitystatement-questionnaire.json b/crates/fhir/tests/data/json/R4/capabilitystatement-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/capabilitystatement-questionnaire.json rename to crates/fhir/tests/data/json/R4/capabilitystatement-questionnaire.json diff --git a/crates/fhir/tests/data/R4/capabilitystatement-terminology-server.json b/crates/fhir/tests/data/json/R4/capabilitystatement-terminology-server.json similarity index 100% rename from crates/fhir/tests/data/R4/capabilitystatement-terminology-server.json rename to crates/fhir/tests/data/json/R4/capabilitystatement-terminology-server.json diff --git a/crates/fhir/tests/data/R4/capabilitystatement.profile.json b/crates/fhir/tests/data/json/R4/capabilitystatement.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/capabilitystatement.profile.json rename to crates/fhir/tests/data/json/R4/capabilitystatement.profile.json diff --git a/crates/fhir/tests/data/R4/careplan-example-GPVisit.json b/crates/fhir/tests/data/json/R4/careplan-example-GPVisit.json similarity index 100% rename from crates/fhir/tests/data/R4/careplan-example-GPVisit.json rename to crates/fhir/tests/data/json/R4/careplan-example-GPVisit.json diff --git a/crates/fhir/tests/data/R4/careplan-example-f001-heart.json b/crates/fhir/tests/data/json/R4/careplan-example-f001-heart.json similarity index 100% rename from crates/fhir/tests/data/R4/careplan-example-f001-heart.json rename to crates/fhir/tests/data/json/R4/careplan-example-f001-heart.json diff --git a/crates/fhir/tests/data/R4/careplan-example-f002-lung.json b/crates/fhir/tests/data/json/R4/careplan-example-f002-lung.json similarity index 100% rename from crates/fhir/tests/data/R4/careplan-example-f002-lung.json rename to crates/fhir/tests/data/json/R4/careplan-example-f002-lung.json diff --git a/crates/fhir/tests/data/R4/careplan-example-f003-pharynx.json b/crates/fhir/tests/data/json/R4/careplan-example-f003-pharynx.json similarity index 100% rename from crates/fhir/tests/data/R4/careplan-example-f003-pharynx.json rename to crates/fhir/tests/data/json/R4/careplan-example-f003-pharynx.json diff --git a/crates/fhir/tests/data/R4/careplan-example-f201-renal.json b/crates/fhir/tests/data/json/R4/careplan-example-f201-renal.json similarity index 100% rename from crates/fhir/tests/data/R4/careplan-example-f201-renal.json rename to crates/fhir/tests/data/json/R4/careplan-example-f201-renal.json diff --git a/crates/fhir/tests/data/R4/careplan-example-f202-malignancy.json b/crates/fhir/tests/data/json/R4/careplan-example-f202-malignancy.json similarity index 100% rename from crates/fhir/tests/data/R4/careplan-example-f202-malignancy.json rename to crates/fhir/tests/data/json/R4/careplan-example-f202-malignancy.json diff --git a/crates/fhir/tests/data/R4/careplan-example-f203-sepsis.json b/crates/fhir/tests/data/json/R4/careplan-example-f203-sepsis.json similarity index 100% rename from crates/fhir/tests/data/R4/careplan-example-f203-sepsis.json rename to crates/fhir/tests/data/json/R4/careplan-example-f203-sepsis.json diff --git a/crates/fhir/tests/data/R4/careplan-example-integrated.json b/crates/fhir/tests/data/json/R4/careplan-example-integrated.json similarity index 100% rename from crates/fhir/tests/data/R4/careplan-example-integrated.json rename to crates/fhir/tests/data/json/R4/careplan-example-integrated.json diff --git a/crates/fhir/tests/data/R4/careplan-example-obesity-narrative.json b/crates/fhir/tests/data/json/R4/careplan-example-obesity-narrative.json similarity index 100% rename from crates/fhir/tests/data/R4/careplan-example-obesity-narrative.json rename to crates/fhir/tests/data/json/R4/careplan-example-obesity-narrative.json diff --git a/crates/fhir/tests/data/R4/careplan-example-pregnancy.json b/crates/fhir/tests/data/json/R4/careplan-example-pregnancy.json similarity index 100% rename from crates/fhir/tests/data/R4/careplan-example-pregnancy.json rename to crates/fhir/tests/data/json/R4/careplan-example-pregnancy.json diff --git a/crates/fhir/tests/data/R4/careplan-example.json b/crates/fhir/tests/data/json/R4/careplan-example.json similarity index 100% rename from crates/fhir/tests/data/R4/careplan-example.json rename to crates/fhir/tests/data/json/R4/careplan-example.json diff --git a/crates/fhir/tests/data/R4/careplan-questionnaire.json b/crates/fhir/tests/data/json/R4/careplan-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/careplan-questionnaire.json rename to crates/fhir/tests/data/json/R4/careplan-questionnaire.json diff --git a/crates/fhir/tests/data/R4/careplan.profile.json b/crates/fhir/tests/data/json/R4/careplan.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/careplan.profile.json rename to crates/fhir/tests/data/json/R4/careplan.profile.json diff --git a/crates/fhir/tests/data/R4/careteam-example.json b/crates/fhir/tests/data/json/R4/careteam-example.json similarity index 100% rename from crates/fhir/tests/data/R4/careteam-example.json rename to crates/fhir/tests/data/json/R4/careteam-example.json diff --git a/crates/fhir/tests/data/R4/careteam-questionnaire.json b/crates/fhir/tests/data/json/R4/careteam-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/careteam-questionnaire.json rename to crates/fhir/tests/data/json/R4/careteam-questionnaire.json diff --git a/crates/fhir/tests/data/R4/careteam.profile.json b/crates/fhir/tests/data/json/R4/careteam.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/careteam.profile.json rename to crates/fhir/tests/data/json/R4/careteam.profile.json diff --git a/crates/fhir/tests/data/R4/catalog-questionnaire.json b/crates/fhir/tests/data/json/R4/catalog-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/catalog-questionnaire.json rename to crates/fhir/tests/data/json/R4/catalog-questionnaire.json diff --git a/crates/fhir/tests/data/R4/catalog.profile.json b/crates/fhir/tests/data/json/R4/catalog.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/catalog.profile.json rename to crates/fhir/tests/data/json/R4/catalog.profile.json diff --git a/crates/fhir/tests/data/R4/catalogentry-example.json b/crates/fhir/tests/data/json/R4/catalogentry-example.json similarity index 100% rename from crates/fhir/tests/data/R4/catalogentry-example.json rename to crates/fhir/tests/data/json/R4/catalogentry-example.json diff --git a/crates/fhir/tests/data/R4/catalogentry-questionnaire.json b/crates/fhir/tests/data/json/R4/catalogentry-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/catalogentry-questionnaire.json rename to crates/fhir/tests/data/json/R4/catalogentry-questionnaire.json diff --git a/crates/fhir/tests/data/R4/catalogentry.profile.json b/crates/fhir/tests/data/json/R4/catalogentry.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/catalogentry.profile.json rename to crates/fhir/tests/data/json/R4/catalogentry.profile.json diff --git a/crates/fhir/tests/data/R4/cdshooksguidanceresponse-questionnaire.json b/crates/fhir/tests/data/json/R4/cdshooksguidanceresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/cdshooksguidanceresponse-questionnaire.json rename to crates/fhir/tests/data/json/R4/cdshooksguidanceresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R4/cdshooksguidanceresponse.profile.json b/crates/fhir/tests/data/json/R4/cdshooksguidanceresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/cdshooksguidanceresponse.profile.json rename to crates/fhir/tests/data/json/R4/cdshooksguidanceresponse.profile.json diff --git a/crates/fhir/tests/data/R4/cdshooksrequestgroup-questionnaire.json b/crates/fhir/tests/data/json/R4/cdshooksrequestgroup-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/cdshooksrequestgroup-questionnaire.json rename to crates/fhir/tests/data/json/R4/cdshooksrequestgroup-questionnaire.json diff --git a/crates/fhir/tests/data/R4/cdshooksrequestgroup.profile.json b/crates/fhir/tests/data/json/R4/cdshooksrequestgroup.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/cdshooksrequestgroup.profile.json rename to crates/fhir/tests/data/json/R4/cdshooksrequestgroup.profile.json diff --git a/crates/fhir/tests/data/R4/cdshooksserviceplandefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/cdshooksserviceplandefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/cdshooksserviceplandefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/cdshooksserviceplandefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/cdshooksserviceplandefinition.profile.json b/crates/fhir/tests/data/json/R4/cdshooksserviceplandefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/cdshooksserviceplandefinition.profile.json rename to crates/fhir/tests/data/json/R4/cdshooksserviceplandefinition.profile.json diff --git a/crates/fhir/tests/data/R4/chargeitem-example.json b/crates/fhir/tests/data/json/R4/chargeitem-example.json similarity index 100% rename from crates/fhir/tests/data/R4/chargeitem-example.json rename to crates/fhir/tests/data/json/R4/chargeitem-example.json diff --git a/crates/fhir/tests/data/R4/chargeitem-questionnaire.json b/crates/fhir/tests/data/json/R4/chargeitem-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/chargeitem-questionnaire.json rename to crates/fhir/tests/data/json/R4/chargeitem-questionnaire.json diff --git a/crates/fhir/tests/data/R4/chargeitem.profile.json b/crates/fhir/tests/data/json/R4/chargeitem.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/chargeitem.profile.json rename to crates/fhir/tests/data/json/R4/chargeitem.profile.json diff --git a/crates/fhir/tests/data/R4/chargeitemdefinition-device-example.json b/crates/fhir/tests/data/json/R4/chargeitemdefinition-device-example.json similarity index 100% rename from crates/fhir/tests/data/R4/chargeitemdefinition-device-example.json rename to crates/fhir/tests/data/json/R4/chargeitemdefinition-device-example.json diff --git a/crates/fhir/tests/data/R4/chargeitemdefinition-ebm-example.json b/crates/fhir/tests/data/json/R4/chargeitemdefinition-ebm-example.json similarity index 100% rename from crates/fhir/tests/data/R4/chargeitemdefinition-ebm-example.json rename to crates/fhir/tests/data/json/R4/chargeitemdefinition-ebm-example.json diff --git a/crates/fhir/tests/data/R4/chargeitemdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/chargeitemdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/chargeitemdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/chargeitemdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/chargeitemdefinition.profile.json b/crates/fhir/tests/data/json/R4/chargeitemdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/chargeitemdefinition.profile.json rename to crates/fhir/tests/data/json/R4/chargeitemdefinition.profile.json diff --git a/crates/fhir/tests/data/R4/cholesterol-questionnaire.json b/crates/fhir/tests/data/json/R4/cholesterol-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/cholesterol-questionnaire.json rename to crates/fhir/tests/data/json/R4/cholesterol-questionnaire.json diff --git a/crates/fhir/tests/data/R4/cholesterol.profile.json b/crates/fhir/tests/data/json/R4/cholesterol.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/cholesterol.profile.json rename to crates/fhir/tests/data/json/R4/cholesterol.profile.json diff --git a/crates/fhir/tests/data/R4/claim-example-cms1500-medical.json b/crates/fhir/tests/data/json/R4/claim-example-cms1500-medical.json similarity index 100% rename from crates/fhir/tests/data/R4/claim-example-cms1500-medical.json rename to crates/fhir/tests/data/json/R4/claim-example-cms1500-medical.json diff --git a/crates/fhir/tests/data/R4/claim-example-institutional-rich.json b/crates/fhir/tests/data/json/R4/claim-example-institutional-rich.json similarity index 100% rename from crates/fhir/tests/data/R4/claim-example-institutional-rich.json rename to crates/fhir/tests/data/json/R4/claim-example-institutional-rich.json diff --git a/crates/fhir/tests/data/R4/claim-example-institutional.json b/crates/fhir/tests/data/json/R4/claim-example-institutional.json similarity index 100% rename from crates/fhir/tests/data/R4/claim-example-institutional.json rename to crates/fhir/tests/data/json/R4/claim-example-institutional.json diff --git a/crates/fhir/tests/data/R4/claim-example-oral-average.json b/crates/fhir/tests/data/json/R4/claim-example-oral-average.json similarity index 100% rename from crates/fhir/tests/data/R4/claim-example-oral-average.json rename to crates/fhir/tests/data/json/R4/claim-example-oral-average.json diff --git a/crates/fhir/tests/data/R4/claim-example-oral-bridge.json b/crates/fhir/tests/data/json/R4/claim-example-oral-bridge.json similarity index 100% rename from crates/fhir/tests/data/R4/claim-example-oral-bridge.json rename to crates/fhir/tests/data/json/R4/claim-example-oral-bridge.json diff --git a/crates/fhir/tests/data/R4/claim-example-oral-contained-identifier.json b/crates/fhir/tests/data/json/R4/claim-example-oral-contained-identifier.json similarity index 100% rename from crates/fhir/tests/data/R4/claim-example-oral-contained-identifier.json rename to crates/fhir/tests/data/json/R4/claim-example-oral-contained-identifier.json diff --git a/crates/fhir/tests/data/R4/claim-example-oral-contained.json b/crates/fhir/tests/data/json/R4/claim-example-oral-contained.json similarity index 100% rename from crates/fhir/tests/data/R4/claim-example-oral-contained.json rename to crates/fhir/tests/data/json/R4/claim-example-oral-contained.json diff --git a/crates/fhir/tests/data/R4/claim-example-oral-identifier.json b/crates/fhir/tests/data/json/R4/claim-example-oral-identifier.json similarity index 100% rename from crates/fhir/tests/data/R4/claim-example-oral-identifier.json rename to crates/fhir/tests/data/json/R4/claim-example-oral-identifier.json diff --git a/crates/fhir/tests/data/R4/claim-example-oral-orthoplan.json b/crates/fhir/tests/data/json/R4/claim-example-oral-orthoplan.json similarity index 100% rename from crates/fhir/tests/data/R4/claim-example-oral-orthoplan.json rename to crates/fhir/tests/data/json/R4/claim-example-oral-orthoplan.json diff --git a/crates/fhir/tests/data/R4/claim-example-pharmacy-compound.json b/crates/fhir/tests/data/json/R4/claim-example-pharmacy-compound.json similarity index 100% rename from crates/fhir/tests/data/R4/claim-example-pharmacy-compound.json rename to crates/fhir/tests/data/json/R4/claim-example-pharmacy-compound.json diff --git a/crates/fhir/tests/data/R4/claim-example-pharmacy-medication.json b/crates/fhir/tests/data/json/R4/claim-example-pharmacy-medication.json similarity index 100% rename from crates/fhir/tests/data/R4/claim-example-pharmacy-medication.json rename to crates/fhir/tests/data/json/R4/claim-example-pharmacy-medication.json diff --git a/crates/fhir/tests/data/R4/claim-example-pharmacy.json b/crates/fhir/tests/data/json/R4/claim-example-pharmacy.json similarity index 100% rename from crates/fhir/tests/data/R4/claim-example-pharmacy.json rename to crates/fhir/tests/data/json/R4/claim-example-pharmacy.json diff --git a/crates/fhir/tests/data/R4/claim-example-professional.json b/crates/fhir/tests/data/json/R4/claim-example-professional.json similarity index 100% rename from crates/fhir/tests/data/R4/claim-example-professional.json rename to crates/fhir/tests/data/json/R4/claim-example-professional.json diff --git a/crates/fhir/tests/data/R4/claim-example-vision-glasses-3tier.json b/crates/fhir/tests/data/json/R4/claim-example-vision-glasses-3tier.json similarity index 100% rename from crates/fhir/tests/data/R4/claim-example-vision-glasses-3tier.json rename to crates/fhir/tests/data/json/R4/claim-example-vision-glasses-3tier.json diff --git a/crates/fhir/tests/data/R4/claim-example-vision-glasses.json b/crates/fhir/tests/data/json/R4/claim-example-vision-glasses.json similarity index 100% rename from crates/fhir/tests/data/R4/claim-example-vision-glasses.json rename to crates/fhir/tests/data/json/R4/claim-example-vision-glasses.json diff --git a/crates/fhir/tests/data/R4/claim-example-vision.json b/crates/fhir/tests/data/json/R4/claim-example-vision.json similarity index 100% rename from crates/fhir/tests/data/R4/claim-example-vision.json rename to crates/fhir/tests/data/json/R4/claim-example-vision.json diff --git a/crates/fhir/tests/data/R4/claim-example.json b/crates/fhir/tests/data/json/R4/claim-example.json similarity index 100% rename from crates/fhir/tests/data/R4/claim-example.json rename to crates/fhir/tests/data/json/R4/claim-example.json diff --git a/crates/fhir/tests/data/R4/claim-questionnaire.json b/crates/fhir/tests/data/json/R4/claim-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/claim-questionnaire.json rename to crates/fhir/tests/data/json/R4/claim-questionnaire.json diff --git a/crates/fhir/tests/data/R4/claim.profile.json b/crates/fhir/tests/data/json/R4/claim.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/claim.profile.json rename to crates/fhir/tests/data/json/R4/claim.profile.json diff --git a/crates/fhir/tests/data/R4/claimresponse-example-2.json b/crates/fhir/tests/data/json/R4/claimresponse-example-2.json similarity index 100% rename from crates/fhir/tests/data/R4/claimresponse-example-2.json rename to crates/fhir/tests/data/json/R4/claimresponse-example-2.json diff --git a/crates/fhir/tests/data/R4/claimresponse-example-additem.json b/crates/fhir/tests/data/json/R4/claimresponse-example-additem.json similarity index 100% rename from crates/fhir/tests/data/R4/claimresponse-example-additem.json rename to crates/fhir/tests/data/json/R4/claimresponse-example-additem.json diff --git a/crates/fhir/tests/data/R4/claimresponse-example-unsolicited-preauth.json b/crates/fhir/tests/data/json/R4/claimresponse-example-unsolicited-preauth.json similarity index 100% rename from crates/fhir/tests/data/R4/claimresponse-example-unsolicited-preauth.json rename to crates/fhir/tests/data/json/R4/claimresponse-example-unsolicited-preauth.json diff --git a/crates/fhir/tests/data/R4/claimresponse-example-vision-3tier.json b/crates/fhir/tests/data/json/R4/claimresponse-example-vision-3tier.json similarity index 100% rename from crates/fhir/tests/data/R4/claimresponse-example-vision-3tier.json rename to crates/fhir/tests/data/json/R4/claimresponse-example-vision-3tier.json diff --git a/crates/fhir/tests/data/R4/claimresponse-example.json b/crates/fhir/tests/data/json/R4/claimresponse-example.json similarity index 100% rename from crates/fhir/tests/data/R4/claimresponse-example.json rename to crates/fhir/tests/data/json/R4/claimresponse-example.json diff --git a/crates/fhir/tests/data/R4/claimresponse-questionnaire.json b/crates/fhir/tests/data/json/R4/claimresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/claimresponse-questionnaire.json rename to crates/fhir/tests/data/json/R4/claimresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R4/claimresponse.profile.json b/crates/fhir/tests/data/json/R4/claimresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/claimresponse.profile.json rename to crates/fhir/tests/data/json/R4/claimresponse.profile.json diff --git a/crates/fhir/tests/data/R4/clinicaldocument-questionnaire.json b/crates/fhir/tests/data/json/R4/clinicaldocument-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/clinicaldocument-questionnaire.json rename to crates/fhir/tests/data/json/R4/clinicaldocument-questionnaire.json diff --git a/crates/fhir/tests/data/R4/clinicaldocument.profile.json b/crates/fhir/tests/data/json/R4/clinicaldocument.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/clinicaldocument.profile.json rename to crates/fhir/tests/data/json/R4/clinicaldocument.profile.json diff --git a/crates/fhir/tests/data/R4/clinicalimpression-example.json b/crates/fhir/tests/data/json/R4/clinicalimpression-example.json similarity index 100% rename from crates/fhir/tests/data/R4/clinicalimpression-example.json rename to crates/fhir/tests/data/json/R4/clinicalimpression-example.json diff --git a/crates/fhir/tests/data/R4/clinicalimpression-questionnaire.json b/crates/fhir/tests/data/json/R4/clinicalimpression-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/clinicalimpression-questionnaire.json rename to crates/fhir/tests/data/json/R4/clinicalimpression-questionnaire.json diff --git a/crates/fhir/tests/data/R4/clinicalimpression.profile.json b/crates/fhir/tests/data/json/R4/clinicalimpression.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/clinicalimpression.profile.json rename to crates/fhir/tests/data/json/R4/clinicalimpression.profile.json diff --git a/crates/fhir/tests/data/R4/cm-address-type-v3.json b/crates/fhir/tests/data/json/R4/cm-address-type-v3.json similarity index 100% rename from crates/fhir/tests/data/R4/cm-address-type-v3.json rename to crates/fhir/tests/data/json/R4/cm-address-type-v3.json diff --git a/crates/fhir/tests/data/R4/cm-address-use-v2.json b/crates/fhir/tests/data/json/R4/cm-address-use-v2.json similarity index 100% rename from crates/fhir/tests/data/R4/cm-address-use-v2.json rename to crates/fhir/tests/data/json/R4/cm-address-use-v2.json diff --git a/crates/fhir/tests/data/R4/cm-address-use-v3.json b/crates/fhir/tests/data/json/R4/cm-address-use-v3.json similarity index 100% rename from crates/fhir/tests/data/R4/cm-address-use-v3.json rename to crates/fhir/tests/data/json/R4/cm-address-use-v3.json diff --git a/crates/fhir/tests/data/R4/cm-administrative-gender-v2.json b/crates/fhir/tests/data/json/R4/cm-administrative-gender-v2.json similarity index 100% rename from crates/fhir/tests/data/R4/cm-administrative-gender-v2.json rename to crates/fhir/tests/data/json/R4/cm-administrative-gender-v2.json diff --git a/crates/fhir/tests/data/R4/cm-administrative-gender-v3.json b/crates/fhir/tests/data/json/R4/cm-administrative-gender-v3.json similarity index 100% rename from crates/fhir/tests/data/R4/cm-administrative-gender-v3.json rename to crates/fhir/tests/data/json/R4/cm-administrative-gender-v3.json diff --git a/crates/fhir/tests/data/R4/cm-composition-status-v3.json b/crates/fhir/tests/data/json/R4/cm-composition-status-v3.json similarity index 100% rename from crates/fhir/tests/data/R4/cm-composition-status-v3.json rename to crates/fhir/tests/data/json/R4/cm-composition-status-v3.json diff --git a/crates/fhir/tests/data/R4/cm-contact-point-system-v2.json b/crates/fhir/tests/data/json/R4/cm-contact-point-system-v2.json similarity index 100% rename from crates/fhir/tests/data/R4/cm-contact-point-system-v2.json rename to crates/fhir/tests/data/json/R4/cm-contact-point-system-v2.json diff --git a/crates/fhir/tests/data/R4/cm-contact-point-use-v2.json b/crates/fhir/tests/data/json/R4/cm-contact-point-use-v2.json similarity index 100% rename from crates/fhir/tests/data/R4/cm-contact-point-use-v2.json rename to crates/fhir/tests/data/json/R4/cm-contact-point-use-v2.json diff --git a/crates/fhir/tests/data/R4/cm-contact-point-use-v3.json b/crates/fhir/tests/data/json/R4/cm-contact-point-use-v3.json similarity index 100% rename from crates/fhir/tests/data/R4/cm-contact-point-use-v3.json rename to crates/fhir/tests/data/json/R4/cm-contact-point-use-v3.json diff --git a/crates/fhir/tests/data/R4/cm-data-absent-reason-v3.json b/crates/fhir/tests/data/json/R4/cm-data-absent-reason-v3.json similarity index 100% rename from crates/fhir/tests/data/R4/cm-data-absent-reason-v3.json rename to crates/fhir/tests/data/json/R4/cm-data-absent-reason-v3.json diff --git a/crates/fhir/tests/data/R4/cm-detectedissue-severity-v3.json b/crates/fhir/tests/data/json/R4/cm-detectedissue-severity-v3.json similarity index 100% rename from crates/fhir/tests/data/R4/cm-detectedissue-severity-v3.json rename to crates/fhir/tests/data/json/R4/cm-detectedissue-severity-v3.json diff --git a/crates/fhir/tests/data/R4/cm-document-reference-status-v3.json b/crates/fhir/tests/data/json/R4/cm-document-reference-status-v3.json similarity index 100% rename from crates/fhir/tests/data/R4/cm-document-reference-status-v3.json rename to crates/fhir/tests/data/json/R4/cm-document-reference-status-v3.json diff --git a/crates/fhir/tests/data/R4/cm-name-use-v2.json b/crates/fhir/tests/data/json/R4/cm-name-use-v2.json similarity index 100% rename from crates/fhir/tests/data/R4/cm-name-use-v2.json rename to crates/fhir/tests/data/json/R4/cm-name-use-v2.json diff --git a/crates/fhir/tests/data/R4/cm-name-use-v3.json b/crates/fhir/tests/data/json/R4/cm-name-use-v3.json similarity index 100% rename from crates/fhir/tests/data/R4/cm-name-use-v3.json rename to crates/fhir/tests/data/json/R4/cm-name-use-v3.json diff --git a/crates/fhir/tests/data/R4/code.profile.json b/crates/fhir/tests/data/json/R4/code.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/code.profile.json rename to crates/fhir/tests/data/json/R4/code.profile.json diff --git a/crates/fhir/tests/data/R4/codeableconcept.profile.json b/crates/fhir/tests/data/json/R4/codeableconcept.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/codeableconcept.profile.json rename to crates/fhir/tests/data/json/R4/codeableconcept.profile.json diff --git a/crates/fhir/tests/data/R4/codesystem-FHIR-version.json b/crates/fhir/tests/data/json/R4/codesystem-FHIR-version.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-FHIR-version.json rename to crates/fhir/tests/data/json/R4/codesystem-FHIR-version.json diff --git a/crates/fhir/tests/data/R4/codesystem-abstract-types.json b/crates/fhir/tests/data/json/R4/codesystem-abstract-types.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-abstract-types.json rename to crates/fhir/tests/data/json/R4/codesystem-abstract-types.json diff --git a/crates/fhir/tests/data/R4/codesystem-account-status.json b/crates/fhir/tests/data/json/R4/codesystem-account-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-account-status.json rename to crates/fhir/tests/data/json/R4/codesystem-account-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-action-cardinality-behavior.json b/crates/fhir/tests/data/json/R4/codesystem-action-cardinality-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-action-cardinality-behavior.json rename to crates/fhir/tests/data/json/R4/codesystem-action-cardinality-behavior.json diff --git a/crates/fhir/tests/data/R4/codesystem-action-condition-kind.json b/crates/fhir/tests/data/json/R4/codesystem-action-condition-kind.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-action-condition-kind.json rename to crates/fhir/tests/data/json/R4/codesystem-action-condition-kind.json diff --git a/crates/fhir/tests/data/R4/codesystem-action-grouping-behavior.json b/crates/fhir/tests/data/json/R4/codesystem-action-grouping-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-action-grouping-behavior.json rename to crates/fhir/tests/data/json/R4/codesystem-action-grouping-behavior.json diff --git a/crates/fhir/tests/data/R4/codesystem-action-participant-type.json b/crates/fhir/tests/data/json/R4/codesystem-action-participant-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-action-participant-type.json rename to crates/fhir/tests/data/json/R4/codesystem-action-participant-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-action-precheck-behavior.json b/crates/fhir/tests/data/json/R4/codesystem-action-precheck-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-action-precheck-behavior.json rename to crates/fhir/tests/data/json/R4/codesystem-action-precheck-behavior.json diff --git a/crates/fhir/tests/data/R4/codesystem-action-relationship-type.json b/crates/fhir/tests/data/json/R4/codesystem-action-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-action-relationship-type.json rename to crates/fhir/tests/data/json/R4/codesystem-action-relationship-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-action-required-behavior.json b/crates/fhir/tests/data/json/R4/codesystem-action-required-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-action-required-behavior.json rename to crates/fhir/tests/data/json/R4/codesystem-action-required-behavior.json diff --git a/crates/fhir/tests/data/R4/codesystem-action-selection-behavior.json b/crates/fhir/tests/data/json/R4/codesystem-action-selection-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-action-selection-behavior.json rename to crates/fhir/tests/data/json/R4/codesystem-action-selection-behavior.json diff --git a/crates/fhir/tests/data/R4/codesystem-action-type.json b/crates/fhir/tests/data/json/R4/codesystem-action-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-action-type.json rename to crates/fhir/tests/data/json/R4/codesystem-action-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-activity-definition-category.json b/crates/fhir/tests/data/json/R4/codesystem-activity-definition-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-activity-definition-category.json rename to crates/fhir/tests/data/json/R4/codesystem-activity-definition-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-additionalmaterials.json b/crates/fhir/tests/data/json/R4/codesystem-additionalmaterials.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-additionalmaterials.json rename to crates/fhir/tests/data/json/R4/codesystem-additionalmaterials.json diff --git a/crates/fhir/tests/data/R4/codesystem-address-type.json b/crates/fhir/tests/data/json/R4/codesystem-address-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-address-type.json rename to crates/fhir/tests/data/json/R4/codesystem-address-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-address-use.json b/crates/fhir/tests/data/json/R4/codesystem-address-use.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-address-use.json rename to crates/fhir/tests/data/json/R4/codesystem-address-use.json diff --git a/crates/fhir/tests/data/R4/codesystem-adjudication-error.json b/crates/fhir/tests/data/json/R4/codesystem-adjudication-error.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-adjudication-error.json rename to crates/fhir/tests/data/json/R4/codesystem-adjudication-error.json diff --git a/crates/fhir/tests/data/R4/codesystem-adjudication-reason.json b/crates/fhir/tests/data/json/R4/codesystem-adjudication-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-adjudication-reason.json rename to crates/fhir/tests/data/json/R4/codesystem-adjudication-reason.json diff --git a/crates/fhir/tests/data/R4/codesystem-adjudication.json b/crates/fhir/tests/data/json/R4/codesystem-adjudication.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-adjudication.json rename to crates/fhir/tests/data/json/R4/codesystem-adjudication.json diff --git a/crates/fhir/tests/data/R4/codesystem-administrative-gender.json b/crates/fhir/tests/data/json/R4/codesystem-administrative-gender.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-administrative-gender.json rename to crates/fhir/tests/data/json/R4/codesystem-administrative-gender.json diff --git a/crates/fhir/tests/data/R4/codesystem-adverse-event-actuality.json b/crates/fhir/tests/data/json/R4/codesystem-adverse-event-actuality.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-adverse-event-actuality.json rename to crates/fhir/tests/data/json/R4/codesystem-adverse-event-actuality.json diff --git a/crates/fhir/tests/data/R4/codesystem-adverse-event-category.json b/crates/fhir/tests/data/json/R4/codesystem-adverse-event-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-adverse-event-category.json rename to crates/fhir/tests/data/json/R4/codesystem-adverse-event-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-adverse-event-causality-assess.json b/crates/fhir/tests/data/json/R4/codesystem-adverse-event-causality-assess.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-adverse-event-causality-assess.json rename to crates/fhir/tests/data/json/R4/codesystem-adverse-event-causality-assess.json diff --git a/crates/fhir/tests/data/R4/codesystem-adverse-event-causality-method.json b/crates/fhir/tests/data/json/R4/codesystem-adverse-event-causality-method.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-adverse-event-causality-method.json rename to crates/fhir/tests/data/json/R4/codesystem-adverse-event-causality-method.json diff --git a/crates/fhir/tests/data/R4/codesystem-adverse-event-outcome.json b/crates/fhir/tests/data/json/R4/codesystem-adverse-event-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-adverse-event-outcome.json rename to crates/fhir/tests/data/json/R4/codesystem-adverse-event-outcome.json diff --git a/crates/fhir/tests/data/R4/codesystem-adverse-event-seriousness.json b/crates/fhir/tests/data/json/R4/codesystem-adverse-event-seriousness.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-adverse-event-seriousness.json rename to crates/fhir/tests/data/json/R4/codesystem-adverse-event-seriousness.json diff --git a/crates/fhir/tests/data/R4/codesystem-adverse-event-severity.json b/crates/fhir/tests/data/json/R4/codesystem-adverse-event-severity.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-adverse-event-severity.json rename to crates/fhir/tests/data/json/R4/codesystem-adverse-event-severity.json diff --git a/crates/fhir/tests/data/R4/codesystem-allerg-intol-substance-exp-risk.json b/crates/fhir/tests/data/json/R4/codesystem-allerg-intol-substance-exp-risk.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-allerg-intol-substance-exp-risk.json rename to crates/fhir/tests/data/json/R4/codesystem-allerg-intol-substance-exp-risk.json diff --git a/crates/fhir/tests/data/R4/codesystem-allergy-intolerance-category.json b/crates/fhir/tests/data/json/R4/codesystem-allergy-intolerance-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-allergy-intolerance-category.json rename to crates/fhir/tests/data/json/R4/codesystem-allergy-intolerance-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-allergy-intolerance-criticality.json b/crates/fhir/tests/data/json/R4/codesystem-allergy-intolerance-criticality.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-allergy-intolerance-criticality.json rename to crates/fhir/tests/data/json/R4/codesystem-allergy-intolerance-criticality.json diff --git a/crates/fhir/tests/data/R4/codesystem-allergy-intolerance-type.json b/crates/fhir/tests/data/json/R4/codesystem-allergy-intolerance-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-allergy-intolerance-type.json rename to crates/fhir/tests/data/json/R4/codesystem-allergy-intolerance-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-allergyintolerance-clinical.json b/crates/fhir/tests/data/json/R4/codesystem-allergyintolerance-clinical.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-allergyintolerance-clinical.json rename to crates/fhir/tests/data/json/R4/codesystem-allergyintolerance-clinical.json diff --git a/crates/fhir/tests/data/R4/codesystem-allergyintolerance-verification.json b/crates/fhir/tests/data/json/R4/codesystem-allergyintolerance-verification.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-allergyintolerance-verification.json rename to crates/fhir/tests/data/json/R4/codesystem-allergyintolerance-verification.json diff --git a/crates/fhir/tests/data/R4/codesystem-animal-genderstatus.json b/crates/fhir/tests/data/json/R4/codesystem-animal-genderstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-animal-genderstatus.json rename to crates/fhir/tests/data/json/R4/codesystem-animal-genderstatus.json diff --git a/crates/fhir/tests/data/R4/codesystem-animal-species.json b/crates/fhir/tests/data/json/R4/codesystem-animal-species.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-animal-species.json rename to crates/fhir/tests/data/json/R4/codesystem-animal-species.json diff --git a/crates/fhir/tests/data/R4/codesystem-appointment-cancellation-reason.json b/crates/fhir/tests/data/json/R4/codesystem-appointment-cancellation-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-appointment-cancellation-reason.json rename to crates/fhir/tests/data/json/R4/codesystem-appointment-cancellation-reason.json diff --git a/crates/fhir/tests/data/R4/codesystem-appointmentstatus.json b/crates/fhir/tests/data/json/R4/codesystem-appointmentstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-appointmentstatus.json rename to crates/fhir/tests/data/json/R4/codesystem-appointmentstatus.json diff --git a/crates/fhir/tests/data/R4/codesystem-assert-direction-codes.json b/crates/fhir/tests/data/json/R4/codesystem-assert-direction-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-assert-direction-codes.json rename to crates/fhir/tests/data/json/R4/codesystem-assert-direction-codes.json diff --git a/crates/fhir/tests/data/R4/codesystem-assert-operator-codes.json b/crates/fhir/tests/data/json/R4/codesystem-assert-operator-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-assert-operator-codes.json rename to crates/fhir/tests/data/json/R4/codesystem-assert-operator-codes.json diff --git a/crates/fhir/tests/data/R4/codesystem-assert-response-code-types.json b/crates/fhir/tests/data/json/R4/codesystem-assert-response-code-types.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-assert-response-code-types.json rename to crates/fhir/tests/data/json/R4/codesystem-assert-response-code-types.json diff --git a/crates/fhir/tests/data/R4/codesystem-asset-availability.json b/crates/fhir/tests/data/json/R4/codesystem-asset-availability.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-asset-availability.json rename to crates/fhir/tests/data/json/R4/codesystem-asset-availability.json diff --git a/crates/fhir/tests/data/R4/codesystem-audit-entity-type.json b/crates/fhir/tests/data/json/R4/codesystem-audit-entity-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-audit-entity-type.json rename to crates/fhir/tests/data/json/R4/codesystem-audit-entity-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-audit-event-action.json b/crates/fhir/tests/data/json/R4/codesystem-audit-event-action.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-audit-event-action.json rename to crates/fhir/tests/data/json/R4/codesystem-audit-event-action.json diff --git a/crates/fhir/tests/data/R4/codesystem-audit-event-outcome.json b/crates/fhir/tests/data/json/R4/codesystem-audit-event-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-audit-event-outcome.json rename to crates/fhir/tests/data/json/R4/codesystem-audit-event-outcome.json diff --git a/crates/fhir/tests/data/R4/codesystem-audit-event-type.json b/crates/fhir/tests/data/json/R4/codesystem-audit-event-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-audit-event-type.json rename to crates/fhir/tests/data/json/R4/codesystem-audit-event-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-audit-source-type.json b/crates/fhir/tests/data/json/R4/codesystem-audit-source-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-audit-source-type.json rename to crates/fhir/tests/data/json/R4/codesystem-audit-source-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-basic-resource-type.json b/crates/fhir/tests/data/json/R4/codesystem-basic-resource-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-basic-resource-type.json rename to crates/fhir/tests/data/json/R4/codesystem-basic-resource-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-benefit-network.json b/crates/fhir/tests/data/json/R4/codesystem-benefit-network.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-benefit-network.json rename to crates/fhir/tests/data/json/R4/codesystem-benefit-network.json diff --git a/crates/fhir/tests/data/R4/codesystem-benefit-term.json b/crates/fhir/tests/data/json/R4/codesystem-benefit-term.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-benefit-term.json rename to crates/fhir/tests/data/json/R4/codesystem-benefit-term.json diff --git a/crates/fhir/tests/data/R4/codesystem-benefit-type.json b/crates/fhir/tests/data/json/R4/codesystem-benefit-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-benefit-type.json rename to crates/fhir/tests/data/json/R4/codesystem-benefit-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-benefit-unit.json b/crates/fhir/tests/data/json/R4/codesystem-benefit-unit.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-benefit-unit.json rename to crates/fhir/tests/data/json/R4/codesystem-benefit-unit.json diff --git a/crates/fhir/tests/data/R4/codesystem-binding-strength.json b/crates/fhir/tests/data/json/R4/codesystem-binding-strength.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-binding-strength.json rename to crates/fhir/tests/data/json/R4/codesystem-binding-strength.json diff --git a/crates/fhir/tests/data/R4/codesystem-bundle-type.json b/crates/fhir/tests/data/json/R4/codesystem-bundle-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-bundle-type.json rename to crates/fhir/tests/data/json/R4/codesystem-bundle-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-capability-statement-kind.json b/crates/fhir/tests/data/json/R4/codesystem-capability-statement-kind.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-capability-statement-kind.json rename to crates/fhir/tests/data/json/R4/codesystem-capability-statement-kind.json diff --git a/crates/fhir/tests/data/R4/codesystem-care-plan-activity-status.json b/crates/fhir/tests/data/json/R4/codesystem-care-plan-activity-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-care-plan-activity-status.json rename to crates/fhir/tests/data/json/R4/codesystem-care-plan-activity-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-care-team-status.json b/crates/fhir/tests/data/json/R4/codesystem-care-team-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-care-team-status.json rename to crates/fhir/tests/data/json/R4/codesystem-care-team-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-catalogType.json b/crates/fhir/tests/data/json/R4/codesystem-catalogType.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-catalogType.json rename to crates/fhir/tests/data/json/R4/codesystem-catalogType.json diff --git a/crates/fhir/tests/data/R4/codesystem-cdshooks-indicator.json b/crates/fhir/tests/data/json/R4/codesystem-cdshooks-indicator.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-cdshooks-indicator.json rename to crates/fhir/tests/data/json/R4/codesystem-cdshooks-indicator.json diff --git a/crates/fhir/tests/data/R4/codesystem-certainty-subcomponent-rating.json b/crates/fhir/tests/data/json/R4/codesystem-certainty-subcomponent-rating.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-certainty-subcomponent-rating.json rename to crates/fhir/tests/data/json/R4/codesystem-certainty-subcomponent-rating.json diff --git a/crates/fhir/tests/data/R4/codesystem-certainty-subcomponent-type.json b/crates/fhir/tests/data/json/R4/codesystem-certainty-subcomponent-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-certainty-subcomponent-type.json rename to crates/fhir/tests/data/json/R4/codesystem-certainty-subcomponent-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-chargeitem-billingcodes.json b/crates/fhir/tests/data/json/R4/codesystem-chargeitem-billingcodes.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-chargeitem-billingcodes.json rename to crates/fhir/tests/data/json/R4/codesystem-chargeitem-billingcodes.json diff --git a/crates/fhir/tests/data/R4/codesystem-chargeitem-status.json b/crates/fhir/tests/data/json/R4/codesystem-chargeitem-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-chargeitem-status.json rename to crates/fhir/tests/data/json/R4/codesystem-chargeitem-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-choice-list-orientation.json b/crates/fhir/tests/data/json/R4/codesystem-choice-list-orientation.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-choice-list-orientation.json rename to crates/fhir/tests/data/json/R4/codesystem-choice-list-orientation.json diff --git a/crates/fhir/tests/data/R4/codesystem-chromosome-human.json b/crates/fhir/tests/data/json/R4/codesystem-chromosome-human.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-chromosome-human.json rename to crates/fhir/tests/data/json/R4/codesystem-chromosome-human.json diff --git a/crates/fhir/tests/data/R4/codesystem-claim-careteamrole.json b/crates/fhir/tests/data/json/R4/codesystem-claim-careteamrole.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-claim-careteamrole.json rename to crates/fhir/tests/data/json/R4/codesystem-claim-careteamrole.json diff --git a/crates/fhir/tests/data/R4/codesystem-claim-exception.json b/crates/fhir/tests/data/json/R4/codesystem-claim-exception.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-claim-exception.json rename to crates/fhir/tests/data/json/R4/codesystem-claim-exception.json diff --git a/crates/fhir/tests/data/R4/codesystem-claim-informationcategory.json b/crates/fhir/tests/data/json/R4/codesystem-claim-informationcategory.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-claim-informationcategory.json rename to crates/fhir/tests/data/json/R4/codesystem-claim-informationcategory.json diff --git a/crates/fhir/tests/data/R4/codesystem-claim-modifiers.json b/crates/fhir/tests/data/json/R4/codesystem-claim-modifiers.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-claim-modifiers.json rename to crates/fhir/tests/data/json/R4/codesystem-claim-modifiers.json diff --git a/crates/fhir/tests/data/R4/codesystem-claim-subtype.json b/crates/fhir/tests/data/json/R4/codesystem-claim-subtype.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-claim-subtype.json rename to crates/fhir/tests/data/json/R4/codesystem-claim-subtype.json diff --git a/crates/fhir/tests/data/R4/codesystem-claim-type.json b/crates/fhir/tests/data/json/R4/codesystem-claim-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-claim-type.json rename to crates/fhir/tests/data/json/R4/codesystem-claim-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-claim-use.json b/crates/fhir/tests/data/json/R4/codesystem-claim-use.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-claim-use.json rename to crates/fhir/tests/data/json/R4/codesystem-claim-use.json diff --git a/crates/fhir/tests/data/R4/codesystem-code-search-support.json b/crates/fhir/tests/data/json/R4/codesystem-code-search-support.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-code-search-support.json rename to crates/fhir/tests/data/json/R4/codesystem-code-search-support.json diff --git a/crates/fhir/tests/data/R4/codesystem-codesystem-altcode-kind.json b/crates/fhir/tests/data/json/R4/codesystem-codesystem-altcode-kind.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-codesystem-altcode-kind.json rename to crates/fhir/tests/data/json/R4/codesystem-codesystem-altcode-kind.json diff --git a/crates/fhir/tests/data/R4/codesystem-codesystem-content-mode.json b/crates/fhir/tests/data/json/R4/codesystem-codesystem-content-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-codesystem-content-mode.json rename to crates/fhir/tests/data/json/R4/codesystem-codesystem-content-mode.json diff --git a/crates/fhir/tests/data/R4/codesystem-codesystem-hierarchy-meaning.json b/crates/fhir/tests/data/json/R4/codesystem-codesystem-hierarchy-meaning.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-codesystem-hierarchy-meaning.json rename to crates/fhir/tests/data/json/R4/codesystem-codesystem-hierarchy-meaning.json diff --git a/crates/fhir/tests/data/R4/codesystem-common-tags.json b/crates/fhir/tests/data/json/R4/codesystem-common-tags.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-common-tags.json rename to crates/fhir/tests/data/json/R4/codesystem-common-tags.json diff --git a/crates/fhir/tests/data/R4/codesystem-communication-category.json b/crates/fhir/tests/data/json/R4/codesystem-communication-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-communication-category.json rename to crates/fhir/tests/data/json/R4/codesystem-communication-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-communication-not-done-reason.json b/crates/fhir/tests/data/json/R4/codesystem-communication-not-done-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-communication-not-done-reason.json rename to crates/fhir/tests/data/json/R4/codesystem-communication-not-done-reason.json diff --git a/crates/fhir/tests/data/R4/codesystem-communication-topic.json b/crates/fhir/tests/data/json/R4/codesystem-communication-topic.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-communication-topic.json rename to crates/fhir/tests/data/json/R4/codesystem-communication-topic.json diff --git a/crates/fhir/tests/data/R4/codesystem-compartment-type.json b/crates/fhir/tests/data/json/R4/codesystem-compartment-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-compartment-type.json rename to crates/fhir/tests/data/json/R4/codesystem-compartment-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-composite-measure-scoring.json b/crates/fhir/tests/data/json/R4/codesystem-composite-measure-scoring.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-composite-measure-scoring.json rename to crates/fhir/tests/data/json/R4/codesystem-composite-measure-scoring.json diff --git a/crates/fhir/tests/data/R4/codesystem-composition-altcode-kind.json b/crates/fhir/tests/data/json/R4/codesystem-composition-altcode-kind.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-composition-altcode-kind.json rename to crates/fhir/tests/data/json/R4/codesystem-composition-altcode-kind.json diff --git a/crates/fhir/tests/data/R4/codesystem-composition-attestation-mode.json b/crates/fhir/tests/data/json/R4/codesystem-composition-attestation-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-composition-attestation-mode.json rename to crates/fhir/tests/data/json/R4/codesystem-composition-attestation-mode.json diff --git a/crates/fhir/tests/data/R4/codesystem-composition-status.json b/crates/fhir/tests/data/json/R4/codesystem-composition-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-composition-status.json rename to crates/fhir/tests/data/json/R4/codesystem-composition-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-concept-map-equivalence.json b/crates/fhir/tests/data/json/R4/codesystem-concept-map-equivalence.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-concept-map-equivalence.json rename to crates/fhir/tests/data/json/R4/codesystem-concept-map-equivalence.json diff --git a/crates/fhir/tests/data/R4/codesystem-concept-properties.json b/crates/fhir/tests/data/json/R4/codesystem-concept-properties.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-concept-properties.json rename to crates/fhir/tests/data/json/R4/codesystem-concept-properties.json diff --git a/crates/fhir/tests/data/R4/codesystem-concept-property-type.json b/crates/fhir/tests/data/json/R4/codesystem-concept-property-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-concept-property-type.json rename to crates/fhir/tests/data/json/R4/codesystem-concept-property-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-concept-subsumption-outcome.json b/crates/fhir/tests/data/json/R4/codesystem-concept-subsumption-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-concept-subsumption-outcome.json rename to crates/fhir/tests/data/json/R4/codesystem-concept-subsumption-outcome.json diff --git a/crates/fhir/tests/data/R4/codesystem-conceptmap-unmapped-mode.json b/crates/fhir/tests/data/json/R4/codesystem-conceptmap-unmapped-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-conceptmap-unmapped-mode.json rename to crates/fhir/tests/data/json/R4/codesystem-conceptmap-unmapped-mode.json diff --git a/crates/fhir/tests/data/R4/codesystem-condition-category.json b/crates/fhir/tests/data/json/R4/codesystem-condition-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-condition-category.json rename to crates/fhir/tests/data/json/R4/codesystem-condition-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-condition-clinical.json b/crates/fhir/tests/data/json/R4/codesystem-condition-clinical.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-condition-clinical.json rename to crates/fhir/tests/data/json/R4/codesystem-condition-clinical.json diff --git a/crates/fhir/tests/data/R4/codesystem-condition-state.json b/crates/fhir/tests/data/json/R4/codesystem-condition-state.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-condition-state.json rename to crates/fhir/tests/data/json/R4/codesystem-condition-state.json diff --git a/crates/fhir/tests/data/R4/codesystem-condition-ver-status.json b/crates/fhir/tests/data/json/R4/codesystem-condition-ver-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-condition-ver-status.json rename to crates/fhir/tests/data/json/R4/codesystem-condition-ver-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-conditional-delete-status.json b/crates/fhir/tests/data/json/R4/codesystem-conditional-delete-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-conditional-delete-status.json rename to crates/fhir/tests/data/json/R4/codesystem-conditional-delete-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-conditional-read-status.json b/crates/fhir/tests/data/json/R4/codesystem-conditional-read-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-conditional-read-status.json rename to crates/fhir/tests/data/json/R4/codesystem-conditional-read-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-conformance-expectation.json b/crates/fhir/tests/data/json/R4/codesystem-conformance-expectation.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-conformance-expectation.json rename to crates/fhir/tests/data/json/R4/codesystem-conformance-expectation.json diff --git a/crates/fhir/tests/data/R4/codesystem-consent-action.json b/crates/fhir/tests/data/json/R4/codesystem-consent-action.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-consent-action.json rename to crates/fhir/tests/data/json/R4/codesystem-consent-action.json diff --git a/crates/fhir/tests/data/R4/codesystem-consent-category.json b/crates/fhir/tests/data/json/R4/codesystem-consent-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-consent-category.json rename to crates/fhir/tests/data/json/R4/codesystem-consent-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-consent-data-meaning.json b/crates/fhir/tests/data/json/R4/codesystem-consent-data-meaning.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-consent-data-meaning.json rename to crates/fhir/tests/data/json/R4/codesystem-consent-data-meaning.json diff --git a/crates/fhir/tests/data/R4/codesystem-consent-performer.json b/crates/fhir/tests/data/json/R4/codesystem-consent-performer.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-consent-performer.json rename to crates/fhir/tests/data/json/R4/codesystem-consent-performer.json diff --git a/crates/fhir/tests/data/R4/codesystem-consent-policy.json b/crates/fhir/tests/data/json/R4/codesystem-consent-policy.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-consent-policy.json rename to crates/fhir/tests/data/json/R4/codesystem-consent-policy.json diff --git a/crates/fhir/tests/data/R4/codesystem-consent-provision-type.json b/crates/fhir/tests/data/json/R4/codesystem-consent-provision-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-consent-provision-type.json rename to crates/fhir/tests/data/json/R4/codesystem-consent-provision-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-consent-scope.json b/crates/fhir/tests/data/json/R4/codesystem-consent-scope.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-consent-scope.json rename to crates/fhir/tests/data/json/R4/codesystem-consent-scope.json diff --git a/crates/fhir/tests/data/R4/codesystem-consent-state-codes.json b/crates/fhir/tests/data/json/R4/codesystem-consent-state-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-consent-state-codes.json rename to crates/fhir/tests/data/json/R4/codesystem-consent-state-codes.json diff --git a/crates/fhir/tests/data/R4/codesystem-constraint-severity.json b/crates/fhir/tests/data/json/R4/codesystem-constraint-severity.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-constraint-severity.json rename to crates/fhir/tests/data/json/R4/codesystem-constraint-severity.json diff --git a/crates/fhir/tests/data/R4/codesystem-contact-point-system.json b/crates/fhir/tests/data/json/R4/codesystem-contact-point-system.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contact-point-system.json rename to crates/fhir/tests/data/json/R4/codesystem-contact-point-system.json diff --git a/crates/fhir/tests/data/R4/codesystem-contact-point-use.json b/crates/fhir/tests/data/json/R4/codesystem-contact-point-use.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contact-point-use.json rename to crates/fhir/tests/data/json/R4/codesystem-contact-point-use.json diff --git a/crates/fhir/tests/data/R4/codesystem-contactentity-type.json b/crates/fhir/tests/data/json/R4/codesystem-contactentity-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contactentity-type.json rename to crates/fhir/tests/data/json/R4/codesystem-contactentity-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-container-cap.json b/crates/fhir/tests/data/json/R4/codesystem-container-cap.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-container-cap.json rename to crates/fhir/tests/data/json/R4/codesystem-container-cap.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-action.json b/crates/fhir/tests/data/json/R4/codesystem-contract-action.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-action.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-action.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-actionstatus.json b/crates/fhir/tests/data/json/R4/codesystem-contract-actionstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-actionstatus.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-actionstatus.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-actorrole.json b/crates/fhir/tests/data/json/R4/codesystem-contract-actorrole.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-actorrole.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-actorrole.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-assetcontext.json b/crates/fhir/tests/data/json/R4/codesystem-contract-assetcontext.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-assetcontext.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-assetcontext.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-assetscope.json b/crates/fhir/tests/data/json/R4/codesystem-contract-assetscope.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-assetscope.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-assetscope.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-assetsubtype.json b/crates/fhir/tests/data/json/R4/codesystem-contract-assetsubtype.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-assetsubtype.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-assetsubtype.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-assettype.json b/crates/fhir/tests/data/json/R4/codesystem-contract-assettype.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-assettype.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-assettype.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-content-derivative.json b/crates/fhir/tests/data/json/R4/codesystem-contract-content-derivative.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-content-derivative.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-content-derivative.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-data-meaning.json b/crates/fhir/tests/data/json/R4/codesystem-contract-data-meaning.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-data-meaning.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-data-meaning.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-decision-mode.json b/crates/fhir/tests/data/json/R4/codesystem-contract-decision-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-decision-mode.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-decision-mode.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-definition-subtype.json b/crates/fhir/tests/data/json/R4/codesystem-contract-definition-subtype.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-definition-subtype.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-definition-subtype.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-definition-type.json b/crates/fhir/tests/data/json/R4/codesystem-contract-definition-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-definition-type.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-definition-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-expiration-type.json b/crates/fhir/tests/data/json/R4/codesystem-contract-expiration-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-expiration-type.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-expiration-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-legalstate.json b/crates/fhir/tests/data/json/R4/codesystem-contract-legalstate.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-legalstate.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-legalstate.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-party-role.json b/crates/fhir/tests/data/json/R4/codesystem-contract-party-role.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-party-role.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-party-role.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-publicationstatus.json b/crates/fhir/tests/data/json/R4/codesystem-contract-publicationstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-publicationstatus.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-publicationstatus.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-scope.json b/crates/fhir/tests/data/json/R4/codesystem-contract-scope.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-scope.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-scope.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-security-category.json b/crates/fhir/tests/data/json/R4/codesystem-contract-security-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-security-category.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-security-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-security-classification.json b/crates/fhir/tests/data/json/R4/codesystem-contract-security-classification.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-security-classification.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-security-classification.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-security-control.json b/crates/fhir/tests/data/json/R4/codesystem-contract-security-control.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-security-control.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-security-control.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-signer-type.json b/crates/fhir/tests/data/json/R4/codesystem-contract-signer-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-signer-type.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-signer-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-status.json b/crates/fhir/tests/data/json/R4/codesystem-contract-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-status.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-subtype.json b/crates/fhir/tests/data/json/R4/codesystem-contract-subtype.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-subtype.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-subtype.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-term-subtype.json b/crates/fhir/tests/data/json/R4/codesystem-contract-term-subtype.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-term-subtype.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-term-subtype.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-term-type.json b/crates/fhir/tests/data/json/R4/codesystem-contract-term-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-term-type.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-term-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-contract-type.json b/crates/fhir/tests/data/json/R4/codesystem-contract-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contract-type.json rename to crates/fhir/tests/data/json/R4/codesystem-contract-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-contributor-type.json b/crates/fhir/tests/data/json/R4/codesystem-contributor-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-contributor-type.json rename to crates/fhir/tests/data/json/R4/codesystem-contributor-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-copy-number-event.json b/crates/fhir/tests/data/json/R4/codesystem-copy-number-event.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-copy-number-event.json rename to crates/fhir/tests/data/json/R4/codesystem-copy-number-event.json diff --git a/crates/fhir/tests/data/R4/codesystem-coverage-class.json b/crates/fhir/tests/data/json/R4/codesystem-coverage-class.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-coverage-class.json rename to crates/fhir/tests/data/json/R4/codesystem-coverage-class.json diff --git a/crates/fhir/tests/data/R4/codesystem-coverage-copay-type.json b/crates/fhir/tests/data/json/R4/codesystem-coverage-copay-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-coverage-copay-type.json rename to crates/fhir/tests/data/json/R4/codesystem-coverage-copay-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-coverage-financial-exception.json b/crates/fhir/tests/data/json/R4/codesystem-coverage-financial-exception.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-coverage-financial-exception.json rename to crates/fhir/tests/data/json/R4/codesystem-coverage-financial-exception.json diff --git a/crates/fhir/tests/data/R4/codesystem-coverage-selfpay.json b/crates/fhir/tests/data/json/R4/codesystem-coverage-selfpay.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-coverage-selfpay.json rename to crates/fhir/tests/data/json/R4/codesystem-coverage-selfpay.json diff --git a/crates/fhir/tests/data/R4/codesystem-coverageeligibilityresponse-ex-auth-support.json b/crates/fhir/tests/data/json/R4/codesystem-coverageeligibilityresponse-ex-auth-support.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-coverageeligibilityresponse-ex-auth-support.json rename to crates/fhir/tests/data/json/R4/codesystem-coverageeligibilityresponse-ex-auth-support.json diff --git a/crates/fhir/tests/data/R4/codesystem-data-absent-reason.json b/crates/fhir/tests/data/json/R4/codesystem-data-absent-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-data-absent-reason.json rename to crates/fhir/tests/data/json/R4/codesystem-data-absent-reason.json diff --git a/crates/fhir/tests/data/R4/codesystem-data-types.json b/crates/fhir/tests/data/json/R4/codesystem-data-types.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-data-types.json rename to crates/fhir/tests/data/json/R4/codesystem-data-types.json diff --git a/crates/fhir/tests/data/R4/codesystem-days-of-week.json b/crates/fhir/tests/data/json/R4/codesystem-days-of-week.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-days-of-week.json rename to crates/fhir/tests/data/json/R4/codesystem-days-of-week.json diff --git a/crates/fhir/tests/data/R4/codesystem-definition-resource-types.json b/crates/fhir/tests/data/json/R4/codesystem-definition-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-definition-resource-types.json rename to crates/fhir/tests/data/json/R4/codesystem-definition-resource-types.json diff --git a/crates/fhir/tests/data/R4/codesystem-definition-status.json b/crates/fhir/tests/data/json/R4/codesystem-definition-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-definition-status.json rename to crates/fhir/tests/data/json/R4/codesystem-definition-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-definition-topic.json b/crates/fhir/tests/data/json/R4/codesystem-definition-topic.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-definition-topic.json rename to crates/fhir/tests/data/json/R4/codesystem-definition-topic.json diff --git a/crates/fhir/tests/data/R4/codesystem-definition-use.json b/crates/fhir/tests/data/json/R4/codesystem-definition-use.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-definition-use.json rename to crates/fhir/tests/data/json/R4/codesystem-definition-use.json diff --git a/crates/fhir/tests/data/R4/codesystem-detectedissue-severity.json b/crates/fhir/tests/data/json/R4/codesystem-detectedissue-severity.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-detectedissue-severity.json rename to crates/fhir/tests/data/json/R4/codesystem-detectedissue-severity.json diff --git a/crates/fhir/tests/data/R4/codesystem-device-action.json b/crates/fhir/tests/data/json/R4/codesystem-device-action.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-device-action.json rename to crates/fhir/tests/data/json/R4/codesystem-device-action.json diff --git a/crates/fhir/tests/data/R4/codesystem-device-definition-status.json b/crates/fhir/tests/data/json/R4/codesystem-device-definition-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-device-definition-status.json rename to crates/fhir/tests/data/json/R4/codesystem-device-definition-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-device-nametype.json b/crates/fhir/tests/data/json/R4/codesystem-device-nametype.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-device-nametype.json rename to crates/fhir/tests/data/json/R4/codesystem-device-nametype.json diff --git a/crates/fhir/tests/data/R4/codesystem-device-statement-status.json b/crates/fhir/tests/data/json/R4/codesystem-device-statement-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-device-statement-status.json rename to crates/fhir/tests/data/json/R4/codesystem-device-statement-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-device-status-reason.json b/crates/fhir/tests/data/json/R4/codesystem-device-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-device-status-reason.json rename to crates/fhir/tests/data/json/R4/codesystem-device-status-reason.json diff --git a/crates/fhir/tests/data/R4/codesystem-device-status.json b/crates/fhir/tests/data/json/R4/codesystem-device-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-device-status.json rename to crates/fhir/tests/data/json/R4/codesystem-device-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-diagnosis-role.json b/crates/fhir/tests/data/json/R4/codesystem-diagnosis-role.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-diagnosis-role.json rename to crates/fhir/tests/data/json/R4/codesystem-diagnosis-role.json diff --git a/crates/fhir/tests/data/R4/codesystem-diagnostic-report-status.json b/crates/fhir/tests/data/json/R4/codesystem-diagnostic-report-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-diagnostic-report-status.json rename to crates/fhir/tests/data/json/R4/codesystem-diagnostic-report-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-dicom-audit-lifecycle.json b/crates/fhir/tests/data/json/R4/codesystem-dicom-audit-lifecycle.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-dicom-audit-lifecycle.json rename to crates/fhir/tests/data/json/R4/codesystem-dicom-audit-lifecycle.json diff --git a/crates/fhir/tests/data/R4/codesystem-dicom-dcim.json b/crates/fhir/tests/data/json/R4/codesystem-dicom-dcim.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-dicom-dcim.json rename to crates/fhir/tests/data/json/R4/codesystem-dicom-dcim.json diff --git a/crates/fhir/tests/data/R4/codesystem-discriminator-type.json b/crates/fhir/tests/data/json/R4/codesystem-discriminator-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-discriminator-type.json rename to crates/fhir/tests/data/json/R4/codesystem-discriminator-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-document-mode.json b/crates/fhir/tests/data/json/R4/codesystem-document-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-document-mode.json rename to crates/fhir/tests/data/json/R4/codesystem-document-mode.json diff --git a/crates/fhir/tests/data/R4/codesystem-document-reference-status.json b/crates/fhir/tests/data/json/R4/codesystem-document-reference-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-document-reference-status.json rename to crates/fhir/tests/data/json/R4/codesystem-document-reference-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-document-relationship-type.json b/crates/fhir/tests/data/json/R4/codesystem-document-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-document-relationship-type.json rename to crates/fhir/tests/data/json/R4/codesystem-document-relationship-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-dose-rate-type.json b/crates/fhir/tests/data/json/R4/codesystem-dose-rate-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-dose-rate-type.json rename to crates/fhir/tests/data/json/R4/codesystem-dose-rate-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-effect-estimate-type.json b/crates/fhir/tests/data/json/R4/codesystem-effect-estimate-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-effect-estimate-type.json rename to crates/fhir/tests/data/json/R4/codesystem-effect-estimate-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-eligibilityrequest-purpose.json b/crates/fhir/tests/data/json/R4/codesystem-eligibilityrequest-purpose.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-eligibilityrequest-purpose.json rename to crates/fhir/tests/data/json/R4/codesystem-eligibilityrequest-purpose.json diff --git a/crates/fhir/tests/data/R4/codesystem-eligibilityresponse-purpose.json b/crates/fhir/tests/data/json/R4/codesystem-eligibilityresponse-purpose.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-eligibilityresponse-purpose.json rename to crates/fhir/tests/data/json/R4/codesystem-eligibilityresponse-purpose.json diff --git a/crates/fhir/tests/data/R4/codesystem-encounter-admit-source.json b/crates/fhir/tests/data/json/R4/codesystem-encounter-admit-source.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-encounter-admit-source.json rename to crates/fhir/tests/data/json/R4/codesystem-encounter-admit-source.json diff --git a/crates/fhir/tests/data/R4/codesystem-encounter-diet.json b/crates/fhir/tests/data/json/R4/codesystem-encounter-diet.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-encounter-diet.json rename to crates/fhir/tests/data/json/R4/codesystem-encounter-diet.json diff --git a/crates/fhir/tests/data/R4/codesystem-encounter-discharge-disposition.json b/crates/fhir/tests/data/json/R4/codesystem-encounter-discharge-disposition.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-encounter-discharge-disposition.json rename to crates/fhir/tests/data/json/R4/codesystem-encounter-discharge-disposition.json diff --git a/crates/fhir/tests/data/R4/codesystem-encounter-location-status.json b/crates/fhir/tests/data/json/R4/codesystem-encounter-location-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-encounter-location-status.json rename to crates/fhir/tests/data/json/R4/codesystem-encounter-location-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-encounter-participant-type.json b/crates/fhir/tests/data/json/R4/codesystem-encounter-participant-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-encounter-participant-type.json rename to crates/fhir/tests/data/json/R4/codesystem-encounter-participant-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-encounter-special-arrangements.json b/crates/fhir/tests/data/json/R4/codesystem-encounter-special-arrangements.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-encounter-special-arrangements.json rename to crates/fhir/tests/data/json/R4/codesystem-encounter-special-arrangements.json diff --git a/crates/fhir/tests/data/R4/codesystem-encounter-status.json b/crates/fhir/tests/data/json/R4/codesystem-encounter-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-encounter-status.json rename to crates/fhir/tests/data/json/R4/codesystem-encounter-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-encounter-type.json b/crates/fhir/tests/data/json/R4/codesystem-encounter-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-encounter-type.json rename to crates/fhir/tests/data/json/R4/codesystem-encounter-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-endpoint-connection-type.json b/crates/fhir/tests/data/json/R4/codesystem-endpoint-connection-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-endpoint-connection-type.json rename to crates/fhir/tests/data/json/R4/codesystem-endpoint-connection-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-endpoint-payload-type.json b/crates/fhir/tests/data/json/R4/codesystem-endpoint-payload-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-endpoint-payload-type.json rename to crates/fhir/tests/data/json/R4/codesystem-endpoint-payload-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-endpoint-status.json b/crates/fhir/tests/data/json/R4/codesystem-endpoint-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-endpoint-status.json rename to crates/fhir/tests/data/json/R4/codesystem-endpoint-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-entformula-additive.json b/crates/fhir/tests/data/json/R4/codesystem-entformula-additive.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-entformula-additive.json rename to crates/fhir/tests/data/json/R4/codesystem-entformula-additive.json diff --git a/crates/fhir/tests/data/R4/codesystem-episode-of-care-status.json b/crates/fhir/tests/data/json/R4/codesystem-episode-of-care-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-episode-of-care-status.json rename to crates/fhir/tests/data/json/R4/codesystem-episode-of-care-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-episodeofcare-type.json b/crates/fhir/tests/data/json/R4/codesystem-episodeofcare-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-episodeofcare-type.json rename to crates/fhir/tests/data/json/R4/codesystem-episodeofcare-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-event-capability-mode.json b/crates/fhir/tests/data/json/R4/codesystem-event-capability-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-event-capability-mode.json rename to crates/fhir/tests/data/json/R4/codesystem-event-capability-mode.json diff --git a/crates/fhir/tests/data/R4/codesystem-event-resource-types.json b/crates/fhir/tests/data/json/R4/codesystem-event-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-event-resource-types.json rename to crates/fhir/tests/data/json/R4/codesystem-event-resource-types.json diff --git a/crates/fhir/tests/data/R4/codesystem-event-status.json b/crates/fhir/tests/data/json/R4/codesystem-event-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-event-status.json rename to crates/fhir/tests/data/json/R4/codesystem-event-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-event-timing.json b/crates/fhir/tests/data/json/R4/codesystem-event-timing.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-event-timing.json rename to crates/fhir/tests/data/json/R4/codesystem-event-timing.json diff --git a/crates/fhir/tests/data/R4/codesystem-evidence-quality.json b/crates/fhir/tests/data/json/R4/codesystem-evidence-quality.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-evidence-quality.json rename to crates/fhir/tests/data/json/R4/codesystem-evidence-quality.json diff --git a/crates/fhir/tests/data/R4/codesystem-evidence-variant-state.json b/crates/fhir/tests/data/json/R4/codesystem-evidence-variant-state.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-evidence-variant-state.json rename to crates/fhir/tests/data/json/R4/codesystem-evidence-variant-state.json diff --git a/crates/fhir/tests/data/R4/codesystem-ex-benefitcategory.json b/crates/fhir/tests/data/json/R4/codesystem-ex-benefitcategory.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-ex-benefitcategory.json rename to crates/fhir/tests/data/json/R4/codesystem-ex-benefitcategory.json diff --git a/crates/fhir/tests/data/R4/codesystem-ex-diagnosis-on-admission.json b/crates/fhir/tests/data/json/R4/codesystem-ex-diagnosis-on-admission.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-ex-diagnosis-on-admission.json rename to crates/fhir/tests/data/json/R4/codesystem-ex-diagnosis-on-admission.json diff --git a/crates/fhir/tests/data/R4/codesystem-ex-diagnosisrelatedgroup.json b/crates/fhir/tests/data/json/R4/codesystem-ex-diagnosisrelatedgroup.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-ex-diagnosisrelatedgroup.json rename to crates/fhir/tests/data/json/R4/codesystem-ex-diagnosisrelatedgroup.json diff --git a/crates/fhir/tests/data/R4/codesystem-ex-diagnosistype.json b/crates/fhir/tests/data/json/R4/codesystem-ex-diagnosistype.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-ex-diagnosistype.json rename to crates/fhir/tests/data/json/R4/codesystem-ex-diagnosistype.json diff --git a/crates/fhir/tests/data/R4/codesystem-ex-onsettype.json b/crates/fhir/tests/data/json/R4/codesystem-ex-onsettype.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-ex-onsettype.json rename to crates/fhir/tests/data/json/R4/codesystem-ex-onsettype.json diff --git a/crates/fhir/tests/data/R4/codesystem-ex-payee-resource-type.json b/crates/fhir/tests/data/json/R4/codesystem-ex-payee-resource-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-ex-payee-resource-type.json rename to crates/fhir/tests/data/json/R4/codesystem-ex-payee-resource-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-ex-paymenttype.json b/crates/fhir/tests/data/json/R4/codesystem-ex-paymenttype.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-ex-paymenttype.json rename to crates/fhir/tests/data/json/R4/codesystem-ex-paymenttype.json diff --git a/crates/fhir/tests/data/R4/codesystem-ex-procedure-type.json b/crates/fhir/tests/data/json/R4/codesystem-ex-procedure-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-ex-procedure-type.json rename to crates/fhir/tests/data/json/R4/codesystem-ex-procedure-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-ex-program-code.json b/crates/fhir/tests/data/json/R4/codesystem-ex-program-code.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-ex-program-code.json rename to crates/fhir/tests/data/json/R4/codesystem-ex-program-code.json diff --git a/crates/fhir/tests/data/R4/codesystem-ex-revenue-center.json b/crates/fhir/tests/data/json/R4/codesystem-ex-revenue-center.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-ex-revenue-center.json rename to crates/fhir/tests/data/json/R4/codesystem-ex-revenue-center.json diff --git a/crates/fhir/tests/data/R4/codesystem-example-summary.json b/crates/fhir/tests/data/json/R4/codesystem-example-summary.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-example-summary.json rename to crates/fhir/tests/data/json/R4/codesystem-example-summary.json diff --git a/crates/fhir/tests/data/R4/codesystem-example-supplement.json b/crates/fhir/tests/data/json/R4/codesystem-example-supplement.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-example-supplement.json rename to crates/fhir/tests/data/json/R4/codesystem-example-supplement.json diff --git a/crates/fhir/tests/data/R4/codesystem-example.json b/crates/fhir/tests/data/json/R4/codesystem-example.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-example.json rename to crates/fhir/tests/data/json/R4/codesystem-example.json diff --git a/crates/fhir/tests/data/R4/codesystem-examplescenario-actor-type.json b/crates/fhir/tests/data/json/R4/codesystem-examplescenario-actor-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-examplescenario-actor-type.json rename to crates/fhir/tests/data/json/R4/codesystem-examplescenario-actor-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-expansion-parameter-source.json b/crates/fhir/tests/data/json/R4/codesystem-expansion-parameter-source.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-expansion-parameter-source.json rename to crates/fhir/tests/data/json/R4/codesystem-expansion-parameter-source.json diff --git a/crates/fhir/tests/data/R4/codesystem-expansion-processing-rule.json b/crates/fhir/tests/data/json/R4/codesystem-expansion-processing-rule.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-expansion-processing-rule.json rename to crates/fhir/tests/data/json/R4/codesystem-expansion-processing-rule.json diff --git a/crates/fhir/tests/data/R4/codesystem-explanationofbenefit-status.json b/crates/fhir/tests/data/json/R4/codesystem-explanationofbenefit-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-explanationofbenefit-status.json rename to crates/fhir/tests/data/json/R4/codesystem-explanationofbenefit-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-exposure-state.json b/crates/fhir/tests/data/json/R4/codesystem-exposure-state.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-exposure-state.json rename to crates/fhir/tests/data/json/R4/codesystem-exposure-state.json diff --git a/crates/fhir/tests/data/R4/codesystem-expression-language.json b/crates/fhir/tests/data/json/R4/codesystem-expression-language.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-expression-language.json rename to crates/fhir/tests/data/json/R4/codesystem-expression-language.json diff --git a/crates/fhir/tests/data/R4/codesystem-extension-context-type.json b/crates/fhir/tests/data/json/R4/codesystem-extension-context-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-extension-context-type.json rename to crates/fhir/tests/data/json/R4/codesystem-extension-context-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-extensions-CodeSystem-author.json b/crates/fhir/tests/data/json/R4/codesystem-extensions-CodeSystem-author.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-extensions-CodeSystem-author.json rename to crates/fhir/tests/data/json/R4/codesystem-extensions-CodeSystem-author.json diff --git a/crates/fhir/tests/data/R4/codesystem-extensions-CodeSystem-effective.json b/crates/fhir/tests/data/json/R4/codesystem-extensions-CodeSystem-effective.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-extensions-CodeSystem-effective.json rename to crates/fhir/tests/data/json/R4/codesystem-extensions-CodeSystem-effective.json diff --git a/crates/fhir/tests/data/R4/codesystem-extensions-CodeSystem-end.json b/crates/fhir/tests/data/json/R4/codesystem-extensions-CodeSystem-end.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-extensions-CodeSystem-end.json rename to crates/fhir/tests/data/json/R4/codesystem-extensions-CodeSystem-end.json diff --git a/crates/fhir/tests/data/R4/codesystem-extensions-CodeSystem-keyword.json b/crates/fhir/tests/data/json/R4/codesystem-extensions-CodeSystem-keyword.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-extensions-CodeSystem-keyword.json rename to crates/fhir/tests/data/json/R4/codesystem-extensions-CodeSystem-keyword.json diff --git a/crates/fhir/tests/data/R4/codesystem-extensions-CodeSystem-workflow.json b/crates/fhir/tests/data/json/R4/codesystem-extensions-CodeSystem-workflow.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-extensions-CodeSystem-workflow.json rename to crates/fhir/tests/data/json/R4/codesystem-extensions-CodeSystem-workflow.json diff --git a/crates/fhir/tests/data/R4/codesystem-extra-activity-type.json b/crates/fhir/tests/data/json/R4/codesystem-extra-activity-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-extra-activity-type.json rename to crates/fhir/tests/data/json/R4/codesystem-extra-activity-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-extra-security-role-type.json b/crates/fhir/tests/data/json/R4/codesystem-extra-security-role-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-extra-security-role-type.json rename to crates/fhir/tests/data/json/R4/codesystem-extra-security-role-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-feeding-device.json b/crates/fhir/tests/data/json/R4/codesystem-feeding-device.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-feeding-device.json rename to crates/fhir/tests/data/json/R4/codesystem-feeding-device.json diff --git a/crates/fhir/tests/data/R4/codesystem-filter-operator.json b/crates/fhir/tests/data/json/R4/codesystem-filter-operator.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-filter-operator.json rename to crates/fhir/tests/data/json/R4/codesystem-filter-operator.json diff --git a/crates/fhir/tests/data/R4/codesystem-financial-taskcode.json b/crates/fhir/tests/data/json/R4/codesystem-financial-taskcode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-financial-taskcode.json rename to crates/fhir/tests/data/json/R4/codesystem-financial-taskcode.json diff --git a/crates/fhir/tests/data/R4/codesystem-financial-taskinputtype.json b/crates/fhir/tests/data/json/R4/codesystem-financial-taskinputtype.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-financial-taskinputtype.json rename to crates/fhir/tests/data/json/R4/codesystem-financial-taskinputtype.json diff --git a/crates/fhir/tests/data/R4/codesystem-flag-category.json b/crates/fhir/tests/data/json/R4/codesystem-flag-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-flag-category.json rename to crates/fhir/tests/data/json/R4/codesystem-flag-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-flag-priority.json b/crates/fhir/tests/data/json/R4/codesystem-flag-priority.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-flag-priority.json rename to crates/fhir/tests/data/json/R4/codesystem-flag-priority.json diff --git a/crates/fhir/tests/data/R4/codesystem-flag-status.json b/crates/fhir/tests/data/json/R4/codesystem-flag-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-flag-status.json rename to crates/fhir/tests/data/json/R4/codesystem-flag-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-fm-conditions.json b/crates/fhir/tests/data/json/R4/codesystem-fm-conditions.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-fm-conditions.json rename to crates/fhir/tests/data/json/R4/codesystem-fm-conditions.json diff --git a/crates/fhir/tests/data/R4/codesystem-fm-itemtype.json b/crates/fhir/tests/data/json/R4/codesystem-fm-itemtype.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-fm-itemtype.json rename to crates/fhir/tests/data/json/R4/codesystem-fm-itemtype.json diff --git a/crates/fhir/tests/data/R4/codesystem-fm-status.json b/crates/fhir/tests/data/json/R4/codesystem-fm-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-fm-status.json rename to crates/fhir/tests/data/json/R4/codesystem-fm-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-forms.json b/crates/fhir/tests/data/json/R4/codesystem-forms.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-forms.json rename to crates/fhir/tests/data/json/R4/codesystem-forms.json diff --git a/crates/fhir/tests/data/R4/codesystem-fundsreserve.json b/crates/fhir/tests/data/json/R4/codesystem-fundsreserve.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-fundsreserve.json rename to crates/fhir/tests/data/json/R4/codesystem-fundsreserve.json diff --git a/crates/fhir/tests/data/R4/codesystem-gender-identity.json b/crates/fhir/tests/data/json/R4/codesystem-gender-identity.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-gender-identity.json rename to crates/fhir/tests/data/json/R4/codesystem-gender-identity.json diff --git a/crates/fhir/tests/data/R4/codesystem-goal-acceptance-status.json b/crates/fhir/tests/data/json/R4/codesystem-goal-acceptance-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-goal-acceptance-status.json rename to crates/fhir/tests/data/json/R4/codesystem-goal-acceptance-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-goal-achievement.json b/crates/fhir/tests/data/json/R4/codesystem-goal-achievement.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-goal-achievement.json rename to crates/fhir/tests/data/json/R4/codesystem-goal-achievement.json diff --git a/crates/fhir/tests/data/R4/codesystem-goal-category.json b/crates/fhir/tests/data/json/R4/codesystem-goal-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-goal-category.json rename to crates/fhir/tests/data/json/R4/codesystem-goal-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-goal-priority.json b/crates/fhir/tests/data/json/R4/codesystem-goal-priority.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-goal-priority.json rename to crates/fhir/tests/data/json/R4/codesystem-goal-priority.json diff --git a/crates/fhir/tests/data/R4/codesystem-goal-relationship-type.json b/crates/fhir/tests/data/json/R4/codesystem-goal-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-goal-relationship-type.json rename to crates/fhir/tests/data/json/R4/codesystem-goal-relationship-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-goal-status-reason.json b/crates/fhir/tests/data/json/R4/codesystem-goal-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-goal-status-reason.json rename to crates/fhir/tests/data/json/R4/codesystem-goal-status-reason.json diff --git a/crates/fhir/tests/data/R4/codesystem-goal-status.json b/crates/fhir/tests/data/json/R4/codesystem-goal-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-goal-status.json rename to crates/fhir/tests/data/json/R4/codesystem-goal-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-graph-compartment-rule.json b/crates/fhir/tests/data/json/R4/codesystem-graph-compartment-rule.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-graph-compartment-rule.json rename to crates/fhir/tests/data/json/R4/codesystem-graph-compartment-rule.json diff --git a/crates/fhir/tests/data/R4/codesystem-graph-compartment-use.json b/crates/fhir/tests/data/json/R4/codesystem-graph-compartment-use.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-graph-compartment-use.json rename to crates/fhir/tests/data/json/R4/codesystem-graph-compartment-use.json diff --git a/crates/fhir/tests/data/R4/codesystem-group-measure.json b/crates/fhir/tests/data/json/R4/codesystem-group-measure.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-group-measure.json rename to crates/fhir/tests/data/json/R4/codesystem-group-measure.json diff --git a/crates/fhir/tests/data/R4/codesystem-group-type.json b/crates/fhir/tests/data/json/R4/codesystem-group-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-group-type.json rename to crates/fhir/tests/data/json/R4/codesystem-group-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-guidance-response-status.json b/crates/fhir/tests/data/json/R4/codesystem-guidance-response-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-guidance-response-status.json rename to crates/fhir/tests/data/json/R4/codesystem-guidance-response-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-guide-page-generation.json b/crates/fhir/tests/data/json/R4/codesystem-guide-page-generation.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-guide-page-generation.json rename to crates/fhir/tests/data/json/R4/codesystem-guide-page-generation.json diff --git a/crates/fhir/tests/data/R4/codesystem-guide-parameter-code.json b/crates/fhir/tests/data/json/R4/codesystem-guide-parameter-code.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-guide-parameter-code.json rename to crates/fhir/tests/data/json/R4/codesystem-guide-parameter-code.json diff --git a/crates/fhir/tests/data/R4/codesystem-handling-condition.json b/crates/fhir/tests/data/json/R4/codesystem-handling-condition.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-handling-condition.json rename to crates/fhir/tests/data/json/R4/codesystem-handling-condition.json diff --git a/crates/fhir/tests/data/R4/codesystem-history-absent-reason.json b/crates/fhir/tests/data/json/R4/codesystem-history-absent-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-history-absent-reason.json rename to crates/fhir/tests/data/json/R4/codesystem-history-absent-reason.json diff --git a/crates/fhir/tests/data/R4/codesystem-history-status.json b/crates/fhir/tests/data/json/R4/codesystem-history-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-history-status.json rename to crates/fhir/tests/data/json/R4/codesystem-history-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-hl7-work-group.json b/crates/fhir/tests/data/json/R4/codesystem-hl7-work-group.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-hl7-work-group.json rename to crates/fhir/tests/data/json/R4/codesystem-hl7-work-group.json diff --git a/crates/fhir/tests/data/R4/codesystem-http-operations.json b/crates/fhir/tests/data/json/R4/codesystem-http-operations.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-http-operations.json rename to crates/fhir/tests/data/json/R4/codesystem-http-operations.json diff --git a/crates/fhir/tests/data/R4/codesystem-http-verb.json b/crates/fhir/tests/data/json/R4/codesystem-http-verb.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-http-verb.json rename to crates/fhir/tests/data/json/R4/codesystem-http-verb.json diff --git a/crates/fhir/tests/data/R4/codesystem-icd-10-procedures.json b/crates/fhir/tests/data/json/R4/codesystem-icd-10-procedures.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-icd-10-procedures.json rename to crates/fhir/tests/data/json/R4/codesystem-icd-10-procedures.json diff --git a/crates/fhir/tests/data/R4/codesystem-identifier-use.json b/crates/fhir/tests/data/json/R4/codesystem-identifier-use.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-identifier-use.json rename to crates/fhir/tests/data/json/R4/codesystem-identifier-use.json diff --git a/crates/fhir/tests/data/R4/codesystem-identity-assuranceLevel.json b/crates/fhir/tests/data/json/R4/codesystem-identity-assuranceLevel.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-identity-assuranceLevel.json rename to crates/fhir/tests/data/json/R4/codesystem-identity-assuranceLevel.json diff --git a/crates/fhir/tests/data/R4/codesystem-imagingstudy-status.json b/crates/fhir/tests/data/json/R4/codesystem-imagingstudy-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-imagingstudy-status.json rename to crates/fhir/tests/data/json/R4/codesystem-imagingstudy-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-immunization-evaluation-dose-status-reason.json b/crates/fhir/tests/data/json/R4/codesystem-immunization-evaluation-dose-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-immunization-evaluation-dose-status-reason.json rename to crates/fhir/tests/data/json/R4/codesystem-immunization-evaluation-dose-status-reason.json diff --git a/crates/fhir/tests/data/R4/codesystem-immunization-evaluation-dose-status.json b/crates/fhir/tests/data/json/R4/codesystem-immunization-evaluation-dose-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-immunization-evaluation-dose-status.json rename to crates/fhir/tests/data/json/R4/codesystem-immunization-evaluation-dose-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-immunization-funding-source.json b/crates/fhir/tests/data/json/R4/codesystem-immunization-funding-source.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-immunization-funding-source.json rename to crates/fhir/tests/data/json/R4/codesystem-immunization-funding-source.json diff --git a/crates/fhir/tests/data/R4/codesystem-immunization-origin.json b/crates/fhir/tests/data/json/R4/codesystem-immunization-origin.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-immunization-origin.json rename to crates/fhir/tests/data/json/R4/codesystem-immunization-origin.json diff --git a/crates/fhir/tests/data/R4/codesystem-immunization-program-eligibility.json b/crates/fhir/tests/data/json/R4/codesystem-immunization-program-eligibility.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-immunization-program-eligibility.json rename to crates/fhir/tests/data/json/R4/codesystem-immunization-program-eligibility.json diff --git a/crates/fhir/tests/data/R4/codesystem-immunization-recommendation-status.json b/crates/fhir/tests/data/json/R4/codesystem-immunization-recommendation-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-immunization-recommendation-status.json rename to crates/fhir/tests/data/json/R4/codesystem-immunization-recommendation-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-immunization-subpotent-reason.json b/crates/fhir/tests/data/json/R4/codesystem-immunization-subpotent-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-immunization-subpotent-reason.json rename to crates/fhir/tests/data/json/R4/codesystem-immunization-subpotent-reason.json diff --git a/crates/fhir/tests/data/R4/codesystem-implantStatus.json b/crates/fhir/tests/data/json/R4/codesystem-implantStatus.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-implantStatus.json rename to crates/fhir/tests/data/json/R4/codesystem-implantStatus.json diff --git a/crates/fhir/tests/data/R4/codesystem-insuranceplan-applicability.json b/crates/fhir/tests/data/json/R4/codesystem-insuranceplan-applicability.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-insuranceplan-applicability.json rename to crates/fhir/tests/data/json/R4/codesystem-insuranceplan-applicability.json diff --git a/crates/fhir/tests/data/R4/codesystem-insuranceplan-type.json b/crates/fhir/tests/data/json/R4/codesystem-insuranceplan-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-insuranceplan-type.json rename to crates/fhir/tests/data/json/R4/codesystem-insuranceplan-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-intervention.json b/crates/fhir/tests/data/json/R4/codesystem-intervention.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-intervention.json rename to crates/fhir/tests/data/json/R4/codesystem-intervention.json diff --git a/crates/fhir/tests/data/R4/codesystem-invoice-priceComponentType.json b/crates/fhir/tests/data/json/R4/codesystem-invoice-priceComponentType.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-invoice-priceComponentType.json rename to crates/fhir/tests/data/json/R4/codesystem-invoice-priceComponentType.json diff --git a/crates/fhir/tests/data/R4/codesystem-invoice-status.json b/crates/fhir/tests/data/json/R4/codesystem-invoice-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-invoice-status.json rename to crates/fhir/tests/data/json/R4/codesystem-invoice-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-iso-21089-lifecycle.json b/crates/fhir/tests/data/json/R4/codesystem-iso-21089-lifecycle.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-iso-21089-lifecycle.json rename to crates/fhir/tests/data/json/R4/codesystem-iso-21089-lifecycle.json diff --git a/crates/fhir/tests/data/R4/codesystem-issue-severity.json b/crates/fhir/tests/data/json/R4/codesystem-issue-severity.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-issue-severity.json rename to crates/fhir/tests/data/json/R4/codesystem-issue-severity.json diff --git a/crates/fhir/tests/data/R4/codesystem-issue-type.json b/crates/fhir/tests/data/json/R4/codesystem-issue-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-issue-type.json rename to crates/fhir/tests/data/json/R4/codesystem-issue-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-item-type.json b/crates/fhir/tests/data/json/R4/codesystem-item-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-item-type.json rename to crates/fhir/tests/data/json/R4/codesystem-item-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-knowledge-resource-types.json b/crates/fhir/tests/data/json/R4/codesystem-knowledge-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-knowledge-resource-types.json rename to crates/fhir/tests/data/json/R4/codesystem-knowledge-resource-types.json diff --git a/crates/fhir/tests/data/R4/codesystem-language-preference-type.json b/crates/fhir/tests/data/json/R4/codesystem-language-preference-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-language-preference-type.json rename to crates/fhir/tests/data/json/R4/codesystem-language-preference-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-library-type.json b/crates/fhir/tests/data/json/R4/codesystem-library-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-library-type.json rename to crates/fhir/tests/data/json/R4/codesystem-library-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-link-type.json b/crates/fhir/tests/data/json/R4/codesystem-link-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-link-type.json rename to crates/fhir/tests/data/json/R4/codesystem-link-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-linkage-type.json b/crates/fhir/tests/data/json/R4/codesystem-linkage-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-linkage-type.json rename to crates/fhir/tests/data/json/R4/codesystem-linkage-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-list-empty-reason.json b/crates/fhir/tests/data/json/R4/codesystem-list-empty-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-list-empty-reason.json rename to crates/fhir/tests/data/json/R4/codesystem-list-empty-reason.json diff --git a/crates/fhir/tests/data/R4/codesystem-list-example-codes.json b/crates/fhir/tests/data/json/R4/codesystem-list-example-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-list-example-codes.json rename to crates/fhir/tests/data/json/R4/codesystem-list-example-codes.json diff --git a/crates/fhir/tests/data/R4/codesystem-list-item-flag.json b/crates/fhir/tests/data/json/R4/codesystem-list-item-flag.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-list-item-flag.json rename to crates/fhir/tests/data/json/R4/codesystem-list-item-flag.json diff --git a/crates/fhir/tests/data/R4/codesystem-list-mode.json b/crates/fhir/tests/data/json/R4/codesystem-list-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-list-mode.json rename to crates/fhir/tests/data/json/R4/codesystem-list-mode.json diff --git a/crates/fhir/tests/data/R4/codesystem-list-order.json b/crates/fhir/tests/data/json/R4/codesystem-list-order.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-list-order.json rename to crates/fhir/tests/data/json/R4/codesystem-list-order.json diff --git a/crates/fhir/tests/data/R4/codesystem-list-status.json b/crates/fhir/tests/data/json/R4/codesystem-list-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-list-status.json rename to crates/fhir/tests/data/json/R4/codesystem-list-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-location-mode.json b/crates/fhir/tests/data/json/R4/codesystem-location-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-location-mode.json rename to crates/fhir/tests/data/json/R4/codesystem-location-mode.json diff --git a/crates/fhir/tests/data/R4/codesystem-location-physical-type.json b/crates/fhir/tests/data/json/R4/codesystem-location-physical-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-location-physical-type.json rename to crates/fhir/tests/data/json/R4/codesystem-location-physical-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-location-status.json b/crates/fhir/tests/data/json/R4/codesystem-location-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-location-status.json rename to crates/fhir/tests/data/json/R4/codesystem-location-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-map-context-type.json b/crates/fhir/tests/data/json/R4/codesystem-map-context-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-map-context-type.json rename to crates/fhir/tests/data/json/R4/codesystem-map-context-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-map-group-type-mode.json b/crates/fhir/tests/data/json/R4/codesystem-map-group-type-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-map-group-type-mode.json rename to crates/fhir/tests/data/json/R4/codesystem-map-group-type-mode.json diff --git a/crates/fhir/tests/data/R4/codesystem-map-input-mode.json b/crates/fhir/tests/data/json/R4/codesystem-map-input-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-map-input-mode.json rename to crates/fhir/tests/data/json/R4/codesystem-map-input-mode.json diff --git a/crates/fhir/tests/data/R4/codesystem-map-model-mode.json b/crates/fhir/tests/data/json/R4/codesystem-map-model-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-map-model-mode.json rename to crates/fhir/tests/data/json/R4/codesystem-map-model-mode.json diff --git a/crates/fhir/tests/data/R4/codesystem-map-source-list-mode.json b/crates/fhir/tests/data/json/R4/codesystem-map-source-list-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-map-source-list-mode.json rename to crates/fhir/tests/data/json/R4/codesystem-map-source-list-mode.json diff --git a/crates/fhir/tests/data/R4/codesystem-map-target-list-mode.json b/crates/fhir/tests/data/json/R4/codesystem-map-target-list-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-map-target-list-mode.json rename to crates/fhir/tests/data/json/R4/codesystem-map-target-list-mode.json diff --git a/crates/fhir/tests/data/R4/codesystem-map-transform.json b/crates/fhir/tests/data/json/R4/codesystem-map-transform.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-map-transform.json rename to crates/fhir/tests/data/json/R4/codesystem-map-transform.json diff --git a/crates/fhir/tests/data/R4/codesystem-match-grade.json b/crates/fhir/tests/data/json/R4/codesystem-match-grade.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-match-grade.json rename to crates/fhir/tests/data/json/R4/codesystem-match-grade.json diff --git a/crates/fhir/tests/data/R4/codesystem-measure-data-usage.json b/crates/fhir/tests/data/json/R4/codesystem-measure-data-usage.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-measure-data-usage.json rename to crates/fhir/tests/data/json/R4/codesystem-measure-data-usage.json diff --git a/crates/fhir/tests/data/R4/codesystem-measure-improvement-notation.json b/crates/fhir/tests/data/json/R4/codesystem-measure-improvement-notation.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-measure-improvement-notation.json rename to crates/fhir/tests/data/json/R4/codesystem-measure-improvement-notation.json diff --git a/crates/fhir/tests/data/R4/codesystem-measure-population.json b/crates/fhir/tests/data/json/R4/codesystem-measure-population.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-measure-population.json rename to crates/fhir/tests/data/json/R4/codesystem-measure-population.json diff --git a/crates/fhir/tests/data/R4/codesystem-measure-report-status.json b/crates/fhir/tests/data/json/R4/codesystem-measure-report-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-measure-report-status.json rename to crates/fhir/tests/data/json/R4/codesystem-measure-report-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-measure-report-type.json b/crates/fhir/tests/data/json/R4/codesystem-measure-report-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-measure-report-type.json rename to crates/fhir/tests/data/json/R4/codesystem-measure-report-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-measure-scoring.json b/crates/fhir/tests/data/json/R4/codesystem-measure-scoring.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-measure-scoring.json rename to crates/fhir/tests/data/json/R4/codesystem-measure-scoring.json diff --git a/crates/fhir/tests/data/R4/codesystem-measure-type.json b/crates/fhir/tests/data/json/R4/codesystem-measure-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-measure-type.json rename to crates/fhir/tests/data/json/R4/codesystem-measure-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-med-admin-perform-function.json b/crates/fhir/tests/data/json/R4/codesystem-med-admin-perform-function.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-med-admin-perform-function.json rename to crates/fhir/tests/data/json/R4/codesystem-med-admin-perform-function.json diff --git a/crates/fhir/tests/data/R4/codesystem-media-modality.json b/crates/fhir/tests/data/json/R4/codesystem-media-modality.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-media-modality.json rename to crates/fhir/tests/data/json/R4/codesystem-media-modality.json diff --git a/crates/fhir/tests/data/R4/codesystem-media-type.json b/crates/fhir/tests/data/json/R4/codesystem-media-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-media-type.json rename to crates/fhir/tests/data/json/R4/codesystem-media-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-medication-admin-category.json b/crates/fhir/tests/data/json/R4/codesystem-medication-admin-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-medication-admin-category.json rename to crates/fhir/tests/data/json/R4/codesystem-medication-admin-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-medication-admin-status.json b/crates/fhir/tests/data/json/R4/codesystem-medication-admin-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-medication-admin-status.json rename to crates/fhir/tests/data/json/R4/codesystem-medication-admin-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-medication-statement-category.json b/crates/fhir/tests/data/json/R4/codesystem-medication-statement-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-medication-statement-category.json rename to crates/fhir/tests/data/json/R4/codesystem-medication-statement-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-medication-statement-status.json b/crates/fhir/tests/data/json/R4/codesystem-medication-statement-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-medication-statement-status.json rename to crates/fhir/tests/data/json/R4/codesystem-medication-statement-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-medication-status.json b/crates/fhir/tests/data/json/R4/codesystem-medication-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-medication-status.json rename to crates/fhir/tests/data/json/R4/codesystem-medication-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-medicationdispense-category.json b/crates/fhir/tests/data/json/R4/codesystem-medicationdispense-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-medicationdispense-category.json rename to crates/fhir/tests/data/json/R4/codesystem-medicationdispense-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-medicationdispense-performer-function.json b/crates/fhir/tests/data/json/R4/codesystem-medicationdispense-performer-function.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-medicationdispense-performer-function.json rename to crates/fhir/tests/data/json/R4/codesystem-medicationdispense-performer-function.json diff --git a/crates/fhir/tests/data/R4/codesystem-medicationdispense-status-reason.json b/crates/fhir/tests/data/json/R4/codesystem-medicationdispense-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-medicationdispense-status-reason.json rename to crates/fhir/tests/data/json/R4/codesystem-medicationdispense-status-reason.json diff --git a/crates/fhir/tests/data/R4/codesystem-medicationdispense-status.json b/crates/fhir/tests/data/json/R4/codesystem-medicationdispense-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-medicationdispense-status.json rename to crates/fhir/tests/data/json/R4/codesystem-medicationdispense-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-medicationknowledge-characteristic.json b/crates/fhir/tests/data/json/R4/codesystem-medicationknowledge-characteristic.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-medicationknowledge-characteristic.json rename to crates/fhir/tests/data/json/R4/codesystem-medicationknowledge-characteristic.json diff --git a/crates/fhir/tests/data/R4/codesystem-medicationknowledge-package-type.json b/crates/fhir/tests/data/json/R4/codesystem-medicationknowledge-package-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-medicationknowledge-package-type.json rename to crates/fhir/tests/data/json/R4/codesystem-medicationknowledge-package-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-medicationknowledge-status.json b/crates/fhir/tests/data/json/R4/codesystem-medicationknowledge-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-medicationknowledge-status.json rename to crates/fhir/tests/data/json/R4/codesystem-medicationknowledge-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-medicationrequest-category.json b/crates/fhir/tests/data/json/R4/codesystem-medicationrequest-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-medicationrequest-category.json rename to crates/fhir/tests/data/json/R4/codesystem-medicationrequest-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-medicationrequest-course-of-therapy.json b/crates/fhir/tests/data/json/R4/codesystem-medicationrequest-course-of-therapy.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-medicationrequest-course-of-therapy.json rename to crates/fhir/tests/data/json/R4/codesystem-medicationrequest-course-of-therapy.json diff --git a/crates/fhir/tests/data/R4/codesystem-medicationrequest-intent.json b/crates/fhir/tests/data/json/R4/codesystem-medicationrequest-intent.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-medicationrequest-intent.json rename to crates/fhir/tests/data/json/R4/codesystem-medicationrequest-intent.json diff --git a/crates/fhir/tests/data/R4/codesystem-medicationrequest-status-reason.json b/crates/fhir/tests/data/json/R4/codesystem-medicationrequest-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-medicationrequest-status-reason.json rename to crates/fhir/tests/data/json/R4/codesystem-medicationrequest-status-reason.json diff --git a/crates/fhir/tests/data/R4/codesystem-medicationrequest-status.json b/crates/fhir/tests/data/json/R4/codesystem-medicationrequest-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-medicationrequest-status.json rename to crates/fhir/tests/data/json/R4/codesystem-medicationrequest-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-message-events.json b/crates/fhir/tests/data/json/R4/codesystem-message-events.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-message-events.json rename to crates/fhir/tests/data/json/R4/codesystem-message-events.json diff --git a/crates/fhir/tests/data/R4/codesystem-message-reason-encounter.json b/crates/fhir/tests/data/json/R4/codesystem-message-reason-encounter.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-message-reason-encounter.json rename to crates/fhir/tests/data/json/R4/codesystem-message-reason-encounter.json diff --git a/crates/fhir/tests/data/R4/codesystem-message-significance-category.json b/crates/fhir/tests/data/json/R4/codesystem-message-significance-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-message-significance-category.json rename to crates/fhir/tests/data/json/R4/codesystem-message-significance-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-message-transport.json b/crates/fhir/tests/data/json/R4/codesystem-message-transport.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-message-transport.json rename to crates/fhir/tests/data/json/R4/codesystem-message-transport.json diff --git a/crates/fhir/tests/data/R4/codesystem-messageheader-response-request.json b/crates/fhir/tests/data/json/R4/codesystem-messageheader-response-request.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-messageheader-response-request.json rename to crates/fhir/tests/data/json/R4/codesystem-messageheader-response-request.json diff --git a/crates/fhir/tests/data/R4/codesystem-metric-calibration-state.json b/crates/fhir/tests/data/json/R4/codesystem-metric-calibration-state.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-metric-calibration-state.json rename to crates/fhir/tests/data/json/R4/codesystem-metric-calibration-state.json diff --git a/crates/fhir/tests/data/R4/codesystem-metric-calibration-type.json b/crates/fhir/tests/data/json/R4/codesystem-metric-calibration-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-metric-calibration-type.json rename to crates/fhir/tests/data/json/R4/codesystem-metric-calibration-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-metric-category.json b/crates/fhir/tests/data/json/R4/codesystem-metric-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-metric-category.json rename to crates/fhir/tests/data/json/R4/codesystem-metric-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-metric-color.json b/crates/fhir/tests/data/json/R4/codesystem-metric-color.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-metric-color.json rename to crates/fhir/tests/data/json/R4/codesystem-metric-color.json diff --git a/crates/fhir/tests/data/R4/codesystem-metric-operational-status.json b/crates/fhir/tests/data/json/R4/codesystem-metric-operational-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-metric-operational-status.json rename to crates/fhir/tests/data/json/R4/codesystem-metric-operational-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-missing-tooth-reason.json b/crates/fhir/tests/data/json/R4/codesystem-missing-tooth-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-missing-tooth-reason.json rename to crates/fhir/tests/data/json/R4/codesystem-missing-tooth-reason.json diff --git a/crates/fhir/tests/data/R4/codesystem-name-assembly-order.json b/crates/fhir/tests/data/json/R4/codesystem-name-assembly-order.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-name-assembly-order.json rename to crates/fhir/tests/data/json/R4/codesystem-name-assembly-order.json diff --git a/crates/fhir/tests/data/R4/codesystem-name-use.json b/crates/fhir/tests/data/json/R4/codesystem-name-use.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-name-use.json rename to crates/fhir/tests/data/json/R4/codesystem-name-use.json diff --git a/crates/fhir/tests/data/R4/codesystem-namingsystem-identifier-type.json b/crates/fhir/tests/data/json/R4/codesystem-namingsystem-identifier-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-namingsystem-identifier-type.json rename to crates/fhir/tests/data/json/R4/codesystem-namingsystem-identifier-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-namingsystem-type.json b/crates/fhir/tests/data/json/R4/codesystem-namingsystem-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-namingsystem-type.json rename to crates/fhir/tests/data/json/R4/codesystem-namingsystem-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-narrative-status.json b/crates/fhir/tests/data/json/R4/codesystem-narrative-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-narrative-status.json rename to crates/fhir/tests/data/json/R4/codesystem-narrative-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-network-type.json b/crates/fhir/tests/data/json/R4/codesystem-network-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-network-type.json rename to crates/fhir/tests/data/json/R4/codesystem-network-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-nhin-purposeofuse.json b/crates/fhir/tests/data/json/R4/codesystem-nhin-purposeofuse.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-nhin-purposeofuse.json rename to crates/fhir/tests/data/json/R4/codesystem-nhin-purposeofuse.json diff --git a/crates/fhir/tests/data/R4/codesystem-note-type.json b/crates/fhir/tests/data/json/R4/codesystem-note-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-note-type.json rename to crates/fhir/tests/data/json/R4/codesystem-note-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-object-role.json b/crates/fhir/tests/data/json/R4/codesystem-object-role.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-object-role.json rename to crates/fhir/tests/data/json/R4/codesystem-object-role.json diff --git a/crates/fhir/tests/data/R4/codesystem-observation-category.json b/crates/fhir/tests/data/json/R4/codesystem-observation-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-observation-category.json rename to crates/fhir/tests/data/json/R4/codesystem-observation-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-observation-range-category.json b/crates/fhir/tests/data/json/R4/codesystem-observation-range-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-observation-range-category.json rename to crates/fhir/tests/data/json/R4/codesystem-observation-range-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-observation-statistics.json b/crates/fhir/tests/data/json/R4/codesystem-observation-statistics.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-observation-statistics.json rename to crates/fhir/tests/data/json/R4/codesystem-observation-statistics.json diff --git a/crates/fhir/tests/data/R4/codesystem-observation-status.json b/crates/fhir/tests/data/json/R4/codesystem-observation-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-observation-status.json rename to crates/fhir/tests/data/json/R4/codesystem-observation-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-operation-kind.json b/crates/fhir/tests/data/json/R4/codesystem-operation-kind.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-operation-kind.json rename to crates/fhir/tests/data/json/R4/codesystem-operation-kind.json diff --git a/crates/fhir/tests/data/R4/codesystem-operation-outcome.json b/crates/fhir/tests/data/json/R4/codesystem-operation-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-operation-outcome.json rename to crates/fhir/tests/data/json/R4/codesystem-operation-outcome.json diff --git a/crates/fhir/tests/data/R4/codesystem-operation-parameter-use.json b/crates/fhir/tests/data/json/R4/codesystem-operation-parameter-use.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-operation-parameter-use.json rename to crates/fhir/tests/data/json/R4/codesystem-operation-parameter-use.json diff --git a/crates/fhir/tests/data/R4/codesystem-oral-prosthodontic-material.json b/crates/fhir/tests/data/json/R4/codesystem-oral-prosthodontic-material.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-oral-prosthodontic-material.json rename to crates/fhir/tests/data/json/R4/codesystem-oral-prosthodontic-material.json diff --git a/crates/fhir/tests/data/R4/codesystem-organization-role.json b/crates/fhir/tests/data/json/R4/codesystem-organization-role.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-organization-role.json rename to crates/fhir/tests/data/json/R4/codesystem-organization-role.json diff --git a/crates/fhir/tests/data/R4/codesystem-organization-type.json b/crates/fhir/tests/data/json/R4/codesystem-organization-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-organization-type.json rename to crates/fhir/tests/data/json/R4/codesystem-organization-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-orientation-type.json b/crates/fhir/tests/data/json/R4/codesystem-orientation-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-orientation-type.json rename to crates/fhir/tests/data/json/R4/codesystem-orientation-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-parameter-group.json b/crates/fhir/tests/data/json/R4/codesystem-parameter-group.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-parameter-group.json rename to crates/fhir/tests/data/json/R4/codesystem-parameter-group.json diff --git a/crates/fhir/tests/data/R4/codesystem-participantrequired.json b/crates/fhir/tests/data/json/R4/codesystem-participantrequired.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-participantrequired.json rename to crates/fhir/tests/data/json/R4/codesystem-participantrequired.json diff --git a/crates/fhir/tests/data/R4/codesystem-participationstatus.json b/crates/fhir/tests/data/json/R4/codesystem-participationstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-participationstatus.json rename to crates/fhir/tests/data/json/R4/codesystem-participationstatus.json diff --git a/crates/fhir/tests/data/R4/codesystem-payeetype.json b/crates/fhir/tests/data/json/R4/codesystem-payeetype.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-payeetype.json rename to crates/fhir/tests/data/json/R4/codesystem-payeetype.json diff --git a/crates/fhir/tests/data/R4/codesystem-payment-adjustment-reason.json b/crates/fhir/tests/data/json/R4/codesystem-payment-adjustment-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-payment-adjustment-reason.json rename to crates/fhir/tests/data/json/R4/codesystem-payment-adjustment-reason.json diff --git a/crates/fhir/tests/data/R4/codesystem-payment-status.json b/crates/fhir/tests/data/json/R4/codesystem-payment-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-payment-status.json rename to crates/fhir/tests/data/json/R4/codesystem-payment-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-payment-type.json b/crates/fhir/tests/data/json/R4/codesystem-payment-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-payment-type.json rename to crates/fhir/tests/data/json/R4/codesystem-payment-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-permitted-data-type.json b/crates/fhir/tests/data/json/R4/codesystem-permitted-data-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-permitted-data-type.json rename to crates/fhir/tests/data/json/R4/codesystem-permitted-data-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-plan-definition-type.json b/crates/fhir/tests/data/json/R4/codesystem-plan-definition-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-plan-definition-type.json rename to crates/fhir/tests/data/json/R4/codesystem-plan-definition-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-practitioner-role.json b/crates/fhir/tests/data/json/R4/codesystem-practitioner-role.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-practitioner-role.json rename to crates/fhir/tests/data/json/R4/codesystem-practitioner-role.json diff --git a/crates/fhir/tests/data/R4/codesystem-practitioner-specialty.json b/crates/fhir/tests/data/json/R4/codesystem-practitioner-specialty.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-practitioner-specialty.json rename to crates/fhir/tests/data/json/R4/codesystem-practitioner-specialty.json diff --git a/crates/fhir/tests/data/R4/codesystem-precision-estimate-type.json b/crates/fhir/tests/data/json/R4/codesystem-precision-estimate-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-precision-estimate-type.json rename to crates/fhir/tests/data/json/R4/codesystem-precision-estimate-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-procedure-progress-status-codes.json b/crates/fhir/tests/data/json/R4/codesystem-procedure-progress-status-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-procedure-progress-status-codes.json rename to crates/fhir/tests/data/json/R4/codesystem-procedure-progress-status-codes.json diff --git a/crates/fhir/tests/data/R4/codesystem-process-priority.json b/crates/fhir/tests/data/json/R4/codesystem-process-priority.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-process-priority.json rename to crates/fhir/tests/data/json/R4/codesystem-process-priority.json diff --git a/crates/fhir/tests/data/R4/codesystem-product-category.json b/crates/fhir/tests/data/json/R4/codesystem-product-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-product-category.json rename to crates/fhir/tests/data/json/R4/codesystem-product-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-product-status.json b/crates/fhir/tests/data/json/R4/codesystem-product-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-product-status.json rename to crates/fhir/tests/data/json/R4/codesystem-product-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-product-storage-scale.json b/crates/fhir/tests/data/json/R4/codesystem-product-storage-scale.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-product-storage-scale.json rename to crates/fhir/tests/data/json/R4/codesystem-product-storage-scale.json diff --git a/crates/fhir/tests/data/R4/codesystem-program.json b/crates/fhir/tests/data/json/R4/codesystem-program.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-program.json rename to crates/fhir/tests/data/json/R4/codesystem-program.json diff --git a/crates/fhir/tests/data/R4/codesystem-property-representation.json b/crates/fhir/tests/data/json/R4/codesystem-property-representation.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-property-representation.json rename to crates/fhir/tests/data/json/R4/codesystem-property-representation.json diff --git a/crates/fhir/tests/data/R4/codesystem-provenance-agent-role.json b/crates/fhir/tests/data/json/R4/codesystem-provenance-agent-role.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-provenance-agent-role.json rename to crates/fhir/tests/data/json/R4/codesystem-provenance-agent-role.json diff --git a/crates/fhir/tests/data/R4/codesystem-provenance-agent-type.json b/crates/fhir/tests/data/json/R4/codesystem-provenance-agent-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-provenance-agent-type.json rename to crates/fhir/tests/data/json/R4/codesystem-provenance-agent-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-provenance-entity-role.json b/crates/fhir/tests/data/json/R4/codesystem-provenance-entity-role.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-provenance-entity-role.json rename to crates/fhir/tests/data/json/R4/codesystem-provenance-entity-role.json diff --git a/crates/fhir/tests/data/R4/codesystem-provider-qualification.json b/crates/fhir/tests/data/json/R4/codesystem-provider-qualification.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-provider-qualification.json rename to crates/fhir/tests/data/json/R4/codesystem-provider-qualification.json diff --git a/crates/fhir/tests/data/R4/codesystem-publication-status.json b/crates/fhir/tests/data/json/R4/codesystem-publication-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-publication-status.json rename to crates/fhir/tests/data/json/R4/codesystem-publication-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-quality-type.json b/crates/fhir/tests/data/json/R4/codesystem-quality-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-quality-type.json rename to crates/fhir/tests/data/json/R4/codesystem-quality-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-quantity-comparator.json b/crates/fhir/tests/data/json/R4/codesystem-quantity-comparator.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-quantity-comparator.json rename to crates/fhir/tests/data/json/R4/codesystem-quantity-comparator.json diff --git a/crates/fhir/tests/data/R4/codesystem-question-max-occurs.json b/crates/fhir/tests/data/json/R4/codesystem-question-max-occurs.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-question-max-occurs.json rename to crates/fhir/tests/data/json/R4/codesystem-question-max-occurs.json diff --git a/crates/fhir/tests/data/R4/codesystem-questionnaire-answers-status.json b/crates/fhir/tests/data/json/R4/codesystem-questionnaire-answers-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-questionnaire-answers-status.json rename to crates/fhir/tests/data/json/R4/codesystem-questionnaire-answers-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-questionnaire-display-category.json b/crates/fhir/tests/data/json/R4/codesystem-questionnaire-display-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-questionnaire-display-category.json rename to crates/fhir/tests/data/json/R4/codesystem-questionnaire-display-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-questionnaire-enable-behavior.json b/crates/fhir/tests/data/json/R4/codesystem-questionnaire-enable-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-questionnaire-enable-behavior.json rename to crates/fhir/tests/data/json/R4/codesystem-questionnaire-enable-behavior.json diff --git a/crates/fhir/tests/data/R4/codesystem-questionnaire-enable-operator.json b/crates/fhir/tests/data/json/R4/codesystem-questionnaire-enable-operator.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-questionnaire-enable-operator.json rename to crates/fhir/tests/data/json/R4/codesystem-questionnaire-enable-operator.json diff --git a/crates/fhir/tests/data/R4/codesystem-questionnaire-item-control.json b/crates/fhir/tests/data/json/R4/codesystem-questionnaire-item-control.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-questionnaire-item-control.json rename to crates/fhir/tests/data/json/R4/codesystem-questionnaire-item-control.json diff --git a/crates/fhir/tests/data/R4/codesystem-questionnaire-usage-mode.json b/crates/fhir/tests/data/json/R4/codesystem-questionnaire-usage-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-questionnaire-usage-mode.json rename to crates/fhir/tests/data/json/R4/codesystem-questionnaire-usage-mode.json diff --git a/crates/fhir/tests/data/R4/codesystem-questionnaire.json b/crates/fhir/tests/data/json/R4/codesystem-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-questionnaire.json rename to crates/fhir/tests/data/json/R4/codesystem-questionnaire.json diff --git a/crates/fhir/tests/data/R4/codesystem-reaction-event-certainty.json b/crates/fhir/tests/data/json/R4/codesystem-reaction-event-certainty.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-reaction-event-certainty.json rename to crates/fhir/tests/data/json/R4/codesystem-reaction-event-certainty.json diff --git a/crates/fhir/tests/data/R4/codesystem-reaction-event-severity.json b/crates/fhir/tests/data/json/R4/codesystem-reaction-event-severity.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-reaction-event-severity.json rename to crates/fhir/tests/data/json/R4/codesystem-reaction-event-severity.json diff --git a/crates/fhir/tests/data/R4/codesystem-reason-medication-given-codes.json b/crates/fhir/tests/data/json/R4/codesystem-reason-medication-given-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-reason-medication-given-codes.json rename to crates/fhir/tests/data/json/R4/codesystem-reason-medication-given-codes.json diff --git a/crates/fhir/tests/data/R4/codesystem-reason-medication-not-given-codes.json b/crates/fhir/tests/data/json/R4/codesystem-reason-medication-not-given-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-reason-medication-not-given-codes.json rename to crates/fhir/tests/data/json/R4/codesystem-reason-medication-not-given-codes.json diff --git a/crates/fhir/tests/data/R4/codesystem-recommendation-strength.json b/crates/fhir/tests/data/json/R4/codesystem-recommendation-strength.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-recommendation-strength.json rename to crates/fhir/tests/data/json/R4/codesystem-recommendation-strength.json diff --git a/crates/fhir/tests/data/R4/codesystem-reference-handling-policy.json b/crates/fhir/tests/data/json/R4/codesystem-reference-handling-policy.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-reference-handling-policy.json rename to crates/fhir/tests/data/json/R4/codesystem-reference-handling-policy.json diff --git a/crates/fhir/tests/data/R4/codesystem-reference-version-rules.json b/crates/fhir/tests/data/json/R4/codesystem-reference-version-rules.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-reference-version-rules.json rename to crates/fhir/tests/data/json/R4/codesystem-reference-version-rules.json diff --git a/crates/fhir/tests/data/R4/codesystem-referencerange-meaning.json b/crates/fhir/tests/data/json/R4/codesystem-referencerange-meaning.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-referencerange-meaning.json rename to crates/fhir/tests/data/json/R4/codesystem-referencerange-meaning.json diff --git a/crates/fhir/tests/data/R4/codesystem-rejection-criteria.json b/crates/fhir/tests/data/json/R4/codesystem-rejection-criteria.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-rejection-criteria.json rename to crates/fhir/tests/data/json/R4/codesystem-rejection-criteria.json diff --git a/crates/fhir/tests/data/R4/codesystem-related-artifact-type.json b/crates/fhir/tests/data/json/R4/codesystem-related-artifact-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-related-artifact-type.json rename to crates/fhir/tests/data/json/R4/codesystem-related-artifact-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-related-claim-relationship.json b/crates/fhir/tests/data/json/R4/codesystem-related-claim-relationship.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-related-claim-relationship.json rename to crates/fhir/tests/data/json/R4/codesystem-related-claim-relationship.json diff --git a/crates/fhir/tests/data/R4/codesystem-relation-type.json b/crates/fhir/tests/data/json/R4/codesystem-relation-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-relation-type.json rename to crates/fhir/tests/data/json/R4/codesystem-relation-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-relationship.json b/crates/fhir/tests/data/json/R4/codesystem-relationship.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-relationship.json rename to crates/fhir/tests/data/json/R4/codesystem-relationship.json diff --git a/crates/fhir/tests/data/R4/codesystem-remittance-outcome.json b/crates/fhir/tests/data/json/R4/codesystem-remittance-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-remittance-outcome.json rename to crates/fhir/tests/data/json/R4/codesystem-remittance-outcome.json diff --git a/crates/fhir/tests/data/R4/codesystem-report-action-result-codes.json b/crates/fhir/tests/data/json/R4/codesystem-report-action-result-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-report-action-result-codes.json rename to crates/fhir/tests/data/json/R4/codesystem-report-action-result-codes.json diff --git a/crates/fhir/tests/data/R4/codesystem-report-participant-type.json b/crates/fhir/tests/data/json/R4/codesystem-report-participant-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-report-participant-type.json rename to crates/fhir/tests/data/json/R4/codesystem-report-participant-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-report-result-codes.json b/crates/fhir/tests/data/json/R4/codesystem-report-result-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-report-result-codes.json rename to crates/fhir/tests/data/json/R4/codesystem-report-result-codes.json diff --git a/crates/fhir/tests/data/R4/codesystem-report-status-codes.json b/crates/fhir/tests/data/json/R4/codesystem-report-status-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-report-status-codes.json rename to crates/fhir/tests/data/json/R4/codesystem-report-status-codes.json diff --git a/crates/fhir/tests/data/R4/codesystem-repository-type.json b/crates/fhir/tests/data/json/R4/codesystem-repository-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-repository-type.json rename to crates/fhir/tests/data/json/R4/codesystem-repository-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-request-intent.json b/crates/fhir/tests/data/json/R4/codesystem-request-intent.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-request-intent.json rename to crates/fhir/tests/data/json/R4/codesystem-request-intent.json diff --git a/crates/fhir/tests/data/R4/codesystem-request-priority.json b/crates/fhir/tests/data/json/R4/codesystem-request-priority.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-request-priority.json rename to crates/fhir/tests/data/json/R4/codesystem-request-priority.json diff --git a/crates/fhir/tests/data/R4/codesystem-request-resource-types.json b/crates/fhir/tests/data/json/R4/codesystem-request-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-request-resource-types.json rename to crates/fhir/tests/data/json/R4/codesystem-request-resource-types.json diff --git a/crates/fhir/tests/data/R4/codesystem-request-status.json b/crates/fhir/tests/data/json/R4/codesystem-request-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-request-status.json rename to crates/fhir/tests/data/json/R4/codesystem-request-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-research-element-type.json b/crates/fhir/tests/data/json/R4/codesystem-research-element-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-research-element-type.json rename to crates/fhir/tests/data/json/R4/codesystem-research-element-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-research-study-objective-type.json b/crates/fhir/tests/data/json/R4/codesystem-research-study-objective-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-research-study-objective-type.json rename to crates/fhir/tests/data/json/R4/codesystem-research-study-objective-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-research-study-phase.json b/crates/fhir/tests/data/json/R4/codesystem-research-study-phase.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-research-study-phase.json rename to crates/fhir/tests/data/json/R4/codesystem-research-study-phase.json diff --git a/crates/fhir/tests/data/R4/codesystem-research-study-prim-purp-type.json b/crates/fhir/tests/data/json/R4/codesystem-research-study-prim-purp-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-research-study-prim-purp-type.json rename to crates/fhir/tests/data/json/R4/codesystem-research-study-prim-purp-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-research-study-reason-stopped.json b/crates/fhir/tests/data/json/R4/codesystem-research-study-reason-stopped.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-research-study-reason-stopped.json rename to crates/fhir/tests/data/json/R4/codesystem-research-study-reason-stopped.json diff --git a/crates/fhir/tests/data/R4/codesystem-research-study-status.json b/crates/fhir/tests/data/json/R4/codesystem-research-study-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-research-study-status.json rename to crates/fhir/tests/data/json/R4/codesystem-research-study-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-research-subject-status.json b/crates/fhir/tests/data/json/R4/codesystem-research-subject-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-research-subject-status.json rename to crates/fhir/tests/data/json/R4/codesystem-research-subject-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-resource-aggregation-mode.json b/crates/fhir/tests/data/json/R4/codesystem-resource-aggregation-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-resource-aggregation-mode.json rename to crates/fhir/tests/data/json/R4/codesystem-resource-aggregation-mode.json diff --git a/crates/fhir/tests/data/R4/codesystem-resource-security-category.json b/crates/fhir/tests/data/json/R4/codesystem-resource-security-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-resource-security-category.json rename to crates/fhir/tests/data/json/R4/codesystem-resource-security-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-resource-slicing-rules.json b/crates/fhir/tests/data/json/R4/codesystem-resource-slicing-rules.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-resource-slicing-rules.json rename to crates/fhir/tests/data/json/R4/codesystem-resource-slicing-rules.json diff --git a/crates/fhir/tests/data/R4/codesystem-resource-status.json b/crates/fhir/tests/data/json/R4/codesystem-resource-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-resource-status.json rename to crates/fhir/tests/data/json/R4/codesystem-resource-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-resource-type-link.json b/crates/fhir/tests/data/json/R4/codesystem-resource-type-link.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-resource-type-link.json rename to crates/fhir/tests/data/json/R4/codesystem-resource-type-link.json diff --git a/crates/fhir/tests/data/R4/codesystem-resource-types.json b/crates/fhir/tests/data/json/R4/codesystem-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-resource-types.json rename to crates/fhir/tests/data/json/R4/codesystem-resource-types.json diff --git a/crates/fhir/tests/data/R4/codesystem-resource-validation-mode.json b/crates/fhir/tests/data/json/R4/codesystem-resource-validation-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-resource-validation-mode.json rename to crates/fhir/tests/data/json/R4/codesystem-resource-validation-mode.json diff --git a/crates/fhir/tests/data/R4/codesystem-response-code.json b/crates/fhir/tests/data/json/R4/codesystem-response-code.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-response-code.json rename to crates/fhir/tests/data/json/R4/codesystem-response-code.json diff --git a/crates/fhir/tests/data/R4/codesystem-restful-capability-mode.json b/crates/fhir/tests/data/json/R4/codesystem-restful-capability-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-restful-capability-mode.json rename to crates/fhir/tests/data/json/R4/codesystem-restful-capability-mode.json diff --git a/crates/fhir/tests/data/R4/codesystem-restful-interaction.json b/crates/fhir/tests/data/json/R4/codesystem-restful-interaction.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-restful-interaction.json rename to crates/fhir/tests/data/json/R4/codesystem-restful-interaction.json diff --git a/crates/fhir/tests/data/R4/codesystem-restful-security-service.json b/crates/fhir/tests/data/json/R4/codesystem-restful-security-service.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-restful-security-service.json rename to crates/fhir/tests/data/json/R4/codesystem-restful-security-service.json diff --git a/crates/fhir/tests/data/R4/codesystem-risk-estimate-type.json b/crates/fhir/tests/data/json/R4/codesystem-risk-estimate-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-risk-estimate-type.json rename to crates/fhir/tests/data/json/R4/codesystem-risk-estimate-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-risk-probability.json b/crates/fhir/tests/data/json/R4/codesystem-risk-probability.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-risk-probability.json rename to crates/fhir/tests/data/json/R4/codesystem-risk-probability.json diff --git a/crates/fhir/tests/data/R4/codesystem-search-comparator.json b/crates/fhir/tests/data/json/R4/codesystem-search-comparator.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-search-comparator.json rename to crates/fhir/tests/data/json/R4/codesystem-search-comparator.json diff --git a/crates/fhir/tests/data/R4/codesystem-search-entry-mode.json b/crates/fhir/tests/data/json/R4/codesystem-search-entry-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-search-entry-mode.json rename to crates/fhir/tests/data/json/R4/codesystem-search-entry-mode.json diff --git a/crates/fhir/tests/data/R4/codesystem-search-modifier-code.json b/crates/fhir/tests/data/json/R4/codesystem-search-modifier-code.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-search-modifier-code.json rename to crates/fhir/tests/data/json/R4/codesystem-search-modifier-code.json diff --git a/crates/fhir/tests/data/R4/codesystem-search-param-type.json b/crates/fhir/tests/data/json/R4/codesystem-search-param-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-search-param-type.json rename to crates/fhir/tests/data/json/R4/codesystem-search-param-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-search-xpath-usage.json b/crates/fhir/tests/data/json/R4/codesystem-search-xpath-usage.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-search-xpath-usage.json rename to crates/fhir/tests/data/json/R4/codesystem-search-xpath-usage.json diff --git a/crates/fhir/tests/data/R4/codesystem-secondary-finding.json b/crates/fhir/tests/data/json/R4/codesystem-secondary-finding.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-secondary-finding.json rename to crates/fhir/tests/data/json/R4/codesystem-secondary-finding.json diff --git a/crates/fhir/tests/data/R4/codesystem-sequence-type.json b/crates/fhir/tests/data/json/R4/codesystem-sequence-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-sequence-type.json rename to crates/fhir/tests/data/json/R4/codesystem-sequence-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-service-category.json b/crates/fhir/tests/data/json/R4/codesystem-service-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-service-category.json rename to crates/fhir/tests/data/json/R4/codesystem-service-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-service-modifiers.json b/crates/fhir/tests/data/json/R4/codesystem-service-modifiers.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-service-modifiers.json rename to crates/fhir/tests/data/json/R4/codesystem-service-modifiers.json diff --git a/crates/fhir/tests/data/R4/codesystem-service-pharmacy.json b/crates/fhir/tests/data/json/R4/codesystem-service-pharmacy.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-service-pharmacy.json rename to crates/fhir/tests/data/json/R4/codesystem-service-pharmacy.json diff --git a/crates/fhir/tests/data/R4/codesystem-service-place.json b/crates/fhir/tests/data/json/R4/codesystem-service-place.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-service-place.json rename to crates/fhir/tests/data/json/R4/codesystem-service-place.json diff --git a/crates/fhir/tests/data/R4/codesystem-service-product.json b/crates/fhir/tests/data/json/R4/codesystem-service-product.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-service-product.json rename to crates/fhir/tests/data/json/R4/codesystem-service-product.json diff --git a/crates/fhir/tests/data/R4/codesystem-service-provision-conditions.json b/crates/fhir/tests/data/json/R4/codesystem-service-provision-conditions.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-service-provision-conditions.json rename to crates/fhir/tests/data/json/R4/codesystem-service-provision-conditions.json diff --git a/crates/fhir/tests/data/R4/codesystem-service-referral-method.json b/crates/fhir/tests/data/json/R4/codesystem-service-referral-method.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-service-referral-method.json rename to crates/fhir/tests/data/json/R4/codesystem-service-referral-method.json diff --git a/crates/fhir/tests/data/R4/codesystem-service-type.json b/crates/fhir/tests/data/json/R4/codesystem-service-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-service-type.json rename to crates/fhir/tests/data/json/R4/codesystem-service-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-service-uscls.json b/crates/fhir/tests/data/json/R4/codesystem-service-uscls.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-service-uscls.json rename to crates/fhir/tests/data/json/R4/codesystem-service-uscls.json diff --git a/crates/fhir/tests/data/R4/codesystem-signature-type.json b/crates/fhir/tests/data/json/R4/codesystem-signature-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-signature-type.json rename to crates/fhir/tests/data/json/R4/codesystem-signature-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-slotstatus.json b/crates/fhir/tests/data/json/R4/codesystem-slotstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-slotstatus.json rename to crates/fhir/tests/data/json/R4/codesystem-slotstatus.json diff --git a/crates/fhir/tests/data/R4/codesystem-smart-capabilities.json b/crates/fhir/tests/data/json/R4/codesystem-smart-capabilities.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-smart-capabilities.json rename to crates/fhir/tests/data/json/R4/codesystem-smart-capabilities.json diff --git a/crates/fhir/tests/data/R4/codesystem-snomedct.json b/crates/fhir/tests/data/json/R4/codesystem-snomedct.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-snomedct.json rename to crates/fhir/tests/data/json/R4/codesystem-snomedct.json diff --git a/crates/fhir/tests/data/R4/codesystem-sort-direction.json b/crates/fhir/tests/data/json/R4/codesystem-sort-direction.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-sort-direction.json rename to crates/fhir/tests/data/json/R4/codesystem-sort-direction.json diff --git a/crates/fhir/tests/data/R4/codesystem-spdx-license.json b/crates/fhir/tests/data/json/R4/codesystem-spdx-license.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-spdx-license.json rename to crates/fhir/tests/data/json/R4/codesystem-spdx-license.json diff --git a/crates/fhir/tests/data/R4/codesystem-special-values.json b/crates/fhir/tests/data/json/R4/codesystem-special-values.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-special-values.json rename to crates/fhir/tests/data/json/R4/codesystem-special-values.json diff --git a/crates/fhir/tests/data/R4/codesystem-specimen-contained-preference.json b/crates/fhir/tests/data/json/R4/codesystem-specimen-contained-preference.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-specimen-contained-preference.json rename to crates/fhir/tests/data/json/R4/codesystem-specimen-contained-preference.json diff --git a/crates/fhir/tests/data/R4/codesystem-specimen-status.json b/crates/fhir/tests/data/json/R4/codesystem-specimen-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-specimen-status.json rename to crates/fhir/tests/data/json/R4/codesystem-specimen-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-standards-status.json b/crates/fhir/tests/data/json/R4/codesystem-standards-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-standards-status.json rename to crates/fhir/tests/data/json/R4/codesystem-standards-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-strand-type.json b/crates/fhir/tests/data/json/R4/codesystem-strand-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-strand-type.json rename to crates/fhir/tests/data/json/R4/codesystem-strand-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-structure-definition-kind.json b/crates/fhir/tests/data/json/R4/codesystem-structure-definition-kind.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-structure-definition-kind.json rename to crates/fhir/tests/data/json/R4/codesystem-structure-definition-kind.json diff --git a/crates/fhir/tests/data/R4/codesystem-study-type.json b/crates/fhir/tests/data/json/R4/codesystem-study-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-study-type.json rename to crates/fhir/tests/data/json/R4/codesystem-study-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-subscriber-relationship.json b/crates/fhir/tests/data/json/R4/codesystem-subscriber-relationship.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-subscriber-relationship.json rename to crates/fhir/tests/data/json/R4/codesystem-subscriber-relationship.json diff --git a/crates/fhir/tests/data/R4/codesystem-subscription-channel-type.json b/crates/fhir/tests/data/json/R4/codesystem-subscription-channel-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-subscription-channel-type.json rename to crates/fhir/tests/data/json/R4/codesystem-subscription-channel-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-subscription-status.json b/crates/fhir/tests/data/json/R4/codesystem-subscription-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-subscription-status.json rename to crates/fhir/tests/data/json/R4/codesystem-subscription-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-subscription-tag.json b/crates/fhir/tests/data/json/R4/codesystem-subscription-tag.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-subscription-tag.json rename to crates/fhir/tests/data/json/R4/codesystem-subscription-tag.json diff --git a/crates/fhir/tests/data/R4/codesystem-substance-category.json b/crates/fhir/tests/data/json/R4/codesystem-substance-category.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-substance-category.json rename to crates/fhir/tests/data/json/R4/codesystem-substance-category.json diff --git a/crates/fhir/tests/data/R4/codesystem-substance-status.json b/crates/fhir/tests/data/json/R4/codesystem-substance-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-substance-status.json rename to crates/fhir/tests/data/json/R4/codesystem-substance-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-supplydelivery-status.json b/crates/fhir/tests/data/json/R4/codesystem-supplydelivery-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-supplydelivery-status.json rename to crates/fhir/tests/data/json/R4/codesystem-supplydelivery-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-supplydelivery-type.json b/crates/fhir/tests/data/json/R4/codesystem-supplydelivery-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-supplydelivery-type.json rename to crates/fhir/tests/data/json/R4/codesystem-supplydelivery-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-supplyrequest-kind.json b/crates/fhir/tests/data/json/R4/codesystem-supplyrequest-kind.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-supplyrequest-kind.json rename to crates/fhir/tests/data/json/R4/codesystem-supplyrequest-kind.json diff --git a/crates/fhir/tests/data/R4/codesystem-supplyrequest-reason.json b/crates/fhir/tests/data/json/R4/codesystem-supplyrequest-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-supplyrequest-reason.json rename to crates/fhir/tests/data/json/R4/codesystem-supplyrequest-reason.json diff --git a/crates/fhir/tests/data/R4/codesystem-supplyrequest-status.json b/crates/fhir/tests/data/json/R4/codesystem-supplyrequest-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-supplyrequest-status.json rename to crates/fhir/tests/data/json/R4/codesystem-supplyrequest-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-surface.json b/crates/fhir/tests/data/json/R4/codesystem-surface.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-surface.json rename to crates/fhir/tests/data/json/R4/codesystem-surface.json diff --git a/crates/fhir/tests/data/R4/codesystem-synthesis-type.json b/crates/fhir/tests/data/json/R4/codesystem-synthesis-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-synthesis-type.json rename to crates/fhir/tests/data/json/R4/codesystem-synthesis-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-task-code.json b/crates/fhir/tests/data/json/R4/codesystem-task-code.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-task-code.json rename to crates/fhir/tests/data/json/R4/codesystem-task-code.json diff --git a/crates/fhir/tests/data/R4/codesystem-task-intent.json b/crates/fhir/tests/data/json/R4/codesystem-task-intent.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-task-intent.json rename to crates/fhir/tests/data/json/R4/codesystem-task-intent.json diff --git a/crates/fhir/tests/data/R4/codesystem-task-status.json b/crates/fhir/tests/data/json/R4/codesystem-task-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-task-status.json rename to crates/fhir/tests/data/json/R4/codesystem-task-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-teeth.json b/crates/fhir/tests/data/json/R4/codesystem-teeth.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-teeth.json rename to crates/fhir/tests/data/json/R4/codesystem-teeth.json diff --git a/crates/fhir/tests/data/R4/codesystem-testscript-operation-codes.json b/crates/fhir/tests/data/json/R4/codesystem-testscript-operation-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-testscript-operation-codes.json rename to crates/fhir/tests/data/json/R4/codesystem-testscript-operation-codes.json diff --git a/crates/fhir/tests/data/R4/codesystem-testscript-profile-destination-types.json b/crates/fhir/tests/data/json/R4/codesystem-testscript-profile-destination-types.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-testscript-profile-destination-types.json rename to crates/fhir/tests/data/json/R4/codesystem-testscript-profile-destination-types.json diff --git a/crates/fhir/tests/data/R4/codesystem-testscript-profile-origin-types.json b/crates/fhir/tests/data/json/R4/codesystem-testscript-profile-origin-types.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-testscript-profile-origin-types.json rename to crates/fhir/tests/data/json/R4/codesystem-testscript-profile-origin-types.json diff --git a/crates/fhir/tests/data/R4/codesystem-tldc.json b/crates/fhir/tests/data/json/R4/codesystem-tldc.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-tldc.json rename to crates/fhir/tests/data/json/R4/codesystem-tldc.json diff --git a/crates/fhir/tests/data/R4/codesystem-tooth.json b/crates/fhir/tests/data/json/R4/codesystem-tooth.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-tooth.json rename to crates/fhir/tests/data/json/R4/codesystem-tooth.json diff --git a/crates/fhir/tests/data/R4/codesystem-transaction-mode.json b/crates/fhir/tests/data/json/R4/codesystem-transaction-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-transaction-mode.json rename to crates/fhir/tests/data/json/R4/codesystem-transaction-mode.json diff --git a/crates/fhir/tests/data/R4/codesystem-trigger-type.json b/crates/fhir/tests/data/json/R4/codesystem-trigger-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-trigger-type.json rename to crates/fhir/tests/data/json/R4/codesystem-trigger-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-type-derivation-rule.json b/crates/fhir/tests/data/json/R4/codesystem-type-derivation-rule.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-type-derivation-rule.json rename to crates/fhir/tests/data/json/R4/codesystem-type-derivation-rule.json diff --git a/crates/fhir/tests/data/R4/codesystem-udi-entry-type.json b/crates/fhir/tests/data/json/R4/codesystem-udi-entry-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-udi-entry-type.json rename to crates/fhir/tests/data/json/R4/codesystem-udi-entry-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-udi.json b/crates/fhir/tests/data/json/R4/codesystem-udi.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-udi.json rename to crates/fhir/tests/data/json/R4/codesystem-udi.json diff --git a/crates/fhir/tests/data/R4/codesystem-unknown-content-code.json b/crates/fhir/tests/data/json/R4/codesystem-unknown-content-code.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-unknown-content-code.json rename to crates/fhir/tests/data/json/R4/codesystem-unknown-content-code.json diff --git a/crates/fhir/tests/data/R4/codesystem-usage-context-type.json b/crates/fhir/tests/data/json/R4/codesystem-usage-context-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-usage-context-type.json rename to crates/fhir/tests/data/json/R4/codesystem-usage-context-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-variable-type.json b/crates/fhir/tests/data/json/R4/codesystem-variable-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-variable-type.json rename to crates/fhir/tests/data/json/R4/codesystem-variable-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-variant-state.json b/crates/fhir/tests/data/json/R4/codesystem-variant-state.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-variant-state.json rename to crates/fhir/tests/data/json/R4/codesystem-variant-state.json diff --git a/crates/fhir/tests/data/R4/codesystem-verificationresult-can-push-updates.json b/crates/fhir/tests/data/json/R4/codesystem-verificationresult-can-push-updates.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-verificationresult-can-push-updates.json rename to crates/fhir/tests/data/json/R4/codesystem-verificationresult-can-push-updates.json diff --git a/crates/fhir/tests/data/R4/codesystem-verificationresult-communication-method.json b/crates/fhir/tests/data/json/R4/codesystem-verificationresult-communication-method.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-verificationresult-communication-method.json rename to crates/fhir/tests/data/json/R4/codesystem-verificationresult-communication-method.json diff --git a/crates/fhir/tests/data/R4/codesystem-verificationresult-failure-action.json b/crates/fhir/tests/data/json/R4/codesystem-verificationresult-failure-action.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-verificationresult-failure-action.json rename to crates/fhir/tests/data/json/R4/codesystem-verificationresult-failure-action.json diff --git a/crates/fhir/tests/data/R4/codesystem-verificationresult-need.json b/crates/fhir/tests/data/json/R4/codesystem-verificationresult-need.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-verificationresult-need.json rename to crates/fhir/tests/data/json/R4/codesystem-verificationresult-need.json diff --git a/crates/fhir/tests/data/R4/codesystem-verificationresult-primary-source-type.json b/crates/fhir/tests/data/json/R4/codesystem-verificationresult-primary-source-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-verificationresult-primary-source-type.json rename to crates/fhir/tests/data/json/R4/codesystem-verificationresult-primary-source-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-verificationresult-push-type-available.json b/crates/fhir/tests/data/json/R4/codesystem-verificationresult-push-type-available.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-verificationresult-push-type-available.json rename to crates/fhir/tests/data/json/R4/codesystem-verificationresult-push-type-available.json diff --git a/crates/fhir/tests/data/R4/codesystem-verificationresult-status.json b/crates/fhir/tests/data/json/R4/codesystem-verificationresult-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-verificationresult-status.json rename to crates/fhir/tests/data/json/R4/codesystem-verificationresult-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-verificationresult-validation-process.json b/crates/fhir/tests/data/json/R4/codesystem-verificationresult-validation-process.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-verificationresult-validation-process.json rename to crates/fhir/tests/data/json/R4/codesystem-verificationresult-validation-process.json diff --git a/crates/fhir/tests/data/R4/codesystem-verificationresult-validation-status.json b/crates/fhir/tests/data/json/R4/codesystem-verificationresult-validation-status.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-verificationresult-validation-status.json rename to crates/fhir/tests/data/json/R4/codesystem-verificationresult-validation-status.json diff --git a/crates/fhir/tests/data/R4/codesystem-verificationresult-validation-type.json b/crates/fhir/tests/data/json/R4/codesystem-verificationresult-validation-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-verificationresult-validation-type.json rename to crates/fhir/tests/data/json/R4/codesystem-verificationresult-validation-type.json diff --git a/crates/fhir/tests/data/R4/codesystem-versioning-policy.json b/crates/fhir/tests/data/json/R4/codesystem-versioning-policy.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-versioning-policy.json rename to crates/fhir/tests/data/json/R4/codesystem-versioning-policy.json diff --git a/crates/fhir/tests/data/R4/codesystem-vision-base-codes.json b/crates/fhir/tests/data/json/R4/codesystem-vision-base-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-vision-base-codes.json rename to crates/fhir/tests/data/json/R4/codesystem-vision-base-codes.json diff --git a/crates/fhir/tests/data/R4/codesystem-vision-eye-codes.json b/crates/fhir/tests/data/json/R4/codesystem-vision-eye-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-vision-eye-codes.json rename to crates/fhir/tests/data/json/R4/codesystem-vision-eye-codes.json diff --git a/crates/fhir/tests/data/R4/codesystem-vision-product.json b/crates/fhir/tests/data/json/R4/codesystem-vision-product.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-vision-product.json rename to crates/fhir/tests/data/json/R4/codesystem-vision-product.json diff --git a/crates/fhir/tests/data/R4/codesystem-w3c-provenance-activity-type.json b/crates/fhir/tests/data/json/R4/codesystem-w3c-provenance-activity-type.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem-w3c-provenance-activity-type.json rename to crates/fhir/tests/data/json/R4/codesystem-w3c-provenance-activity-type.json diff --git a/crates/fhir/tests/data/R4/codesystem.profile.json b/crates/fhir/tests/data/json/R4/codesystem.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/codesystem.profile.json rename to crates/fhir/tests/data/json/R4/codesystem.profile.json diff --git a/crates/fhir/tests/data/R4/coding.profile.json b/crates/fhir/tests/data/json/R4/coding.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/coding.profile.json rename to crates/fhir/tests/data/json/R4/coding.profile.json diff --git a/crates/fhir/tests/data/R4/communication-example-fm-attachment.json b/crates/fhir/tests/data/json/R4/communication-example-fm-attachment.json similarity index 100% rename from crates/fhir/tests/data/R4/communication-example-fm-attachment.json rename to crates/fhir/tests/data/json/R4/communication-example-fm-attachment.json diff --git a/crates/fhir/tests/data/R4/communication-example-fm-solicited-attachment.json b/crates/fhir/tests/data/json/R4/communication-example-fm-solicited-attachment.json similarity index 100% rename from crates/fhir/tests/data/R4/communication-example-fm-solicited-attachment.json rename to crates/fhir/tests/data/json/R4/communication-example-fm-solicited-attachment.json diff --git a/crates/fhir/tests/data/R4/communication-example.json b/crates/fhir/tests/data/json/R4/communication-example.json similarity index 100% rename from crates/fhir/tests/data/R4/communication-example.json rename to crates/fhir/tests/data/json/R4/communication-example.json diff --git a/crates/fhir/tests/data/R4/communication-questionnaire.json b/crates/fhir/tests/data/json/R4/communication-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/communication-questionnaire.json rename to crates/fhir/tests/data/json/R4/communication-questionnaire.json diff --git a/crates/fhir/tests/data/R4/communication.profile.json b/crates/fhir/tests/data/json/R4/communication.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/communication.profile.json rename to crates/fhir/tests/data/json/R4/communication.profile.json diff --git a/crates/fhir/tests/data/R4/communicationrequest-example-fm-solicit-attachment.json b/crates/fhir/tests/data/json/R4/communicationrequest-example-fm-solicit-attachment.json similarity index 100% rename from crates/fhir/tests/data/R4/communicationrequest-example-fm-solicit-attachment.json rename to crates/fhir/tests/data/json/R4/communicationrequest-example-fm-solicit-attachment.json diff --git a/crates/fhir/tests/data/R4/communicationrequest-example.json b/crates/fhir/tests/data/json/R4/communicationrequest-example.json similarity index 100% rename from crates/fhir/tests/data/R4/communicationrequest-example.json rename to crates/fhir/tests/data/json/R4/communicationrequest-example.json diff --git a/crates/fhir/tests/data/R4/communicationrequest-questionnaire.json b/crates/fhir/tests/data/json/R4/communicationrequest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/communicationrequest-questionnaire.json rename to crates/fhir/tests/data/json/R4/communicationrequest-questionnaire.json diff --git a/crates/fhir/tests/data/R4/communicationrequest.profile.json b/crates/fhir/tests/data/json/R4/communicationrequest.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/communicationrequest.profile.json rename to crates/fhir/tests/data/json/R4/communicationrequest.profile.json diff --git a/crates/fhir/tests/data/R4/compartmentdefinition-device.json b/crates/fhir/tests/data/json/R4/compartmentdefinition-device.json similarity index 100% rename from crates/fhir/tests/data/R4/compartmentdefinition-device.json rename to crates/fhir/tests/data/json/R4/compartmentdefinition-device.json diff --git a/crates/fhir/tests/data/R4/compartmentdefinition-encounter.json b/crates/fhir/tests/data/json/R4/compartmentdefinition-encounter.json similarity index 100% rename from crates/fhir/tests/data/R4/compartmentdefinition-encounter.json rename to crates/fhir/tests/data/json/R4/compartmentdefinition-encounter.json diff --git a/crates/fhir/tests/data/R4/compartmentdefinition-example.json b/crates/fhir/tests/data/json/R4/compartmentdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4/compartmentdefinition-example.json rename to crates/fhir/tests/data/json/R4/compartmentdefinition-example.json diff --git a/crates/fhir/tests/data/R4/compartmentdefinition-patient.json b/crates/fhir/tests/data/json/R4/compartmentdefinition-patient.json similarity index 100% rename from crates/fhir/tests/data/R4/compartmentdefinition-patient.json rename to crates/fhir/tests/data/json/R4/compartmentdefinition-patient.json diff --git a/crates/fhir/tests/data/R4/compartmentdefinition-practitioner.json b/crates/fhir/tests/data/json/R4/compartmentdefinition-practitioner.json similarity index 100% rename from crates/fhir/tests/data/R4/compartmentdefinition-practitioner.json rename to crates/fhir/tests/data/json/R4/compartmentdefinition-practitioner.json diff --git a/crates/fhir/tests/data/R4/compartmentdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/compartmentdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/compartmentdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/compartmentdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/compartmentdefinition-relatedperson.json b/crates/fhir/tests/data/json/R4/compartmentdefinition-relatedperson.json similarity index 100% rename from crates/fhir/tests/data/R4/compartmentdefinition-relatedperson.json rename to crates/fhir/tests/data/json/R4/compartmentdefinition-relatedperson.json diff --git a/crates/fhir/tests/data/R4/compartmentdefinition.profile.json b/crates/fhir/tests/data/json/R4/compartmentdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/compartmentdefinition.profile.json rename to crates/fhir/tests/data/json/R4/compartmentdefinition.profile.json diff --git a/crates/fhir/tests/data/R4/composition-example-mixed.json b/crates/fhir/tests/data/json/R4/composition-example-mixed.json similarity index 100% rename from crates/fhir/tests/data/R4/composition-example-mixed.json rename to crates/fhir/tests/data/json/R4/composition-example-mixed.json diff --git a/crates/fhir/tests/data/R4/composition-example.json b/crates/fhir/tests/data/json/R4/composition-example.json similarity index 100% rename from crates/fhir/tests/data/R4/composition-example.json rename to crates/fhir/tests/data/json/R4/composition-example.json diff --git a/crates/fhir/tests/data/R4/composition-questionnaire.json b/crates/fhir/tests/data/json/R4/composition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/composition-questionnaire.json rename to crates/fhir/tests/data/json/R4/composition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/composition.profile.json b/crates/fhir/tests/data/json/R4/composition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/composition.profile.json rename to crates/fhir/tests/data/json/R4/composition.profile.json diff --git a/crates/fhir/tests/data/R4/computableplandefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/computableplandefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/computableplandefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/computableplandefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/computableplandefinition.profile.json b/crates/fhir/tests/data/json/R4/computableplandefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/computableplandefinition.profile.json rename to crates/fhir/tests/data/json/R4/computableplandefinition.profile.json diff --git a/crates/fhir/tests/data/R4/conceptmap-103.json b/crates/fhir/tests/data/json/R4/conceptmap-103.json similarity index 100% rename from crates/fhir/tests/data/R4/conceptmap-103.json rename to crates/fhir/tests/data/json/R4/conceptmap-103.json diff --git a/crates/fhir/tests/data/R4/conceptmap-cdshooks-indicator.json b/crates/fhir/tests/data/json/R4/conceptmap-cdshooks-indicator.json similarity index 100% rename from crates/fhir/tests/data/R4/conceptmap-cdshooks-indicator.json rename to crates/fhir/tests/data/json/R4/conceptmap-cdshooks-indicator.json diff --git a/crates/fhir/tests/data/R4/conceptmap-example-2.json b/crates/fhir/tests/data/json/R4/conceptmap-example-2.json similarity index 100% rename from crates/fhir/tests/data/R4/conceptmap-example-2.json rename to crates/fhir/tests/data/json/R4/conceptmap-example-2.json diff --git a/crates/fhir/tests/data/R4/conceptmap-example-specimen-type.json b/crates/fhir/tests/data/json/R4/conceptmap-example-specimen-type.json similarity index 100% rename from crates/fhir/tests/data/R4/conceptmap-example-specimen-type.json rename to crates/fhir/tests/data/json/R4/conceptmap-example-specimen-type.json diff --git a/crates/fhir/tests/data/R4/conceptmap-example.json b/crates/fhir/tests/data/json/R4/conceptmap-example.json similarity index 100% rename from crates/fhir/tests/data/R4/conceptmap-example.json rename to crates/fhir/tests/data/json/R4/conceptmap-example.json diff --git a/crates/fhir/tests/data/R4/conceptmap-questionnaire.json b/crates/fhir/tests/data/json/R4/conceptmap-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/conceptmap-questionnaire.json rename to crates/fhir/tests/data/json/R4/conceptmap-questionnaire.json diff --git a/crates/fhir/tests/data/R4/conceptmap.profile.json b/crates/fhir/tests/data/json/R4/conceptmap.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/conceptmap.profile.json rename to crates/fhir/tests/data/json/R4/conceptmap.profile.json diff --git a/crates/fhir/tests/data/R4/conceptmaps.json b/crates/fhir/tests/data/json/R4/conceptmaps.json similarity index 100% rename from crates/fhir/tests/data/R4/conceptmaps.json rename to crates/fhir/tests/data/json/R4/conceptmaps.json diff --git a/crates/fhir/tests/data/R4/condition-example-f001-heart.json b/crates/fhir/tests/data/json/R4/condition-example-f001-heart.json similarity index 100% rename from crates/fhir/tests/data/R4/condition-example-f001-heart.json rename to crates/fhir/tests/data/json/R4/condition-example-f001-heart.json diff --git a/crates/fhir/tests/data/R4/condition-example-f002-lung.json b/crates/fhir/tests/data/json/R4/condition-example-f002-lung.json similarity index 100% rename from crates/fhir/tests/data/R4/condition-example-f002-lung.json rename to crates/fhir/tests/data/json/R4/condition-example-f002-lung.json diff --git a/crates/fhir/tests/data/R4/condition-example-f003-abscess.json b/crates/fhir/tests/data/json/R4/condition-example-f003-abscess.json similarity index 100% rename from crates/fhir/tests/data/R4/condition-example-f003-abscess.json rename to crates/fhir/tests/data/json/R4/condition-example-f003-abscess.json diff --git a/crates/fhir/tests/data/R4/condition-example-f201-fever.json b/crates/fhir/tests/data/json/R4/condition-example-f201-fever.json similarity index 100% rename from crates/fhir/tests/data/R4/condition-example-f201-fever.json rename to crates/fhir/tests/data/json/R4/condition-example-f201-fever.json diff --git a/crates/fhir/tests/data/R4/condition-example-f202-malignancy.json b/crates/fhir/tests/data/json/R4/condition-example-f202-malignancy.json similarity index 100% rename from crates/fhir/tests/data/R4/condition-example-f202-malignancy.json rename to crates/fhir/tests/data/json/R4/condition-example-f202-malignancy.json diff --git a/crates/fhir/tests/data/R4/condition-example-f203-sepsis.json b/crates/fhir/tests/data/json/R4/condition-example-f203-sepsis.json similarity index 100% rename from crates/fhir/tests/data/R4/condition-example-f203-sepsis.json rename to crates/fhir/tests/data/json/R4/condition-example-f203-sepsis.json diff --git a/crates/fhir/tests/data/R4/condition-example-f204-renal.json b/crates/fhir/tests/data/json/R4/condition-example-f204-renal.json similarity index 100% rename from crates/fhir/tests/data/R4/condition-example-f204-renal.json rename to crates/fhir/tests/data/json/R4/condition-example-f204-renal.json diff --git a/crates/fhir/tests/data/R4/condition-example-f205-infection.json b/crates/fhir/tests/data/json/R4/condition-example-f205-infection.json similarity index 100% rename from crates/fhir/tests/data/R4/condition-example-f205-infection.json rename to crates/fhir/tests/data/json/R4/condition-example-f205-infection.json diff --git a/crates/fhir/tests/data/R4/condition-example-family-history.json b/crates/fhir/tests/data/json/R4/condition-example-family-history.json similarity index 100% rename from crates/fhir/tests/data/R4/condition-example-family-history.json rename to crates/fhir/tests/data/json/R4/condition-example-family-history.json diff --git a/crates/fhir/tests/data/R4/condition-example-stroke.json b/crates/fhir/tests/data/json/R4/condition-example-stroke.json similarity index 100% rename from crates/fhir/tests/data/R4/condition-example-stroke.json rename to crates/fhir/tests/data/json/R4/condition-example-stroke.json diff --git a/crates/fhir/tests/data/R4/condition-example.json b/crates/fhir/tests/data/json/R4/condition-example.json similarity index 100% rename from crates/fhir/tests/data/R4/condition-example.json rename to crates/fhir/tests/data/json/R4/condition-example.json diff --git a/crates/fhir/tests/data/R4/condition-example2.json b/crates/fhir/tests/data/json/R4/condition-example2.json similarity index 100% rename from crates/fhir/tests/data/R4/condition-example2.json rename to crates/fhir/tests/data/json/R4/condition-example2.json diff --git a/crates/fhir/tests/data/R4/condition-questionnaire.json b/crates/fhir/tests/data/json/R4/condition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/condition-questionnaire.json rename to crates/fhir/tests/data/json/R4/condition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/condition.profile.json b/crates/fhir/tests/data/json/R4/condition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/condition.profile.json rename to crates/fhir/tests/data/json/R4/condition.profile.json diff --git a/crates/fhir/tests/data/R4/consent-example-Emergency.json b/crates/fhir/tests/data/json/R4/consent-example-Emergency.json similarity index 100% rename from crates/fhir/tests/data/R4/consent-example-Emergency.json rename to crates/fhir/tests/data/json/R4/consent-example-Emergency.json diff --git a/crates/fhir/tests/data/R4/consent-example-Out.json b/crates/fhir/tests/data/json/R4/consent-example-Out.json similarity index 100% rename from crates/fhir/tests/data/R4/consent-example-Out.json rename to crates/fhir/tests/data/json/R4/consent-example-Out.json diff --git a/crates/fhir/tests/data/R4/consent-example-grantor.json b/crates/fhir/tests/data/json/R4/consent-example-grantor.json similarity index 100% rename from crates/fhir/tests/data/R4/consent-example-grantor.json rename to crates/fhir/tests/data/json/R4/consent-example-grantor.json diff --git a/crates/fhir/tests/data/R4/consent-example-notAuthor.json b/crates/fhir/tests/data/json/R4/consent-example-notAuthor.json similarity index 100% rename from crates/fhir/tests/data/R4/consent-example-notAuthor.json rename to crates/fhir/tests/data/json/R4/consent-example-notAuthor.json diff --git a/crates/fhir/tests/data/R4/consent-example-notOrg.json b/crates/fhir/tests/data/json/R4/consent-example-notOrg.json similarity index 100% rename from crates/fhir/tests/data/R4/consent-example-notOrg.json rename to crates/fhir/tests/data/json/R4/consent-example-notOrg.json diff --git a/crates/fhir/tests/data/R4/consent-example-notThem.json b/crates/fhir/tests/data/json/R4/consent-example-notThem.json similarity index 100% rename from crates/fhir/tests/data/R4/consent-example-notThem.json rename to crates/fhir/tests/data/json/R4/consent-example-notThem.json diff --git a/crates/fhir/tests/data/R4/consent-example-notThis.json b/crates/fhir/tests/data/json/R4/consent-example-notThis.json similarity index 100% rename from crates/fhir/tests/data/R4/consent-example-notThis.json rename to crates/fhir/tests/data/json/R4/consent-example-notThis.json diff --git a/crates/fhir/tests/data/R4/consent-example-notTime.json b/crates/fhir/tests/data/json/R4/consent-example-notTime.json similarity index 100% rename from crates/fhir/tests/data/R4/consent-example-notTime.json rename to crates/fhir/tests/data/json/R4/consent-example-notTime.json diff --git a/crates/fhir/tests/data/R4/consent-example-pkb.json b/crates/fhir/tests/data/json/R4/consent-example-pkb.json similarity index 100% rename from crates/fhir/tests/data/R4/consent-example-pkb.json rename to crates/fhir/tests/data/json/R4/consent-example-pkb.json diff --git a/crates/fhir/tests/data/R4/consent-example-signature.json b/crates/fhir/tests/data/json/R4/consent-example-signature.json similarity index 100% rename from crates/fhir/tests/data/R4/consent-example-signature.json rename to crates/fhir/tests/data/json/R4/consent-example-signature.json diff --git a/crates/fhir/tests/data/R4/consent-example-smartonfhir.json b/crates/fhir/tests/data/json/R4/consent-example-smartonfhir.json similarity index 100% rename from crates/fhir/tests/data/R4/consent-example-smartonfhir.json rename to crates/fhir/tests/data/json/R4/consent-example-smartonfhir.json diff --git a/crates/fhir/tests/data/R4/consent-example.json b/crates/fhir/tests/data/json/R4/consent-example.json similarity index 100% rename from crates/fhir/tests/data/R4/consent-example.json rename to crates/fhir/tests/data/json/R4/consent-example.json diff --git a/crates/fhir/tests/data/R4/consent-questionnaire.json b/crates/fhir/tests/data/json/R4/consent-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/consent-questionnaire.json rename to crates/fhir/tests/data/json/R4/consent-questionnaire.json diff --git a/crates/fhir/tests/data/R4/consent.profile.json b/crates/fhir/tests/data/json/R4/consent.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/consent.profile.json rename to crates/fhir/tests/data/json/R4/consent.profile.json diff --git a/crates/fhir/tests/data/R4/contactdetail.profile.json b/crates/fhir/tests/data/json/R4/contactdetail.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/contactdetail.profile.json rename to crates/fhir/tests/data/json/R4/contactdetail.profile.json diff --git a/crates/fhir/tests/data/R4/contactpoint.profile.json b/crates/fhir/tests/data/json/R4/contactpoint.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/contactpoint.profile.json rename to crates/fhir/tests/data/json/R4/contactpoint.profile.json diff --git a/crates/fhir/tests/data/R4/contract-example-42cfr-part2.json b/crates/fhir/tests/data/json/R4/contract-example-42cfr-part2.json similarity index 100% rename from crates/fhir/tests/data/R4/contract-example-42cfr-part2.json rename to crates/fhir/tests/data/json/R4/contract-example-42cfr-part2.json diff --git a/crates/fhir/tests/data/R4/contract-example-ins-policy.json b/crates/fhir/tests/data/json/R4/contract-example-ins-policy.json similarity index 100% rename from crates/fhir/tests/data/R4/contract-example-ins-policy.json rename to crates/fhir/tests/data/json/R4/contract-example-ins-policy.json diff --git a/crates/fhir/tests/data/R4/contract-example.json b/crates/fhir/tests/data/json/R4/contract-example.json similarity index 100% rename from crates/fhir/tests/data/R4/contract-example.json rename to crates/fhir/tests/data/json/R4/contract-example.json diff --git a/crates/fhir/tests/data/R4/contract-questionnaire.json b/crates/fhir/tests/data/json/R4/contract-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/contract-questionnaire.json rename to crates/fhir/tests/data/json/R4/contract-questionnaire.json diff --git a/crates/fhir/tests/data/R4/contract.profile.json b/crates/fhir/tests/data/json/R4/contract.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/contract.profile.json rename to crates/fhir/tests/data/json/R4/contract.profile.json diff --git a/crates/fhir/tests/data/R4/contributor.profile.json b/crates/fhir/tests/data/json/R4/contributor.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/contributor.profile.json rename to crates/fhir/tests/data/json/R4/contributor.profile.json diff --git a/crates/fhir/tests/data/R4/coord-0base-example.json b/crates/fhir/tests/data/json/R4/coord-0base-example.json similarity index 100% rename from crates/fhir/tests/data/R4/coord-0base-example.json rename to crates/fhir/tests/data/json/R4/coord-0base-example.json diff --git a/crates/fhir/tests/data/R4/coord-1base-example.json b/crates/fhir/tests/data/json/R4/coord-1base-example.json similarity index 100% rename from crates/fhir/tests/data/R4/coord-1base-example.json rename to crates/fhir/tests/data/json/R4/coord-1base-example.json diff --git a/crates/fhir/tests/data/R4/count.profile.json b/crates/fhir/tests/data/json/R4/count.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/count.profile.json rename to crates/fhir/tests/data/json/R4/count.profile.json diff --git a/crates/fhir/tests/data/R4/coverage-example-2.json b/crates/fhir/tests/data/json/R4/coverage-example-2.json similarity index 100% rename from crates/fhir/tests/data/R4/coverage-example-2.json rename to crates/fhir/tests/data/json/R4/coverage-example-2.json diff --git a/crates/fhir/tests/data/R4/coverage-example-ehic.json b/crates/fhir/tests/data/json/R4/coverage-example-ehic.json similarity index 100% rename from crates/fhir/tests/data/R4/coverage-example-ehic.json rename to crates/fhir/tests/data/json/R4/coverage-example-ehic.json diff --git a/crates/fhir/tests/data/R4/coverage-example-selfpay.json b/crates/fhir/tests/data/json/R4/coverage-example-selfpay.json similarity index 100% rename from crates/fhir/tests/data/R4/coverage-example-selfpay.json rename to crates/fhir/tests/data/json/R4/coverage-example-selfpay.json diff --git a/crates/fhir/tests/data/R4/coverage-example.json b/crates/fhir/tests/data/json/R4/coverage-example.json similarity index 100% rename from crates/fhir/tests/data/R4/coverage-example.json rename to crates/fhir/tests/data/json/R4/coverage-example.json diff --git a/crates/fhir/tests/data/R4/coverage-questionnaire.json b/crates/fhir/tests/data/json/R4/coverage-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/coverage-questionnaire.json rename to crates/fhir/tests/data/json/R4/coverage-questionnaire.json diff --git a/crates/fhir/tests/data/R4/coverage.profile.json b/crates/fhir/tests/data/json/R4/coverage.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/coverage.profile.json rename to crates/fhir/tests/data/json/R4/coverage.profile.json diff --git a/crates/fhir/tests/data/R4/coverageeligibilityrequest-example-2.json b/crates/fhir/tests/data/json/R4/coverageeligibilityrequest-example-2.json similarity index 100% rename from crates/fhir/tests/data/R4/coverageeligibilityrequest-example-2.json rename to crates/fhir/tests/data/json/R4/coverageeligibilityrequest-example-2.json diff --git a/crates/fhir/tests/data/R4/coverageeligibilityrequest-example.json b/crates/fhir/tests/data/json/R4/coverageeligibilityrequest-example.json similarity index 100% rename from crates/fhir/tests/data/R4/coverageeligibilityrequest-example.json rename to crates/fhir/tests/data/json/R4/coverageeligibilityrequest-example.json diff --git a/crates/fhir/tests/data/R4/coverageeligibilityrequest-questionnaire.json b/crates/fhir/tests/data/json/R4/coverageeligibilityrequest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/coverageeligibilityrequest-questionnaire.json rename to crates/fhir/tests/data/json/R4/coverageeligibilityrequest-questionnaire.json diff --git a/crates/fhir/tests/data/R4/coverageeligibilityrequest.profile.json b/crates/fhir/tests/data/json/R4/coverageeligibilityrequest.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/coverageeligibilityrequest.profile.json rename to crates/fhir/tests/data/json/R4/coverageeligibilityrequest.profile.json diff --git a/crates/fhir/tests/data/R4/coverageeligibilityresponse-example-benefits-2.json b/crates/fhir/tests/data/json/R4/coverageeligibilityresponse-example-benefits-2.json similarity index 100% rename from crates/fhir/tests/data/R4/coverageeligibilityresponse-example-benefits-2.json rename to crates/fhir/tests/data/json/R4/coverageeligibilityresponse-example-benefits-2.json diff --git a/crates/fhir/tests/data/R4/coverageeligibilityresponse-example-benefits.json b/crates/fhir/tests/data/json/R4/coverageeligibilityresponse-example-benefits.json similarity index 100% rename from crates/fhir/tests/data/R4/coverageeligibilityresponse-example-benefits.json rename to crates/fhir/tests/data/json/R4/coverageeligibilityresponse-example-benefits.json diff --git a/crates/fhir/tests/data/R4/coverageeligibilityresponse-example-error.json b/crates/fhir/tests/data/json/R4/coverageeligibilityresponse-example-error.json similarity index 100% rename from crates/fhir/tests/data/R4/coverageeligibilityresponse-example-error.json rename to crates/fhir/tests/data/json/R4/coverageeligibilityresponse-example-error.json diff --git a/crates/fhir/tests/data/R4/coverageeligibilityresponse-example.json b/crates/fhir/tests/data/json/R4/coverageeligibilityresponse-example.json similarity index 100% rename from crates/fhir/tests/data/R4/coverageeligibilityresponse-example.json rename to crates/fhir/tests/data/json/R4/coverageeligibilityresponse-example.json diff --git a/crates/fhir/tests/data/R4/coverageeligibilityresponse-questionnaire.json b/crates/fhir/tests/data/json/R4/coverageeligibilityresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/coverageeligibilityresponse-questionnaire.json rename to crates/fhir/tests/data/json/R4/coverageeligibilityresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R4/coverageeligibilityresponse.profile.json b/crates/fhir/tests/data/json/R4/coverageeligibilityresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/coverageeligibilityresponse.profile.json rename to crates/fhir/tests/data/json/R4/coverageeligibilityresponse.profile.json diff --git a/crates/fhir/tests/data/R4/cqf-questionnaire-questionnaire.json b/crates/fhir/tests/data/json/R4/cqf-questionnaire-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/cqf-questionnaire-questionnaire.json rename to crates/fhir/tests/data/json/R4/cqf-questionnaire-questionnaire.json diff --git a/crates/fhir/tests/data/R4/cqf-questionnaire.profile.json b/crates/fhir/tests/data/json/R4/cqf-questionnaire.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/cqf-questionnaire.profile.json rename to crates/fhir/tests/data/json/R4/cqf-questionnaire.profile.json diff --git a/crates/fhir/tests/data/R4/cqllibrary-questionnaire.json b/crates/fhir/tests/data/json/R4/cqllibrary-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/cqllibrary-questionnaire.json rename to crates/fhir/tests/data/json/R4/cqllibrary-questionnaire.json diff --git a/crates/fhir/tests/data/R4/cqllibrary.profile.json b/crates/fhir/tests/data/json/R4/cqllibrary.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/cqllibrary.profile.json rename to crates/fhir/tests/data/json/R4/cqllibrary.profile.json diff --git a/crates/fhir/tests/data/R4/dataelements.json b/crates/fhir/tests/data/json/R4/dataelements.json similarity index 100% rename from crates/fhir/tests/data/R4/dataelements.json rename to crates/fhir/tests/data/json/R4/dataelements.json diff --git a/crates/fhir/tests/data/R4/datarequirement.profile.json b/crates/fhir/tests/data/json/R4/datarequirement.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/datarequirement.profile.json rename to crates/fhir/tests/data/json/R4/datarequirement.profile.json diff --git a/crates/fhir/tests/data/R4/date.profile.json b/crates/fhir/tests/data/json/R4/date.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/date.profile.json rename to crates/fhir/tests/data/json/R4/date.profile.json diff --git a/crates/fhir/tests/data/R4/datetime.profile.json b/crates/fhir/tests/data/json/R4/datetime.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/datetime.profile.json rename to crates/fhir/tests/data/json/R4/datetime.profile.json diff --git a/crates/fhir/tests/data/R4/decimal.profile.json b/crates/fhir/tests/data/json/R4/decimal.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/decimal.profile.json rename to crates/fhir/tests/data/json/R4/decimal.profile.json diff --git a/crates/fhir/tests/data/R4/definition.json b/crates/fhir/tests/data/json/R4/definition.json similarity index 100% rename from crates/fhir/tests/data/R4/definition.json rename to crates/fhir/tests/data/json/R4/definition.json diff --git a/crates/fhir/tests/data/R4/detectedissue-example-allergy.json b/crates/fhir/tests/data/json/R4/detectedissue-example-allergy.json similarity index 100% rename from crates/fhir/tests/data/R4/detectedissue-example-allergy.json rename to crates/fhir/tests/data/json/R4/detectedissue-example-allergy.json diff --git a/crates/fhir/tests/data/R4/detectedissue-example-dup.json b/crates/fhir/tests/data/json/R4/detectedissue-example-dup.json similarity index 100% rename from crates/fhir/tests/data/R4/detectedissue-example-dup.json rename to crates/fhir/tests/data/json/R4/detectedissue-example-dup.json diff --git a/crates/fhir/tests/data/R4/detectedissue-example-lab.json b/crates/fhir/tests/data/json/R4/detectedissue-example-lab.json similarity index 100% rename from crates/fhir/tests/data/R4/detectedissue-example-lab.json rename to crates/fhir/tests/data/json/R4/detectedissue-example-lab.json diff --git a/crates/fhir/tests/data/R4/detectedissue-example.json b/crates/fhir/tests/data/json/R4/detectedissue-example.json similarity index 100% rename from crates/fhir/tests/data/R4/detectedissue-example.json rename to crates/fhir/tests/data/json/R4/detectedissue-example.json diff --git a/crates/fhir/tests/data/R4/detectedissue-questionnaire.json b/crates/fhir/tests/data/json/R4/detectedissue-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/detectedissue-questionnaire.json rename to crates/fhir/tests/data/json/R4/detectedissue-questionnaire.json diff --git a/crates/fhir/tests/data/R4/detectedissue.profile.json b/crates/fhir/tests/data/json/R4/detectedissue.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/detectedissue.profile.json rename to crates/fhir/tests/data/json/R4/detectedissue.profile.json diff --git a/crates/fhir/tests/data/R4/device-example-f001-feedingtube.json b/crates/fhir/tests/data/json/R4/device-example-f001-feedingtube.json similarity index 100% rename from crates/fhir/tests/data/R4/device-example-f001-feedingtube.json rename to crates/fhir/tests/data/json/R4/device-example-f001-feedingtube.json diff --git a/crates/fhir/tests/data/R4/device-example.json b/crates/fhir/tests/data/json/R4/device-example.json similarity index 100% rename from crates/fhir/tests/data/R4/device-example.json rename to crates/fhir/tests/data/json/R4/device-example.json diff --git a/crates/fhir/tests/data/R4/device-extensions-Device-din.json b/crates/fhir/tests/data/json/R4/device-extensions-Device-din.json similarity index 100% rename from crates/fhir/tests/data/R4/device-extensions-Device-din.json rename to crates/fhir/tests/data/json/R4/device-extensions-Device-din.json diff --git a/crates/fhir/tests/data/R4/device-questionnaire.json b/crates/fhir/tests/data/json/R4/device-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/device-questionnaire.json rename to crates/fhir/tests/data/json/R4/device-questionnaire.json diff --git a/crates/fhir/tests/data/R4/device.profile.json b/crates/fhir/tests/data/json/R4/device.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/device.profile.json rename to crates/fhir/tests/data/json/R4/device.profile.json diff --git a/crates/fhir/tests/data/R4/devicedefinition-example.json b/crates/fhir/tests/data/json/R4/devicedefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4/devicedefinition-example.json rename to crates/fhir/tests/data/json/R4/devicedefinition-example.json diff --git a/crates/fhir/tests/data/R4/devicedefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/devicedefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/devicedefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/devicedefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/devicedefinition.profile.json b/crates/fhir/tests/data/json/R4/devicedefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/devicedefinition.profile.json rename to crates/fhir/tests/data/json/R4/devicedefinition.profile.json diff --git a/crates/fhir/tests/data/R4/devicemetric-example.json b/crates/fhir/tests/data/json/R4/devicemetric-example.json similarity index 100% rename from crates/fhir/tests/data/R4/devicemetric-example.json rename to crates/fhir/tests/data/json/R4/devicemetric-example.json diff --git a/crates/fhir/tests/data/R4/devicemetric-questionnaire.json b/crates/fhir/tests/data/json/R4/devicemetric-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/devicemetric-questionnaire.json rename to crates/fhir/tests/data/json/R4/devicemetric-questionnaire.json diff --git a/crates/fhir/tests/data/R4/devicemetric.profile.json b/crates/fhir/tests/data/json/R4/devicemetric.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/devicemetric.profile.json rename to crates/fhir/tests/data/json/R4/devicemetric.profile.json diff --git a/crates/fhir/tests/data/R4/devicemetricobservation-questionnaire.json b/crates/fhir/tests/data/json/R4/devicemetricobservation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/devicemetricobservation-questionnaire.json rename to crates/fhir/tests/data/json/R4/devicemetricobservation-questionnaire.json diff --git a/crates/fhir/tests/data/R4/devicemetricobservation.profile.json b/crates/fhir/tests/data/json/R4/devicemetricobservation.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/devicemetricobservation.profile.json rename to crates/fhir/tests/data/json/R4/devicemetricobservation.profile.json diff --git a/crates/fhir/tests/data/R4/devicerequest-example-insulinpump.json b/crates/fhir/tests/data/json/R4/devicerequest-example-insulinpump.json similarity index 100% rename from crates/fhir/tests/data/R4/devicerequest-example-insulinpump.json rename to crates/fhir/tests/data/json/R4/devicerequest-example-insulinpump.json diff --git a/crates/fhir/tests/data/R4/devicerequest-example.json b/crates/fhir/tests/data/json/R4/devicerequest-example.json similarity index 100% rename from crates/fhir/tests/data/R4/devicerequest-example.json rename to crates/fhir/tests/data/json/R4/devicerequest-example.json diff --git a/crates/fhir/tests/data/R4/devicerequest-left-lens.json b/crates/fhir/tests/data/json/R4/devicerequest-left-lens.json similarity index 100% rename from crates/fhir/tests/data/R4/devicerequest-left-lens.json rename to crates/fhir/tests/data/json/R4/devicerequest-left-lens.json diff --git a/crates/fhir/tests/data/R4/devicerequest-questionnaire.json b/crates/fhir/tests/data/json/R4/devicerequest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/devicerequest-questionnaire.json rename to crates/fhir/tests/data/json/R4/devicerequest-questionnaire.json diff --git a/crates/fhir/tests/data/R4/devicerequest-right-lens.json b/crates/fhir/tests/data/json/R4/devicerequest-right-lens.json similarity index 100% rename from crates/fhir/tests/data/R4/devicerequest-right-lens.json rename to crates/fhir/tests/data/json/R4/devicerequest-right-lens.json diff --git a/crates/fhir/tests/data/R4/devicerequest.profile.json b/crates/fhir/tests/data/json/R4/devicerequest.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/devicerequest.profile.json rename to crates/fhir/tests/data/json/R4/devicerequest.profile.json diff --git a/crates/fhir/tests/data/R4/deviceusestatement-example.json b/crates/fhir/tests/data/json/R4/deviceusestatement-example.json similarity index 100% rename from crates/fhir/tests/data/R4/deviceusestatement-example.json rename to crates/fhir/tests/data/json/R4/deviceusestatement-example.json diff --git a/crates/fhir/tests/data/R4/deviceusestatement-questionnaire.json b/crates/fhir/tests/data/json/R4/deviceusestatement-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/deviceusestatement-questionnaire.json rename to crates/fhir/tests/data/json/R4/deviceusestatement-questionnaire.json diff --git a/crates/fhir/tests/data/R4/deviceusestatement.profile.json b/crates/fhir/tests/data/json/R4/deviceusestatement.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/deviceusestatement.profile.json rename to crates/fhir/tests/data/json/R4/deviceusestatement.profile.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-example-dxa.json b/crates/fhir/tests/data/json/R4/diagnosticreport-example-dxa.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-example-dxa.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-example-dxa.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-example-f001-bloodexam.json b/crates/fhir/tests/data/json/R4/diagnosticreport-example-f001-bloodexam.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-example-f001-bloodexam.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-example-f001-bloodexam.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-example-f201-brainct.json b/crates/fhir/tests/data/json/R4/diagnosticreport-example-f201-brainct.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-example-f201-brainct.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-example-f201-brainct.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-example-f202-bloodculture.json b/crates/fhir/tests/data/json/R4/diagnosticreport-example-f202-bloodculture.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-example-f202-bloodculture.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-example-f202-bloodculture.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-example-ghp.json b/crates/fhir/tests/data/json/R4/diagnosticreport-example-ghp.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-example-ghp.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-example-ghp.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-example-gingival-mass.json b/crates/fhir/tests/data/json/R4/diagnosticreport-example-gingival-mass.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-example-gingival-mass.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-example-gingival-mass.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-example-lipids.json b/crates/fhir/tests/data/json/R4/diagnosticreport-example-lipids.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-example-lipids.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-example-lipids.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-example-lri.json b/crates/fhir/tests/data/json/R4/diagnosticreport-example-lri.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-example-lri.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-example-lri.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-example-papsmear.json b/crates/fhir/tests/data/json/R4/diagnosticreport-example-papsmear.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-example-papsmear.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-example-papsmear.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-example-pgx.json b/crates/fhir/tests/data/json/R4/diagnosticreport-example-pgx.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-example-pgx.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-example-pgx.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-example-ultrasound.json b/crates/fhir/tests/data/json/R4/diagnosticreport-example-ultrasound.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-example-ultrasound.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-example-ultrasound.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-example.json b/crates/fhir/tests/data/json/R4/diagnosticreport-example.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-example.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-example.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-examples-general.json b/crates/fhir/tests/data/json/R4/diagnosticreport-examples-general.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-examples-general.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-examples-general.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-genetic-DiagnosticReport-assessed-condition.json b/crates/fhir/tests/data/json/R4/diagnosticreport-genetic-DiagnosticReport-assessed-condition.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-genetic-DiagnosticReport-assessed-condition.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-genetic-DiagnosticReport-assessed-condition.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-genetics-comprehensive-bone-marrow-report.json b/crates/fhir/tests/data/json/R4/diagnosticreport-genetics-comprehensive-bone-marrow-report.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-genetics-comprehensive-bone-marrow-report.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-genetics-comprehensive-bone-marrow-report.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-genetics-example-2-familyhistory.json b/crates/fhir/tests/data/json/R4/diagnosticreport-genetics-example-2-familyhistory.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-genetics-example-2-familyhistory.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-genetics-example-2-familyhistory.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-genetics-questionnaire.json b/crates/fhir/tests/data/json/R4/diagnosticreport-genetics-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-genetics-questionnaire.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-genetics-questionnaire.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-genetics.profile.json b/crates/fhir/tests/data/json/R4/diagnosticreport-genetics.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-genetics.profile.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-genetics.profile.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-hla-genetics-results-example.json b/crates/fhir/tests/data/json/R4/diagnosticreport-hla-genetics-results-example.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-hla-genetics-results-example.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-hla-genetics-results-example.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-micro1.json b/crates/fhir/tests/data/json/R4/diagnosticreport-micro1.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-micro1.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-micro1.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport-questionnaire.json b/crates/fhir/tests/data/json/R4/diagnosticreport-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport-questionnaire.json rename to crates/fhir/tests/data/json/R4/diagnosticreport-questionnaire.json diff --git a/crates/fhir/tests/data/R4/diagnosticreport.profile.json b/crates/fhir/tests/data/json/R4/diagnosticreport.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/diagnosticreport.profile.json rename to crates/fhir/tests/data/json/R4/diagnosticreport.profile.json diff --git a/crates/fhir/tests/data/R4/distance.profile.json b/crates/fhir/tests/data/json/R4/distance.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/distance.profile.json rename to crates/fhir/tests/data/json/R4/distance.profile.json diff --git a/crates/fhir/tests/data/R4/document-example-dischargesummary.json b/crates/fhir/tests/data/json/R4/document-example-dischargesummary.json similarity index 100% rename from crates/fhir/tests/data/R4/document-example-dischargesummary.json rename to crates/fhir/tests/data/json/R4/document-example-dischargesummary.json diff --git a/crates/fhir/tests/data/R4/documentmanifest-example.json b/crates/fhir/tests/data/json/R4/documentmanifest-example.json similarity index 100% rename from crates/fhir/tests/data/R4/documentmanifest-example.json rename to crates/fhir/tests/data/json/R4/documentmanifest-example.json diff --git a/crates/fhir/tests/data/R4/documentmanifest-fm-attachment.json b/crates/fhir/tests/data/json/R4/documentmanifest-fm-attachment.json similarity index 100% rename from crates/fhir/tests/data/R4/documentmanifest-fm-attachment.json rename to crates/fhir/tests/data/json/R4/documentmanifest-fm-attachment.json diff --git a/crates/fhir/tests/data/R4/documentmanifest-questionnaire.json b/crates/fhir/tests/data/json/R4/documentmanifest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/documentmanifest-questionnaire.json rename to crates/fhir/tests/data/json/R4/documentmanifest-questionnaire.json diff --git a/crates/fhir/tests/data/R4/documentmanifest.profile.json b/crates/fhir/tests/data/json/R4/documentmanifest.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/documentmanifest.profile.json rename to crates/fhir/tests/data/json/R4/documentmanifest.profile.json diff --git a/crates/fhir/tests/data/R4/documentreference-example.json b/crates/fhir/tests/data/json/R4/documentreference-example.json similarity index 100% rename from crates/fhir/tests/data/R4/documentreference-example.json rename to crates/fhir/tests/data/json/R4/documentreference-example.json diff --git a/crates/fhir/tests/data/R4/documentreference-questionnaire.json b/crates/fhir/tests/data/json/R4/documentreference-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/documentreference-questionnaire.json rename to crates/fhir/tests/data/json/R4/documentreference-questionnaire.json diff --git a/crates/fhir/tests/data/R4/documentreference.profile.json b/crates/fhir/tests/data/json/R4/documentreference.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/documentreference.profile.json rename to crates/fhir/tests/data/json/R4/documentreference.profile.json diff --git a/crates/fhir/tests/data/R4/domainresource.profile.json b/crates/fhir/tests/data/json/R4/domainresource.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/domainresource.profile.json rename to crates/fhir/tests/data/json/R4/domainresource.profile.json diff --git a/crates/fhir/tests/data/R4/dosage.profile.json b/crates/fhir/tests/data/json/R4/dosage.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/dosage.profile.json rename to crates/fhir/tests/data/json/R4/dosage.profile.json diff --git a/crates/fhir/tests/data/R4/duration.profile.json b/crates/fhir/tests/data/json/R4/duration.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/duration.profile.json rename to crates/fhir/tests/data/json/R4/duration.profile.json diff --git a/crates/fhir/tests/data/R4/effectevidencesynthesis-example.json b/crates/fhir/tests/data/json/R4/effectevidencesynthesis-example.json similarity index 100% rename from crates/fhir/tests/data/R4/effectevidencesynthesis-example.json rename to crates/fhir/tests/data/json/R4/effectevidencesynthesis-example.json diff --git a/crates/fhir/tests/data/R4/effectevidencesynthesis-questionnaire.json b/crates/fhir/tests/data/json/R4/effectevidencesynthesis-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/effectevidencesynthesis-questionnaire.json rename to crates/fhir/tests/data/json/R4/effectevidencesynthesis-questionnaire.json diff --git a/crates/fhir/tests/data/R4/effectevidencesynthesis.profile.json b/crates/fhir/tests/data/json/R4/effectevidencesynthesis.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/effectevidencesynthesis.profile.json rename to crates/fhir/tests/data/json/R4/effectevidencesynthesis.profile.json diff --git a/crates/fhir/tests/data/R4/element.profile.json b/crates/fhir/tests/data/json/R4/element.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/element.profile.json rename to crates/fhir/tests/data/json/R4/element.profile.json diff --git a/crates/fhir/tests/data/R4/elementdefinition-de-questionnaire.json b/crates/fhir/tests/data/json/R4/elementdefinition-de-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/elementdefinition-de-questionnaire.json rename to crates/fhir/tests/data/json/R4/elementdefinition-de-questionnaire.json diff --git a/crates/fhir/tests/data/R4/elementdefinition-de.profile.json b/crates/fhir/tests/data/json/R4/elementdefinition-de.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/elementdefinition-de.profile.json rename to crates/fhir/tests/data/json/R4/elementdefinition-de.profile.json diff --git a/crates/fhir/tests/data/R4/elementdefinition.profile.json b/crates/fhir/tests/data/json/R4/elementdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/elementdefinition.profile.json rename to crates/fhir/tests/data/json/R4/elementdefinition.profile.json diff --git a/crates/fhir/tests/data/R4/encounter-example-emerg.json b/crates/fhir/tests/data/json/R4/encounter-example-emerg.json similarity index 100% rename from crates/fhir/tests/data/R4/encounter-example-emerg.json rename to crates/fhir/tests/data/json/R4/encounter-example-emerg.json diff --git a/crates/fhir/tests/data/R4/encounter-example-f001-heart.json b/crates/fhir/tests/data/json/R4/encounter-example-f001-heart.json similarity index 100% rename from crates/fhir/tests/data/R4/encounter-example-f001-heart.json rename to crates/fhir/tests/data/json/R4/encounter-example-f001-heart.json diff --git a/crates/fhir/tests/data/R4/encounter-example-f002-lung.json b/crates/fhir/tests/data/json/R4/encounter-example-f002-lung.json similarity index 100% rename from crates/fhir/tests/data/R4/encounter-example-f002-lung.json rename to crates/fhir/tests/data/json/R4/encounter-example-f002-lung.json diff --git a/crates/fhir/tests/data/R4/encounter-example-f003-abscess.json b/crates/fhir/tests/data/json/R4/encounter-example-f003-abscess.json similarity index 100% rename from crates/fhir/tests/data/R4/encounter-example-f003-abscess.json rename to crates/fhir/tests/data/json/R4/encounter-example-f003-abscess.json diff --git a/crates/fhir/tests/data/R4/encounter-example-f201-20130404.json b/crates/fhir/tests/data/json/R4/encounter-example-f201-20130404.json similarity index 100% rename from crates/fhir/tests/data/R4/encounter-example-f201-20130404.json rename to crates/fhir/tests/data/json/R4/encounter-example-f201-20130404.json diff --git a/crates/fhir/tests/data/R4/encounter-example-f202-20130128.json b/crates/fhir/tests/data/json/R4/encounter-example-f202-20130128.json similarity index 100% rename from crates/fhir/tests/data/R4/encounter-example-f202-20130128.json rename to crates/fhir/tests/data/json/R4/encounter-example-f202-20130128.json diff --git a/crates/fhir/tests/data/R4/encounter-example-f203-20130311.json b/crates/fhir/tests/data/json/R4/encounter-example-f203-20130311.json similarity index 100% rename from crates/fhir/tests/data/R4/encounter-example-f203-20130311.json rename to crates/fhir/tests/data/json/R4/encounter-example-f203-20130311.json diff --git a/crates/fhir/tests/data/R4/encounter-example-home.json b/crates/fhir/tests/data/json/R4/encounter-example-home.json similarity index 100% rename from crates/fhir/tests/data/R4/encounter-example-home.json rename to crates/fhir/tests/data/json/R4/encounter-example-home.json diff --git a/crates/fhir/tests/data/R4/encounter-example-xcda.json b/crates/fhir/tests/data/json/R4/encounter-example-xcda.json similarity index 100% rename from crates/fhir/tests/data/R4/encounter-example-xcda.json rename to crates/fhir/tests/data/json/R4/encounter-example-xcda.json diff --git a/crates/fhir/tests/data/R4/encounter-example.json b/crates/fhir/tests/data/json/R4/encounter-example.json similarity index 100% rename from crates/fhir/tests/data/R4/encounter-example.json rename to crates/fhir/tests/data/json/R4/encounter-example.json diff --git a/crates/fhir/tests/data/R4/encounter-questionnaire.json b/crates/fhir/tests/data/json/R4/encounter-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/encounter-questionnaire.json rename to crates/fhir/tests/data/json/R4/encounter-questionnaire.json diff --git a/crates/fhir/tests/data/R4/encounter.profile.json b/crates/fhir/tests/data/json/R4/encounter.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/encounter.profile.json rename to crates/fhir/tests/data/json/R4/encounter.profile.json diff --git a/crates/fhir/tests/data/R4/endpoint-example-direct.json b/crates/fhir/tests/data/json/R4/endpoint-example-direct.json similarity index 100% rename from crates/fhir/tests/data/R4/endpoint-example-direct.json rename to crates/fhir/tests/data/json/R4/endpoint-example-direct.json diff --git a/crates/fhir/tests/data/R4/endpoint-example-iid.json b/crates/fhir/tests/data/json/R4/endpoint-example-iid.json similarity index 100% rename from crates/fhir/tests/data/R4/endpoint-example-iid.json rename to crates/fhir/tests/data/json/R4/endpoint-example-iid.json diff --git a/crates/fhir/tests/data/R4/endpoint-example-wadors.json b/crates/fhir/tests/data/json/R4/endpoint-example-wadors.json similarity index 100% rename from crates/fhir/tests/data/R4/endpoint-example-wadors.json rename to crates/fhir/tests/data/json/R4/endpoint-example-wadors.json diff --git a/crates/fhir/tests/data/R4/endpoint-example.json b/crates/fhir/tests/data/json/R4/endpoint-example.json similarity index 100% rename from crates/fhir/tests/data/R4/endpoint-example.json rename to crates/fhir/tests/data/json/R4/endpoint-example.json diff --git a/crates/fhir/tests/data/R4/endpoint-examples-general-template.json b/crates/fhir/tests/data/json/R4/endpoint-examples-general-template.json similarity index 100% rename from crates/fhir/tests/data/R4/endpoint-examples-general-template.json rename to crates/fhir/tests/data/json/R4/endpoint-examples-general-template.json diff --git a/crates/fhir/tests/data/R4/endpoint-questionnaire.json b/crates/fhir/tests/data/json/R4/endpoint-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/endpoint-questionnaire.json rename to crates/fhir/tests/data/json/R4/endpoint-questionnaire.json diff --git a/crates/fhir/tests/data/R4/endpoint.profile.json b/crates/fhir/tests/data/json/R4/endpoint.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/endpoint.profile.json rename to crates/fhir/tests/data/json/R4/endpoint.profile.json diff --git a/crates/fhir/tests/data/R4/enrollmentrequest-example.json b/crates/fhir/tests/data/json/R4/enrollmentrequest-example.json similarity index 100% rename from crates/fhir/tests/data/R4/enrollmentrequest-example.json rename to crates/fhir/tests/data/json/R4/enrollmentrequest-example.json diff --git a/crates/fhir/tests/data/R4/enrollmentrequest-questionnaire.json b/crates/fhir/tests/data/json/R4/enrollmentrequest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/enrollmentrequest-questionnaire.json rename to crates/fhir/tests/data/json/R4/enrollmentrequest-questionnaire.json diff --git a/crates/fhir/tests/data/R4/enrollmentrequest.profile.json b/crates/fhir/tests/data/json/R4/enrollmentrequest.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/enrollmentrequest.profile.json rename to crates/fhir/tests/data/json/R4/enrollmentrequest.profile.json diff --git a/crates/fhir/tests/data/R4/enrollmentresponse-example.json b/crates/fhir/tests/data/json/R4/enrollmentresponse-example.json similarity index 100% rename from crates/fhir/tests/data/R4/enrollmentresponse-example.json rename to crates/fhir/tests/data/json/R4/enrollmentresponse-example.json diff --git a/crates/fhir/tests/data/R4/enrollmentresponse-questionnaire.json b/crates/fhir/tests/data/json/R4/enrollmentresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/enrollmentresponse-questionnaire.json rename to crates/fhir/tests/data/json/R4/enrollmentresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R4/enrollmentresponse.profile.json b/crates/fhir/tests/data/json/R4/enrollmentresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/enrollmentresponse.profile.json rename to crates/fhir/tests/data/json/R4/enrollmentresponse.profile.json diff --git a/crates/fhir/tests/data/R4/episodeofcare-example.json b/crates/fhir/tests/data/json/R4/episodeofcare-example.json similarity index 100% rename from crates/fhir/tests/data/R4/episodeofcare-example.json rename to crates/fhir/tests/data/json/R4/episodeofcare-example.json diff --git a/crates/fhir/tests/data/R4/episodeofcare-questionnaire.json b/crates/fhir/tests/data/json/R4/episodeofcare-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/episodeofcare-questionnaire.json rename to crates/fhir/tests/data/json/R4/episodeofcare-questionnaire.json diff --git a/crates/fhir/tests/data/R4/episodeofcare.profile.json b/crates/fhir/tests/data/json/R4/episodeofcare.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/episodeofcare.profile.json rename to crates/fhir/tests/data/json/R4/episodeofcare.profile.json diff --git a/crates/fhir/tests/data/R4/event.json b/crates/fhir/tests/data/json/R4/event.json similarity index 100% rename from crates/fhir/tests/data/R4/event.json rename to crates/fhir/tests/data/json/R4/event.json diff --git a/crates/fhir/tests/data/R4/eventdefinition-example.json b/crates/fhir/tests/data/json/R4/eventdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4/eventdefinition-example.json rename to crates/fhir/tests/data/json/R4/eventdefinition-example.json diff --git a/crates/fhir/tests/data/R4/eventdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/eventdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/eventdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/eventdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/eventdefinition.profile.json b/crates/fhir/tests/data/json/R4/eventdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/eventdefinition.profile.json rename to crates/fhir/tests/data/json/R4/eventdefinition.profile.json diff --git a/crates/fhir/tests/data/R4/evidence-example.json b/crates/fhir/tests/data/json/R4/evidence-example.json similarity index 100% rename from crates/fhir/tests/data/R4/evidence-example.json rename to crates/fhir/tests/data/json/R4/evidence-example.json diff --git a/crates/fhir/tests/data/R4/evidence-questionnaire.json b/crates/fhir/tests/data/json/R4/evidence-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/evidence-questionnaire.json rename to crates/fhir/tests/data/json/R4/evidence-questionnaire.json diff --git a/crates/fhir/tests/data/R4/evidence.profile.json b/crates/fhir/tests/data/json/R4/evidence.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/evidence.profile.json rename to crates/fhir/tests/data/json/R4/evidence.profile.json diff --git a/crates/fhir/tests/data/R4/evidencevariable-example.json b/crates/fhir/tests/data/json/R4/evidencevariable-example.json similarity index 100% rename from crates/fhir/tests/data/R4/evidencevariable-example.json rename to crates/fhir/tests/data/json/R4/evidencevariable-example.json diff --git a/crates/fhir/tests/data/R4/evidencevariable-questionnaire.json b/crates/fhir/tests/data/json/R4/evidencevariable-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/evidencevariable-questionnaire.json rename to crates/fhir/tests/data/json/R4/evidencevariable-questionnaire.json diff --git a/crates/fhir/tests/data/R4/evidencevariable.profile.json b/crates/fhir/tests/data/json/R4/evidencevariable.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/evidencevariable.profile.json rename to crates/fhir/tests/data/json/R4/evidencevariable.profile.json diff --git a/crates/fhir/tests/data/R4/examplescenario-example.json b/crates/fhir/tests/data/json/R4/examplescenario-example.json similarity index 100% rename from crates/fhir/tests/data/R4/examplescenario-example.json rename to crates/fhir/tests/data/json/R4/examplescenario-example.json diff --git a/crates/fhir/tests/data/R4/examplescenario-questionnaire.json b/crates/fhir/tests/data/json/R4/examplescenario-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/examplescenario-questionnaire.json rename to crates/fhir/tests/data/json/R4/examplescenario-questionnaire.json diff --git a/crates/fhir/tests/data/R4/examplescenario.profile.json b/crates/fhir/tests/data/json/R4/examplescenario.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/examplescenario.profile.json rename to crates/fhir/tests/data/json/R4/examplescenario.profile.json diff --git a/crates/fhir/tests/data/R4/explanationofbenefit-example-2.json b/crates/fhir/tests/data/json/R4/explanationofbenefit-example-2.json similarity index 100% rename from crates/fhir/tests/data/R4/explanationofbenefit-example-2.json rename to crates/fhir/tests/data/json/R4/explanationofbenefit-example-2.json diff --git a/crates/fhir/tests/data/R4/explanationofbenefit-example.json b/crates/fhir/tests/data/json/R4/explanationofbenefit-example.json similarity index 100% rename from crates/fhir/tests/data/R4/explanationofbenefit-example.json rename to crates/fhir/tests/data/json/R4/explanationofbenefit-example.json diff --git a/crates/fhir/tests/data/R4/explanationofbenefit-questionnaire.json b/crates/fhir/tests/data/json/R4/explanationofbenefit-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/explanationofbenefit-questionnaire.json rename to crates/fhir/tests/data/json/R4/explanationofbenefit-questionnaire.json diff --git a/crates/fhir/tests/data/R4/explanationofbenefit.profile.json b/crates/fhir/tests/data/json/R4/explanationofbenefit.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/explanationofbenefit.profile.json rename to crates/fhir/tests/data/json/R4/explanationofbenefit.profile.json diff --git a/crates/fhir/tests/data/R4/expression.profile.json b/crates/fhir/tests/data/json/R4/expression.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/expression.profile.json rename to crates/fhir/tests/data/json/R4/expression.profile.json diff --git a/crates/fhir/tests/data/R4/extension-11179-objectclass.json b/crates/fhir/tests/data/json/R4/extension-11179-objectclass.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-11179-objectclass.json rename to crates/fhir/tests/data/json/R4/extension-11179-objectclass.json diff --git a/crates/fhir/tests/data/R4/extension-11179-objectclassproperty.json b/crates/fhir/tests/data/json/R4/extension-11179-objectclassproperty.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-11179-objectclassproperty.json rename to crates/fhir/tests/data/json/R4/extension-11179-objectclassproperty.json diff --git a/crates/fhir/tests/data/R4/extension-11179-permitted-value-conceptmap.json b/crates/fhir/tests/data/json/R4/extension-11179-permitted-value-conceptmap.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-11179-permitted-value-conceptmap.json rename to crates/fhir/tests/data/json/R4/extension-11179-permitted-value-conceptmap.json diff --git a/crates/fhir/tests/data/R4/extension-11179-permitted-value-valueset.json b/crates/fhir/tests/data/json/R4/extension-11179-permitted-value-valueset.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-11179-permitted-value-valueset.json rename to crates/fhir/tests/data/json/R4/extension-11179-permitted-value-valueset.json diff --git a/crates/fhir/tests/data/R4/extension-allergyintolerance-asserteddate.json b/crates/fhir/tests/data/json/R4/extension-allergyintolerance-asserteddate.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-allergyintolerance-asserteddate.json rename to crates/fhir/tests/data/json/R4/extension-allergyintolerance-asserteddate.json diff --git a/crates/fhir/tests/data/R4/extension-allergyintolerance-certainty.json b/crates/fhir/tests/data/json/R4/extension-allergyintolerance-certainty.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-allergyintolerance-certainty.json rename to crates/fhir/tests/data/json/R4/extension-allergyintolerance-certainty.json diff --git a/crates/fhir/tests/data/R4/extension-allergyintolerance-duration.json b/crates/fhir/tests/data/json/R4/extension-allergyintolerance-duration.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-allergyintolerance-duration.json rename to crates/fhir/tests/data/json/R4/extension-allergyintolerance-duration.json diff --git a/crates/fhir/tests/data/R4/extension-allergyintolerance-reasonrefuted.json b/crates/fhir/tests/data/json/R4/extension-allergyintolerance-reasonrefuted.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-allergyintolerance-reasonrefuted.json rename to crates/fhir/tests/data/json/R4/extension-allergyintolerance-reasonrefuted.json diff --git a/crates/fhir/tests/data/R4/extension-allergyintolerance-resolutionage.json b/crates/fhir/tests/data/json/R4/extension-allergyintolerance-resolutionage.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-allergyintolerance-resolutionage.json rename to crates/fhir/tests/data/json/R4/extension-allergyintolerance-resolutionage.json diff --git a/crates/fhir/tests/data/R4/extension-allergyintolerance-substanceexposurerisk.json b/crates/fhir/tests/data/json/R4/extension-allergyintolerance-substanceexposurerisk.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-allergyintolerance-substanceexposurerisk.json rename to crates/fhir/tests/data/json/R4/extension-allergyintolerance-substanceexposurerisk.json diff --git a/crates/fhir/tests/data/R4/extension-auditevent-accession.json b/crates/fhir/tests/data/json/R4/extension-auditevent-accession.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-auditevent-accession.json rename to crates/fhir/tests/data/json/R4/extension-auditevent-accession.json diff --git a/crates/fhir/tests/data/R4/extension-auditevent-anonymized.json b/crates/fhir/tests/data/json/R4/extension-auditevent-anonymized.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-auditevent-anonymized.json rename to crates/fhir/tests/data/json/R4/extension-auditevent-anonymized.json diff --git a/crates/fhir/tests/data/R4/extension-auditevent-encrypted.json b/crates/fhir/tests/data/json/R4/extension-auditevent-encrypted.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-auditevent-encrypted.json rename to crates/fhir/tests/data/json/R4/extension-auditevent-encrypted.json diff --git a/crates/fhir/tests/data/R4/extension-auditevent-instance.json b/crates/fhir/tests/data/json/R4/extension-auditevent-instance.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-auditevent-instance.json rename to crates/fhir/tests/data/json/R4/extension-auditevent-instance.json diff --git a/crates/fhir/tests/data/R4/extension-auditevent-mpps.json b/crates/fhir/tests/data/json/R4/extension-auditevent-mpps.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-auditevent-mpps.json rename to crates/fhir/tests/data/json/R4/extension-auditevent-mpps.json diff --git a/crates/fhir/tests/data/R4/extension-auditevent-numberofinstances.json b/crates/fhir/tests/data/json/R4/extension-auditevent-numberofinstances.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-auditevent-numberofinstances.json rename to crates/fhir/tests/data/json/R4/extension-auditevent-numberofinstances.json diff --git a/crates/fhir/tests/data/R4/extension-auditevent-participantobjectcontainsstudy.json b/crates/fhir/tests/data/json/R4/extension-auditevent-participantobjectcontainsstudy.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-auditevent-participantobjectcontainsstudy.json rename to crates/fhir/tests/data/json/R4/extension-auditevent-participantobjectcontainsstudy.json diff --git a/crates/fhir/tests/data/R4/extension-auditevent-sopclass.json b/crates/fhir/tests/data/json/R4/extension-auditevent-sopclass.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-auditevent-sopclass.json rename to crates/fhir/tests/data/json/R4/extension-auditevent-sopclass.json diff --git a/crates/fhir/tests/data/R4/extension-bodysite.json b/crates/fhir/tests/data/json/R4/extension-bodysite.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-bodysite.json rename to crates/fhir/tests/data/json/R4/extension-bodysite.json diff --git a/crates/fhir/tests/data/R4/extension-capabilities.json b/crates/fhir/tests/data/json/R4/extension-capabilities.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-capabilities.json rename to crates/fhir/tests/data/json/R4/extension-capabilities.json diff --git a/crates/fhir/tests/data/R4/extension-capabilitystatement-expectation.json b/crates/fhir/tests/data/json/R4/extension-capabilitystatement-expectation.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-capabilitystatement-expectation.json rename to crates/fhir/tests/data/json/R4/extension-capabilitystatement-expectation.json diff --git a/crates/fhir/tests/data/R4/extension-capabilitystatement-prohibited.json b/crates/fhir/tests/data/json/R4/extension-capabilitystatement-prohibited.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-capabilitystatement-prohibited.json rename to crates/fhir/tests/data/json/R4/extension-capabilitystatement-prohibited.json diff --git a/crates/fhir/tests/data/R4/extension-capabilitystatement-search-parameter-combination.json b/crates/fhir/tests/data/json/R4/extension-capabilitystatement-search-parameter-combination.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-capabilitystatement-search-parameter-combination.json rename to crates/fhir/tests/data/json/R4/extension-capabilitystatement-search-parameter-combination.json diff --git a/crates/fhir/tests/data/R4/extension-capabilitystatement-supported-system.json b/crates/fhir/tests/data/json/R4/extension-capabilitystatement-supported-system.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-capabilitystatement-supported-system.json rename to crates/fhir/tests/data/json/R4/extension-capabilitystatement-supported-system.json diff --git a/crates/fhir/tests/data/R4/extension-capabilitystatement-websocket.json b/crates/fhir/tests/data/json/R4/extension-capabilitystatement-websocket.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-capabilitystatement-websocket.json rename to crates/fhir/tests/data/json/R4/extension-capabilitystatement-websocket.json diff --git a/crates/fhir/tests/data/R4/extension-careplan-activity-title.json b/crates/fhir/tests/data/json/R4/extension-careplan-activity-title.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-careplan-activity-title.json rename to crates/fhir/tests/data/json/R4/extension-careplan-activity-title.json diff --git a/crates/fhir/tests/data/R4/extension-codesystem-alternate.json b/crates/fhir/tests/data/json/R4/extension-codesystem-alternate.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-codesystem-alternate.json rename to crates/fhir/tests/data/json/R4/extension-codesystem-alternate.json diff --git a/crates/fhir/tests/data/R4/extension-codesystem-author.json b/crates/fhir/tests/data/json/R4/extension-codesystem-author.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-codesystem-author.json rename to crates/fhir/tests/data/json/R4/extension-codesystem-author.json diff --git a/crates/fhir/tests/data/R4/extension-codesystem-concept-comments.json b/crates/fhir/tests/data/json/R4/extension-codesystem-concept-comments.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-codesystem-concept-comments.json rename to crates/fhir/tests/data/json/R4/extension-codesystem-concept-comments.json diff --git a/crates/fhir/tests/data/R4/extension-codesystem-conceptorder.json b/crates/fhir/tests/data/json/R4/extension-codesystem-conceptorder.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-codesystem-conceptorder.json rename to crates/fhir/tests/data/json/R4/extension-codesystem-conceptorder.json diff --git a/crates/fhir/tests/data/R4/extension-codesystem-effectivedate.json b/crates/fhir/tests/data/json/R4/extension-codesystem-effectivedate.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-codesystem-effectivedate.json rename to crates/fhir/tests/data/json/R4/extension-codesystem-effectivedate.json diff --git a/crates/fhir/tests/data/R4/extension-codesystem-expirationdate.json b/crates/fhir/tests/data/json/R4/extension-codesystem-expirationdate.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-codesystem-expirationdate.json rename to crates/fhir/tests/data/json/R4/extension-codesystem-expirationdate.json diff --git a/crates/fhir/tests/data/R4/extension-codesystem-history.json b/crates/fhir/tests/data/json/R4/extension-codesystem-history.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-codesystem-history.json rename to crates/fhir/tests/data/json/R4/extension-codesystem-history.json diff --git a/crates/fhir/tests/data/R4/extension-codesystem-keyword.json b/crates/fhir/tests/data/json/R4/extension-codesystem-keyword.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-codesystem-keyword.json rename to crates/fhir/tests/data/json/R4/extension-codesystem-keyword.json diff --git a/crates/fhir/tests/data/R4/extension-codesystem-label.json b/crates/fhir/tests/data/json/R4/extension-codesystem-label.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-codesystem-label.json rename to crates/fhir/tests/data/json/R4/extension-codesystem-label.json diff --git a/crates/fhir/tests/data/R4/extension-codesystem-map.json b/crates/fhir/tests/data/json/R4/extension-codesystem-map.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-codesystem-map.json rename to crates/fhir/tests/data/json/R4/extension-codesystem-map.json diff --git a/crates/fhir/tests/data/R4/extension-codesystem-othername.json b/crates/fhir/tests/data/json/R4/extension-codesystem-othername.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-codesystem-othername.json rename to crates/fhir/tests/data/json/R4/extension-codesystem-othername.json diff --git a/crates/fhir/tests/data/R4/extension-codesystem-replacedby.json b/crates/fhir/tests/data/json/R4/extension-codesystem-replacedby.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-codesystem-replacedby.json rename to crates/fhir/tests/data/json/R4/extension-codesystem-replacedby.json diff --git a/crates/fhir/tests/data/R4/extension-codesystem-sourcereference.json b/crates/fhir/tests/data/json/R4/extension-codesystem-sourcereference.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-codesystem-sourcereference.json rename to crates/fhir/tests/data/json/R4/extension-codesystem-sourcereference.json diff --git a/crates/fhir/tests/data/R4/extension-codesystem-trusted-expansion.json b/crates/fhir/tests/data/json/R4/extension-codesystem-trusted-expansion.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-codesystem-trusted-expansion.json rename to crates/fhir/tests/data/json/R4/extension-codesystem-trusted-expansion.json diff --git a/crates/fhir/tests/data/R4/extension-codesystem-usage.json b/crates/fhir/tests/data/json/R4/extension-codesystem-usage.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-codesystem-usage.json rename to crates/fhir/tests/data/json/R4/extension-codesystem-usage.json diff --git a/crates/fhir/tests/data/R4/extension-codesystem-warning.json b/crates/fhir/tests/data/json/R4/extension-codesystem-warning.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-codesystem-warning.json rename to crates/fhir/tests/data/json/R4/extension-codesystem-warning.json diff --git a/crates/fhir/tests/data/R4/extension-codesystem-workflowstatus.json b/crates/fhir/tests/data/json/R4/extension-codesystem-workflowstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-codesystem-workflowstatus.json rename to crates/fhir/tests/data/json/R4/extension-codesystem-workflowstatus.json diff --git a/crates/fhir/tests/data/R4/extension-coding-sctdescid.json b/crates/fhir/tests/data/json/R4/extension-coding-sctdescid.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-coding-sctdescid.json rename to crates/fhir/tests/data/json/R4/extension-coding-sctdescid.json diff --git a/crates/fhir/tests/data/R4/extension-communication-media.json b/crates/fhir/tests/data/json/R4/extension-communication-media.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-communication-media.json rename to crates/fhir/tests/data/json/R4/extension-communication-media.json diff --git a/crates/fhir/tests/data/R4/extension-communicationrequest-initiatinglocation.json b/crates/fhir/tests/data/json/R4/extension-communicationrequest-initiatinglocation.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-communicationrequest-initiatinglocation.json rename to crates/fhir/tests/data/json/R4/extension-communicationrequest-initiatinglocation.json diff --git a/crates/fhir/tests/data/R4/extension-composition-clinicaldocument-otherconfidentiality.json b/crates/fhir/tests/data/json/R4/extension-composition-clinicaldocument-otherconfidentiality.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-composition-clinicaldocument-otherconfidentiality.json rename to crates/fhir/tests/data/json/R4/extension-composition-clinicaldocument-otherconfidentiality.json diff --git a/crates/fhir/tests/data/R4/extension-composition-clinicaldocument-versionnumber.json b/crates/fhir/tests/data/json/R4/extension-composition-clinicaldocument-versionnumber.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-composition-clinicaldocument-versionnumber.json rename to crates/fhir/tests/data/json/R4/extension-composition-clinicaldocument-versionnumber.json diff --git a/crates/fhir/tests/data/R4/extension-composition-section-subject.json b/crates/fhir/tests/data/json/R4/extension-composition-section-subject.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-composition-section-subject.json rename to crates/fhir/tests/data/json/R4/extension-composition-section-subject.json diff --git a/crates/fhir/tests/data/R4/extension-concept-bidirectional.json b/crates/fhir/tests/data/json/R4/extension-concept-bidirectional.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-concept-bidirectional.json rename to crates/fhir/tests/data/json/R4/extension-concept-bidirectional.json diff --git a/crates/fhir/tests/data/R4/extension-condition-asserteddate.json b/crates/fhir/tests/data/json/R4/extension-condition-asserteddate.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-condition-asserteddate.json rename to crates/fhir/tests/data/json/R4/extension-condition-asserteddate.json diff --git a/crates/fhir/tests/data/R4/extension-condition-dueto.json b/crates/fhir/tests/data/json/R4/extension-condition-dueto.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-condition-dueto.json rename to crates/fhir/tests/data/json/R4/extension-condition-dueto.json diff --git a/crates/fhir/tests/data/R4/extension-condition-occurredfollowing.json b/crates/fhir/tests/data/json/R4/extension-condition-occurredfollowing.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-condition-occurredfollowing.json rename to crates/fhir/tests/data/json/R4/extension-condition-occurredfollowing.json diff --git a/crates/fhir/tests/data/R4/extension-condition-outcome.json b/crates/fhir/tests/data/json/R4/extension-condition-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-condition-outcome.json rename to crates/fhir/tests/data/json/R4/extension-condition-outcome.json diff --git a/crates/fhir/tests/data/R4/extension-condition-related.json b/crates/fhir/tests/data/json/R4/extension-condition-related.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-condition-related.json rename to crates/fhir/tests/data/json/R4/extension-condition-related.json diff --git a/crates/fhir/tests/data/R4/extension-condition-ruledout.json b/crates/fhir/tests/data/json/R4/extension-condition-ruledout.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-condition-ruledout.json rename to crates/fhir/tests/data/json/R4/extension-condition-ruledout.json diff --git a/crates/fhir/tests/data/R4/extension-consent-location.json b/crates/fhir/tests/data/json/R4/extension-consent-location.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-consent-location.json rename to crates/fhir/tests/data/json/R4/extension-consent-location.json diff --git a/crates/fhir/tests/data/R4/extension-consent-notificationendpoint.json b/crates/fhir/tests/data/json/R4/extension-consent-notificationendpoint.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-consent-notificationendpoint.json rename to crates/fhir/tests/data/json/R4/extension-consent-notificationendpoint.json diff --git a/crates/fhir/tests/data/R4/extension-consent-transcriber.json b/crates/fhir/tests/data/json/R4/extension-consent-transcriber.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-consent-transcriber.json rename to crates/fhir/tests/data/json/R4/extension-consent-transcriber.json diff --git a/crates/fhir/tests/data/R4/extension-consent-witness.json b/crates/fhir/tests/data/json/R4/extension-consent-witness.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-consent-witness.json rename to crates/fhir/tests/data/json/R4/extension-consent-witness.json diff --git a/crates/fhir/tests/data/R4/extension-contactpoint-area.json b/crates/fhir/tests/data/json/R4/extension-contactpoint-area.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-contactpoint-area.json rename to crates/fhir/tests/data/json/R4/extension-contactpoint-area.json diff --git a/crates/fhir/tests/data/R4/extension-contactpoint-country.json b/crates/fhir/tests/data/json/R4/extension-contactpoint-country.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-contactpoint-country.json rename to crates/fhir/tests/data/json/R4/extension-contactpoint-country.json diff --git a/crates/fhir/tests/data/R4/extension-contactpoint-extension.json b/crates/fhir/tests/data/json/R4/extension-contactpoint-extension.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-contactpoint-extension.json rename to crates/fhir/tests/data/json/R4/extension-contactpoint-extension.json diff --git a/crates/fhir/tests/data/R4/extension-contactpoint-local.json b/crates/fhir/tests/data/json/R4/extension-contactpoint-local.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-contactpoint-local.json rename to crates/fhir/tests/data/json/R4/extension-contactpoint-local.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-calculatedvalue.json b/crates/fhir/tests/data/json/R4/extension-cqf-calculatedvalue.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-calculatedvalue.json rename to crates/fhir/tests/data/json/R4/extension-cqf-calculatedvalue.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-cdshooksendpoint.json b/crates/fhir/tests/data/json/R4/extension-cqf-cdshooksendpoint.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-cdshooksendpoint.json rename to crates/fhir/tests/data/json/R4/extension-cqf-cdshooksendpoint.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-citation.json b/crates/fhir/tests/data/json/R4/extension-cqf-citation.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-citation.json rename to crates/fhir/tests/data/json/R4/extension-cqf-citation.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-encounterclass.json b/crates/fhir/tests/data/json/R4/extension-cqf-encounterclass.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-encounterclass.json rename to crates/fhir/tests/data/json/R4/extension-cqf-encounterclass.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-encountertype.json b/crates/fhir/tests/data/json/R4/extension-cqf-encountertype.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-encountertype.json rename to crates/fhir/tests/data/json/R4/extension-cqf-encountertype.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-expression.json b/crates/fhir/tests/data/json/R4/extension-cqf-expression.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-expression.json rename to crates/fhir/tests/data/json/R4/extension-cqf-expression.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-initialvalue.json b/crates/fhir/tests/data/json/R4/extension-cqf-initialvalue.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-initialvalue.json rename to crates/fhir/tests/data/json/R4/extension-cqf-initialvalue.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-initiatingorganization.json b/crates/fhir/tests/data/json/R4/extension-cqf-initiatingorganization.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-initiatingorganization.json rename to crates/fhir/tests/data/json/R4/extension-cqf-initiatingorganization.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-initiatingperson.json b/crates/fhir/tests/data/json/R4/extension-cqf-initiatingperson.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-initiatingperson.json rename to crates/fhir/tests/data/json/R4/extension-cqf-initiatingperson.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-library.json b/crates/fhir/tests/data/json/R4/extension-cqf-library.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-library.json rename to crates/fhir/tests/data/json/R4/extension-cqf-library.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-measureinfo.json b/crates/fhir/tests/data/json/R4/extension-cqf-measureinfo.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-measureinfo.json rename to crates/fhir/tests/data/json/R4/extension-cqf-measureinfo.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-qualityofevidence.json b/crates/fhir/tests/data/json/R4/extension-cqf-qualityofevidence.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-qualityofevidence.json rename to crates/fhir/tests/data/json/R4/extension-cqf-qualityofevidence.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-receivingorganization.json b/crates/fhir/tests/data/json/R4/extension-cqf-receivingorganization.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-receivingorganization.json rename to crates/fhir/tests/data/json/R4/extension-cqf-receivingorganization.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-receivingperson.json b/crates/fhir/tests/data/json/R4/extension-cqf-receivingperson.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-receivingperson.json rename to crates/fhir/tests/data/json/R4/extension-cqf-receivingperson.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-recipientlanguage.json b/crates/fhir/tests/data/json/R4/extension-cqf-recipientlanguage.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-recipientlanguage.json rename to crates/fhir/tests/data/json/R4/extension-cqf-recipientlanguage.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-recipienttype.json b/crates/fhir/tests/data/json/R4/extension-cqf-recipienttype.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-recipienttype.json rename to crates/fhir/tests/data/json/R4/extension-cqf-recipienttype.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-relativedatetime.json b/crates/fhir/tests/data/json/R4/extension-cqf-relativedatetime.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-relativedatetime.json rename to crates/fhir/tests/data/json/R4/extension-cqf-relativedatetime.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-strengthofrecommendation.json b/crates/fhir/tests/data/json/R4/extension-cqf-strengthofrecommendation.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-strengthofrecommendation.json rename to crates/fhir/tests/data/json/R4/extension-cqf-strengthofrecommendation.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-systemuserlanguage.json b/crates/fhir/tests/data/json/R4/extension-cqf-systemuserlanguage.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-systemuserlanguage.json rename to crates/fhir/tests/data/json/R4/extension-cqf-systemuserlanguage.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-systemusertaskcontext.json b/crates/fhir/tests/data/json/R4/extension-cqf-systemusertaskcontext.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-systemusertaskcontext.json rename to crates/fhir/tests/data/json/R4/extension-cqf-systemusertaskcontext.json diff --git a/crates/fhir/tests/data/R4/extension-cqf-systemusertype.json b/crates/fhir/tests/data/json/R4/extension-cqf-systemusertype.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqf-systemusertype.json rename to crates/fhir/tests/data/json/R4/extension-cqf-systemusertype.json diff --git a/crates/fhir/tests/data/R4/extension-cqm-validityperiod.json b/crates/fhir/tests/data/json/R4/extension-cqm-validityperiod.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-cqm-validityperiod.json rename to crates/fhir/tests/data/json/R4/extension-cqm-validityperiod.json diff --git a/crates/fhir/tests/data/R4/extension-data-absent-reason.json b/crates/fhir/tests/data/json/R4/extension-data-absent-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-data-absent-reason.json rename to crates/fhir/tests/data/json/R4/extension-data-absent-reason.json diff --git a/crates/fhir/tests/data/R4/extension-definitions.json b/crates/fhir/tests/data/json/R4/extension-definitions.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-definitions.json rename to crates/fhir/tests/data/json/R4/extension-definitions.json diff --git a/crates/fhir/tests/data/R4/extension-designnote.json b/crates/fhir/tests/data/json/R4/extension-designnote.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-designnote.json rename to crates/fhir/tests/data/json/R4/extension-designnote.json diff --git a/crates/fhir/tests/data/R4/extension-device-implantstatus.json b/crates/fhir/tests/data/json/R4/extension-device-implantstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-device-implantstatus.json rename to crates/fhir/tests/data/json/R4/extension-device-implantstatus.json diff --git a/crates/fhir/tests/data/R4/extension-devicerequest-patientinstruction.json b/crates/fhir/tests/data/json/R4/extension-devicerequest-patientinstruction.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-devicerequest-patientinstruction.json rename to crates/fhir/tests/data/json/R4/extension-devicerequest-patientinstruction.json diff --git a/crates/fhir/tests/data/R4/extension-diagnosticreport-addendumof.json b/crates/fhir/tests/data/json/R4/extension-diagnosticreport-addendumof.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-diagnosticreport-addendumof.json rename to crates/fhir/tests/data/json/R4/extension-diagnosticreport-addendumof.json diff --git a/crates/fhir/tests/data/R4/extension-diagnosticreport-extends.json b/crates/fhir/tests/data/json/R4/extension-diagnosticreport-extends.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-diagnosticreport-extends.json rename to crates/fhir/tests/data/json/R4/extension-diagnosticreport-extends.json diff --git a/crates/fhir/tests/data/R4/extension-diagnosticreport-geneticsanalysis.json b/crates/fhir/tests/data/json/R4/extension-diagnosticreport-geneticsanalysis.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-diagnosticreport-geneticsanalysis.json rename to crates/fhir/tests/data/json/R4/extension-diagnosticreport-geneticsanalysis.json diff --git a/crates/fhir/tests/data/R4/extension-diagnosticreport-geneticsassessedcondition.json b/crates/fhir/tests/data/json/R4/extension-diagnosticreport-geneticsassessedcondition.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-diagnosticreport-geneticsassessedcondition.json rename to crates/fhir/tests/data/json/R4/extension-diagnosticreport-geneticsassessedcondition.json diff --git a/crates/fhir/tests/data/R4/extension-diagnosticreport-geneticsfamilymemberhistory.json b/crates/fhir/tests/data/json/R4/extension-diagnosticreport-geneticsfamilymemberhistory.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-diagnosticreport-geneticsfamilymemberhistory.json rename to crates/fhir/tests/data/json/R4/extension-diagnosticreport-geneticsfamilymemberhistory.json diff --git a/crates/fhir/tests/data/R4/extension-diagnosticreport-geneticsreferences.json b/crates/fhir/tests/data/json/R4/extension-diagnosticreport-geneticsreferences.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-diagnosticreport-geneticsreferences.json rename to crates/fhir/tests/data/json/R4/extension-diagnosticreport-geneticsreferences.json diff --git a/crates/fhir/tests/data/R4/extension-diagnosticreport-locationperformed.json b/crates/fhir/tests/data/json/R4/extension-diagnosticreport-locationperformed.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-diagnosticreport-locationperformed.json rename to crates/fhir/tests/data/json/R4/extension-diagnosticreport-locationperformed.json diff --git a/crates/fhir/tests/data/R4/extension-diagnosticreport-replaces.json b/crates/fhir/tests/data/json/R4/extension-diagnosticreport-replaces.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-diagnosticreport-replaces.json rename to crates/fhir/tests/data/json/R4/extension-diagnosticreport-replaces.json diff --git a/crates/fhir/tests/data/R4/extension-diagnosticreport-risk.json b/crates/fhir/tests/data/json/R4/extension-diagnosticreport-risk.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-diagnosticreport-risk.json rename to crates/fhir/tests/data/json/R4/extension-diagnosticreport-risk.json diff --git a/crates/fhir/tests/data/R4/extension-diagnosticreport-summaryof.json b/crates/fhir/tests/data/json/R4/extension-diagnosticreport-summaryof.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-diagnosticreport-summaryof.json rename to crates/fhir/tests/data/json/R4/extension-diagnosticreport-summaryof.json diff --git a/crates/fhir/tests/data/R4/extension-display.json b/crates/fhir/tests/data/json/R4/extension-display.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-display.json rename to crates/fhir/tests/data/json/R4/extension-display.json diff --git a/crates/fhir/tests/data/R4/extension-elementdefinition-allowedunits.json b/crates/fhir/tests/data/json/R4/extension-elementdefinition-allowedunits.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-elementdefinition-allowedunits.json rename to crates/fhir/tests/data/json/R4/extension-elementdefinition-allowedunits.json diff --git a/crates/fhir/tests/data/R4/extension-elementdefinition-bestpractice-explanation.json b/crates/fhir/tests/data/json/R4/extension-elementdefinition-bestpractice-explanation.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-elementdefinition-bestpractice-explanation.json rename to crates/fhir/tests/data/json/R4/extension-elementdefinition-bestpractice-explanation.json diff --git a/crates/fhir/tests/data/R4/extension-elementdefinition-bestpractice.json b/crates/fhir/tests/data/json/R4/extension-elementdefinition-bestpractice.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-elementdefinition-bestpractice.json rename to crates/fhir/tests/data/json/R4/extension-elementdefinition-bestpractice.json diff --git a/crates/fhir/tests/data/R4/extension-elementdefinition-bindingname.json b/crates/fhir/tests/data/json/R4/extension-elementdefinition-bindingname.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-elementdefinition-bindingname.json rename to crates/fhir/tests/data/json/R4/extension-elementdefinition-bindingname.json diff --git a/crates/fhir/tests/data/R4/extension-elementdefinition-equivalence.json b/crates/fhir/tests/data/json/R4/extension-elementdefinition-equivalence.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-elementdefinition-equivalence.json rename to crates/fhir/tests/data/json/R4/extension-elementdefinition-equivalence.json diff --git a/crates/fhir/tests/data/R4/extension-elementdefinition-identifier.json b/crates/fhir/tests/data/json/R4/extension-elementdefinition-identifier.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-elementdefinition-identifier.json rename to crates/fhir/tests/data/json/R4/extension-elementdefinition-identifier.json diff --git a/crates/fhir/tests/data/R4/extension-elementdefinition-inheritedextensiblevalueset.json b/crates/fhir/tests/data/json/R4/extension-elementdefinition-inheritedextensiblevalueset.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-elementdefinition-inheritedextensiblevalueset.json rename to crates/fhir/tests/data/json/R4/extension-elementdefinition-inheritedextensiblevalueset.json diff --git a/crates/fhir/tests/data/R4/extension-elementdefinition-iscommonbinding.json b/crates/fhir/tests/data/json/R4/extension-elementdefinition-iscommonbinding.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-elementdefinition-iscommonbinding.json rename to crates/fhir/tests/data/json/R4/extension-elementdefinition-iscommonbinding.json diff --git a/crates/fhir/tests/data/R4/extension-elementdefinition-maxvalueset.json b/crates/fhir/tests/data/json/R4/extension-elementdefinition-maxvalueset.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-elementdefinition-maxvalueset.json rename to crates/fhir/tests/data/json/R4/extension-elementdefinition-maxvalueset.json diff --git a/crates/fhir/tests/data/R4/extension-elementdefinition-minvalueset.json b/crates/fhir/tests/data/json/R4/extension-elementdefinition-minvalueset.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-elementdefinition-minvalueset.json rename to crates/fhir/tests/data/json/R4/extension-elementdefinition-minvalueset.json diff --git a/crates/fhir/tests/data/R4/extension-elementdefinition-namespace.json b/crates/fhir/tests/data/json/R4/extension-elementdefinition-namespace.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-elementdefinition-namespace.json rename to crates/fhir/tests/data/json/R4/extension-elementdefinition-namespace.json diff --git a/crates/fhir/tests/data/R4/extension-elementdefinition-profile-element.json b/crates/fhir/tests/data/json/R4/extension-elementdefinition-profile-element.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-elementdefinition-profile-element.json rename to crates/fhir/tests/data/json/R4/extension-elementdefinition-profile-element.json diff --git a/crates/fhir/tests/data/R4/extension-elementdefinition-question.json b/crates/fhir/tests/data/json/R4/extension-elementdefinition-question.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-elementdefinition-question.json rename to crates/fhir/tests/data/json/R4/extension-elementdefinition-question.json diff --git a/crates/fhir/tests/data/R4/extension-elementdefinition-selector.json b/crates/fhir/tests/data/json/R4/extension-elementdefinition-selector.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-elementdefinition-selector.json rename to crates/fhir/tests/data/json/R4/extension-elementdefinition-selector.json diff --git a/crates/fhir/tests/data/R4/extension-elementdefinition-translatable.json b/crates/fhir/tests/data/json/R4/extension-elementdefinition-translatable.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-elementdefinition-translatable.json rename to crates/fhir/tests/data/json/R4/extension-elementdefinition-translatable.json diff --git a/crates/fhir/tests/data/R4/extension-encounter-associatedencounter.json b/crates/fhir/tests/data/json/R4/extension-encounter-associatedencounter.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-encounter-associatedencounter.json rename to crates/fhir/tests/data/json/R4/extension-encounter-associatedencounter.json diff --git a/crates/fhir/tests/data/R4/extension-encounter-modeofarrival.json b/crates/fhir/tests/data/json/R4/extension-encounter-modeofarrival.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-encounter-modeofarrival.json rename to crates/fhir/tests/data/json/R4/extension-encounter-modeofarrival.json diff --git a/crates/fhir/tests/data/R4/extension-encounter-reasoncancelled.json b/crates/fhir/tests/data/json/R4/extension-encounter-reasoncancelled.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-encounter-reasoncancelled.json rename to crates/fhir/tests/data/json/R4/extension-encounter-reasoncancelled.json diff --git a/crates/fhir/tests/data/R4/extension-entryformat.json b/crates/fhir/tests/data/json/R4/extension-entryformat.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-entryformat.json rename to crates/fhir/tests/data/json/R4/extension-entryformat.json diff --git a/crates/fhir/tests/data/R4/extension-event-basedon.json b/crates/fhir/tests/data/json/R4/extension-event-basedon.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-event-basedon.json rename to crates/fhir/tests/data/json/R4/extension-event-basedon.json diff --git a/crates/fhir/tests/data/R4/extension-event-eventhistory.json b/crates/fhir/tests/data/json/R4/extension-event-eventhistory.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-event-eventhistory.json rename to crates/fhir/tests/data/json/R4/extension-event-eventhistory.json diff --git a/crates/fhir/tests/data/R4/extension-event-location.json b/crates/fhir/tests/data/json/R4/extension-event-location.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-event-location.json rename to crates/fhir/tests/data/json/R4/extension-event-location.json diff --git a/crates/fhir/tests/data/R4/extension-event-partof.json b/crates/fhir/tests/data/json/R4/extension-event-partof.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-event-partof.json rename to crates/fhir/tests/data/json/R4/extension-event-partof.json diff --git a/crates/fhir/tests/data/R4/extension-event-performerfunction.json b/crates/fhir/tests/data/json/R4/extension-event-performerfunction.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-event-performerfunction.json rename to crates/fhir/tests/data/json/R4/extension-event-performerfunction.json diff --git a/crates/fhir/tests/data/R4/extension-event-statusreason.json b/crates/fhir/tests/data/json/R4/extension-event-statusreason.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-event-statusreason.json rename to crates/fhir/tests/data/json/R4/extension-event-statusreason.json diff --git a/crates/fhir/tests/data/R4/extension-family-member-history-genetics-observation.json b/crates/fhir/tests/data/json/R4/extension-family-member-history-genetics-observation.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-family-member-history-genetics-observation.json rename to crates/fhir/tests/data/json/R4/extension-family-member-history-genetics-observation.json diff --git a/crates/fhir/tests/data/R4/extension-family-member-history-genetics-parent.json b/crates/fhir/tests/data/json/R4/extension-family-member-history-genetics-parent.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-family-member-history-genetics-parent.json rename to crates/fhir/tests/data/json/R4/extension-family-member-history-genetics-parent.json diff --git a/crates/fhir/tests/data/R4/extension-family-member-history-genetics-sibling.json b/crates/fhir/tests/data/json/R4/extension-family-member-history-genetics-sibling.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-family-member-history-genetics-sibling.json rename to crates/fhir/tests/data/json/R4/extension-family-member-history-genetics-sibling.json diff --git a/crates/fhir/tests/data/R4/extension-familymemberhistory-abatement.json b/crates/fhir/tests/data/json/R4/extension-familymemberhistory-abatement.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-familymemberhistory-abatement.json rename to crates/fhir/tests/data/json/R4/extension-familymemberhistory-abatement.json diff --git a/crates/fhir/tests/data/R4/extension-familymemberhistory-patient-record.json b/crates/fhir/tests/data/json/R4/extension-familymemberhistory-patient-record.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-familymemberhistory-patient-record.json rename to crates/fhir/tests/data/json/R4/extension-familymemberhistory-patient-record.json diff --git a/crates/fhir/tests/data/R4/extension-familymemberhistory-severity.json b/crates/fhir/tests/data/json/R4/extension-familymemberhistory-severity.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-familymemberhistory-severity.json rename to crates/fhir/tests/data/json/R4/extension-familymemberhistory-severity.json diff --git a/crates/fhir/tests/data/R4/extension-familymemberhistory-type.json b/crates/fhir/tests/data/json/R4/extension-familymemberhistory-type.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-familymemberhistory-type.json rename to crates/fhir/tests/data/json/R4/extension-familymemberhistory-type.json diff --git a/crates/fhir/tests/data/R4/extension-flag-detail.json b/crates/fhir/tests/data/json/R4/extension-flag-detail.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-flag-detail.json rename to crates/fhir/tests/data/json/R4/extension-flag-detail.json diff --git a/crates/fhir/tests/data/R4/extension-flag-priority.json b/crates/fhir/tests/data/json/R4/extension-flag-priority.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-flag-priority.json rename to crates/fhir/tests/data/json/R4/extension-flag-priority.json diff --git a/crates/fhir/tests/data/R4/extension-geolocation.json b/crates/fhir/tests/data/json/R4/extension-geolocation.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-geolocation.json rename to crates/fhir/tests/data/json/R4/extension-geolocation.json diff --git a/crates/fhir/tests/data/R4/extension-goal-acceptance.json b/crates/fhir/tests/data/json/R4/extension-goal-acceptance.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-goal-acceptance.json rename to crates/fhir/tests/data/json/R4/extension-goal-acceptance.json diff --git a/crates/fhir/tests/data/R4/extension-goal-reasonrejected.json b/crates/fhir/tests/data/json/R4/extension-goal-reasonrejected.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-goal-reasonrejected.json rename to crates/fhir/tests/data/json/R4/extension-goal-reasonrejected.json diff --git a/crates/fhir/tests/data/R4/extension-goal-relationship.json b/crates/fhir/tests/data/json/R4/extension-goal-relationship.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-goal-relationship.json rename to crates/fhir/tests/data/json/R4/extension-goal-relationship.json diff --git a/crates/fhir/tests/data/R4/extension-hla-genotyping-results-allele-database.json b/crates/fhir/tests/data/json/R4/extension-hla-genotyping-results-allele-database.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-hla-genotyping-results-allele-database.json rename to crates/fhir/tests/data/json/R4/extension-hla-genotyping-results-allele-database.json diff --git a/crates/fhir/tests/data/R4/extension-hla-genotyping-results-glstring.json b/crates/fhir/tests/data/json/R4/extension-hla-genotyping-results-glstring.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-hla-genotyping-results-glstring.json rename to crates/fhir/tests/data/json/R4/extension-hla-genotyping-results-glstring.json diff --git a/crates/fhir/tests/data/R4/extension-hla-genotyping-results-haploid.json b/crates/fhir/tests/data/json/R4/extension-hla-genotyping-results-haploid.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-hla-genotyping-results-haploid.json rename to crates/fhir/tests/data/json/R4/extension-hla-genotyping-results-haploid.json diff --git a/crates/fhir/tests/data/R4/extension-hla-genotyping-results-method.json b/crates/fhir/tests/data/json/R4/extension-hla-genotyping-results-method.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-hla-genotyping-results-method.json rename to crates/fhir/tests/data/json/R4/extension-hla-genotyping-results-method.json diff --git a/crates/fhir/tests/data/R4/extension-http-response-header.json b/crates/fhir/tests/data/json/R4/extension-http-response-header.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-http-response-header.json rename to crates/fhir/tests/data/json/R4/extension-http-response-header.json diff --git a/crates/fhir/tests/data/R4/extension-humanname-assembly-order.json b/crates/fhir/tests/data/json/R4/extension-humanname-assembly-order.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-humanname-assembly-order.json rename to crates/fhir/tests/data/json/R4/extension-humanname-assembly-order.json diff --git a/crates/fhir/tests/data/R4/extension-humanname-fathers-family.json b/crates/fhir/tests/data/json/R4/extension-humanname-fathers-family.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-humanname-fathers-family.json rename to crates/fhir/tests/data/json/R4/extension-humanname-fathers-family.json diff --git a/crates/fhir/tests/data/R4/extension-humanname-mothers-family.json b/crates/fhir/tests/data/json/R4/extension-humanname-mothers-family.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-humanname-mothers-family.json rename to crates/fhir/tests/data/json/R4/extension-humanname-mothers-family.json diff --git a/crates/fhir/tests/data/R4/extension-humanname-own-name.json b/crates/fhir/tests/data/json/R4/extension-humanname-own-name.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-humanname-own-name.json rename to crates/fhir/tests/data/json/R4/extension-humanname-own-name.json diff --git a/crates/fhir/tests/data/R4/extension-humanname-own-prefix.json b/crates/fhir/tests/data/json/R4/extension-humanname-own-prefix.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-humanname-own-prefix.json rename to crates/fhir/tests/data/json/R4/extension-humanname-own-prefix.json diff --git a/crates/fhir/tests/data/R4/extension-humanname-partner-name.json b/crates/fhir/tests/data/json/R4/extension-humanname-partner-name.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-humanname-partner-name.json rename to crates/fhir/tests/data/json/R4/extension-humanname-partner-name.json diff --git a/crates/fhir/tests/data/R4/extension-humanname-partner-prefix.json b/crates/fhir/tests/data/json/R4/extension-humanname-partner-prefix.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-humanname-partner-prefix.json rename to crates/fhir/tests/data/json/R4/extension-humanname-partner-prefix.json diff --git a/crates/fhir/tests/data/R4/extension-identifier-validdate.json b/crates/fhir/tests/data/json/R4/extension-identifier-validdate.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-identifier-validdate.json rename to crates/fhir/tests/data/json/R4/extension-identifier-validdate.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-ad-use.json b/crates/fhir/tests/data/json/R4/extension-iso21090-ad-use.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-ad-use.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-ad-use.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-additionallocator.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-additionallocator.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-additionallocator.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-additionallocator.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-buildingnumbersuffix.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-buildingnumbersuffix.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-buildingnumbersuffix.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-buildingnumbersuffix.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-careof.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-careof.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-careof.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-careof.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-censustract.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-censustract.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-censustract.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-censustract.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-delimiter.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-delimiter.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-delimiter.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-delimiter.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-deliveryaddressline.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-deliveryaddressline.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-deliveryaddressline.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-deliveryaddressline.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-deliveryinstallationarea.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-deliveryinstallationarea.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-deliveryinstallationarea.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-deliveryinstallationarea.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-deliveryinstallationqualifier.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-deliveryinstallationqualifier.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-deliveryinstallationqualifier.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-deliveryinstallationqualifier.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-deliveryinstallationtype.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-deliveryinstallationtype.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-deliveryinstallationtype.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-deliveryinstallationtype.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-deliverymode.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-deliverymode.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-deliverymode.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-deliverymode.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-deliverymodeidentifier.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-deliverymodeidentifier.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-deliverymodeidentifier.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-deliverymodeidentifier.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-direction.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-direction.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-direction.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-direction.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-housenumber.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-housenumber.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-housenumber.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-housenumber.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-housenumbernumeric.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-housenumbernumeric.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-housenumbernumeric.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-housenumbernumeric.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-postbox.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-postbox.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-postbox.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-postbox.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-precinct.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-precinct.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-precinct.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-precinct.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-streetaddressline.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-streetaddressline.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-streetaddressline.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-streetaddressline.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-streetname.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-streetname.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-streetname.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-streetname.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-streetnamebase.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-streetnamebase.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-streetnamebase.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-streetnamebase.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-streetnametype.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-streetnametype.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-streetnametype.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-streetnametype.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-unitid.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-unitid.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-unitid.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-unitid.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-adxp-unittype.json b/crates/fhir/tests/data/json/R4/extension-iso21090-adxp-unittype.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-adxp-unittype.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-adxp-unittype.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-en-qualifier.json b/crates/fhir/tests/data/json/R4/extension-iso21090-en-qualifier.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-en-qualifier.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-en-qualifier.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-en-representation.json b/crates/fhir/tests/data/json/R4/extension-iso21090-en-representation.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-en-representation.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-en-representation.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-en-use.json b/crates/fhir/tests/data/json/R4/extension-iso21090-en-use.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-en-use.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-en-use.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-nullflavor.json b/crates/fhir/tests/data/json/R4/extension-iso21090-nullflavor.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-nullflavor.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-nullflavor.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-pq-translation.json b/crates/fhir/tests/data/json/R4/extension-iso21090-pq-translation.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-pq-translation.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-pq-translation.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-preferred.json b/crates/fhir/tests/data/json/R4/extension-iso21090-preferred.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-preferred.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-preferred.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-sc-coding.json b/crates/fhir/tests/data/json/R4/extension-iso21090-sc-coding.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-sc-coding.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-sc-coding.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-tel-address.json b/crates/fhir/tests/data/json/R4/extension-iso21090-tel-address.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-tel-address.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-tel-address.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-uncertainty.json b/crates/fhir/tests/data/json/R4/extension-iso21090-uncertainty.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-uncertainty.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-uncertainty.json diff --git a/crates/fhir/tests/data/R4/extension-iso21090-uncertaintytype.json b/crates/fhir/tests/data/json/R4/extension-iso21090-uncertaintytype.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-iso21090-uncertaintytype.json rename to crates/fhir/tests/data/json/R4/extension-iso21090-uncertaintytype.json diff --git a/crates/fhir/tests/data/R4/extension-language.json b/crates/fhir/tests/data/json/R4/extension-language.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-language.json rename to crates/fhir/tests/data/json/R4/extension-language.json diff --git a/crates/fhir/tests/data/R4/extension-list-changebase.json b/crates/fhir/tests/data/json/R4/extension-list-changebase.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-list-changebase.json rename to crates/fhir/tests/data/json/R4/extension-list-changebase.json diff --git a/crates/fhir/tests/data/R4/extension-location-boundary-geojson.json b/crates/fhir/tests/data/json/R4/extension-location-boundary-geojson.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-location-boundary-geojson.json rename to crates/fhir/tests/data/json/R4/extension-location-boundary-geojson.json diff --git a/crates/fhir/tests/data/R4/extension-location-distance.json b/crates/fhir/tests/data/json/R4/extension-location-distance.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-location-distance.json rename to crates/fhir/tests/data/json/R4/extension-location-distance.json diff --git a/crates/fhir/tests/data/R4/extension-match-grade.json b/crates/fhir/tests/data/json/R4/extension-match-grade.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-match-grade.json rename to crates/fhir/tests/data/json/R4/extension-match-grade.json diff --git a/crates/fhir/tests/data/R4/extension-maxdecimalplaces.json b/crates/fhir/tests/data/json/R4/extension-maxdecimalplaces.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-maxdecimalplaces.json rename to crates/fhir/tests/data/json/R4/extension-maxdecimalplaces.json diff --git a/crates/fhir/tests/data/R4/extension-maxsize.json b/crates/fhir/tests/data/json/R4/extension-maxsize.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-maxsize.json rename to crates/fhir/tests/data/json/R4/extension-maxsize.json diff --git a/crates/fhir/tests/data/R4/extension-maxvalue.json b/crates/fhir/tests/data/json/R4/extension-maxvalue.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-maxvalue.json rename to crates/fhir/tests/data/json/R4/extension-maxvalue.json diff --git a/crates/fhir/tests/data/R4/extension-messageheader-response-request.json b/crates/fhir/tests/data/json/R4/extension-messageheader-response-request.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-messageheader-response-request.json rename to crates/fhir/tests/data/json/R4/extension-messageheader-response-request.json diff --git a/crates/fhir/tests/data/R4/extension-mimetype.json b/crates/fhir/tests/data/json/R4/extension-mimetype.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-mimetype.json rename to crates/fhir/tests/data/json/R4/extension-mimetype.json diff --git a/crates/fhir/tests/data/R4/extension-minlength.json b/crates/fhir/tests/data/json/R4/extension-minlength.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-minlength.json rename to crates/fhir/tests/data/json/R4/extension-minlength.json diff --git a/crates/fhir/tests/data/R4/extension-minvalue.json b/crates/fhir/tests/data/json/R4/extension-minvalue.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-minvalue.json rename to crates/fhir/tests/data/json/R4/extension-minvalue.json diff --git a/crates/fhir/tests/data/R4/extension-narrativelink.json b/crates/fhir/tests/data/json/R4/extension-narrativelink.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-narrativelink.json rename to crates/fhir/tests/data/json/R4/extension-narrativelink.json diff --git a/crates/fhir/tests/data/R4/extension-nutritionorder-adaptivefeedingdevice.json b/crates/fhir/tests/data/json/R4/extension-nutritionorder-adaptivefeedingdevice.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-nutritionorder-adaptivefeedingdevice.json rename to crates/fhir/tests/data/json/R4/extension-nutritionorder-adaptivefeedingdevice.json diff --git a/crates/fhir/tests/data/R4/extension-oauth-uris.json b/crates/fhir/tests/data/json/R4/extension-oauth-uris.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-oauth-uris.json rename to crates/fhir/tests/data/json/R4/extension-oauth-uris.json diff --git a/crates/fhir/tests/data/R4/extension-observation-bodyposition.json b/crates/fhir/tests/data/json/R4/extension-observation-bodyposition.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-bodyposition.json rename to crates/fhir/tests/data/json/R4/extension-observation-bodyposition.json diff --git a/crates/fhir/tests/data/R4/extension-observation-delta.json b/crates/fhir/tests/data/json/R4/extension-observation-delta.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-delta.json rename to crates/fhir/tests/data/json/R4/extension-observation-delta.json diff --git a/crates/fhir/tests/data/R4/extension-observation-devicecode.json b/crates/fhir/tests/data/json/R4/extension-observation-devicecode.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-devicecode.json rename to crates/fhir/tests/data/json/R4/extension-observation-devicecode.json diff --git a/crates/fhir/tests/data/R4/extension-observation-focuscode.json b/crates/fhir/tests/data/json/R4/extension-observation-focuscode.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-focuscode.json rename to crates/fhir/tests/data/json/R4/extension-observation-focuscode.json diff --git a/crates/fhir/tests/data/R4/extension-observation-gatewaydevice.json b/crates/fhir/tests/data/json/R4/extension-observation-gatewaydevice.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-gatewaydevice.json rename to crates/fhir/tests/data/json/R4/extension-observation-gatewaydevice.json diff --git a/crates/fhir/tests/data/R4/extension-observation-geneticsallele.json b/crates/fhir/tests/data/json/R4/extension-observation-geneticsallele.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-geneticsallele.json rename to crates/fhir/tests/data/json/R4/extension-observation-geneticsallele.json diff --git a/crates/fhir/tests/data/R4/extension-observation-geneticsaminoacidchange.json b/crates/fhir/tests/data/json/R4/extension-observation-geneticsaminoacidchange.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-geneticsaminoacidchange.json rename to crates/fhir/tests/data/json/R4/extension-observation-geneticsaminoacidchange.json diff --git a/crates/fhir/tests/data/R4/extension-observation-geneticsancestry.json b/crates/fhir/tests/data/json/R4/extension-observation-geneticsancestry.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-geneticsancestry.json rename to crates/fhir/tests/data/json/R4/extension-observation-geneticsancestry.json diff --git a/crates/fhir/tests/data/R4/extension-observation-geneticscopynumberevent.json b/crates/fhir/tests/data/json/R4/extension-observation-geneticscopynumberevent.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-geneticscopynumberevent.json rename to crates/fhir/tests/data/json/R4/extension-observation-geneticscopynumberevent.json diff --git a/crates/fhir/tests/data/R4/extension-observation-geneticsdnaregionname.json b/crates/fhir/tests/data/json/R4/extension-observation-geneticsdnaregionname.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-geneticsdnaregionname.json rename to crates/fhir/tests/data/json/R4/extension-observation-geneticsdnaregionname.json diff --git a/crates/fhir/tests/data/R4/extension-observation-geneticsgene.json b/crates/fhir/tests/data/json/R4/extension-observation-geneticsgene.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-geneticsgene.json rename to crates/fhir/tests/data/json/R4/extension-observation-geneticsgene.json diff --git a/crates/fhir/tests/data/R4/extension-observation-geneticsgenomicsourceclass.json b/crates/fhir/tests/data/json/R4/extension-observation-geneticsgenomicsourceclass.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-geneticsgenomicsourceclass.json rename to crates/fhir/tests/data/json/R4/extension-observation-geneticsgenomicsourceclass.json diff --git a/crates/fhir/tests/data/R4/extension-observation-geneticsinterpretation.json b/crates/fhir/tests/data/json/R4/extension-observation-geneticsinterpretation.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-geneticsinterpretation.json rename to crates/fhir/tests/data/json/R4/extension-observation-geneticsinterpretation.json diff --git a/crates/fhir/tests/data/R4/extension-observation-geneticsphaseset.json b/crates/fhir/tests/data/json/R4/extension-observation-geneticsphaseset.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-geneticsphaseset.json rename to crates/fhir/tests/data/json/R4/extension-observation-geneticsphaseset.json diff --git a/crates/fhir/tests/data/R4/extension-observation-geneticsvariant.json b/crates/fhir/tests/data/json/R4/extension-observation-geneticsvariant.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-geneticsvariant.json rename to crates/fhir/tests/data/json/R4/extension-observation-geneticsvariant.json diff --git a/crates/fhir/tests/data/R4/extension-observation-precondition.json b/crates/fhir/tests/data/json/R4/extension-observation-precondition.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-precondition.json rename to crates/fhir/tests/data/json/R4/extension-observation-precondition.json diff --git a/crates/fhir/tests/data/R4/extension-observation-reagent.json b/crates/fhir/tests/data/json/R4/extension-observation-reagent.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-reagent.json rename to crates/fhir/tests/data/json/R4/extension-observation-reagent.json diff --git a/crates/fhir/tests/data/R4/extension-observation-replaces.json b/crates/fhir/tests/data/json/R4/extension-observation-replaces.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-replaces.json rename to crates/fhir/tests/data/json/R4/extension-observation-replaces.json diff --git a/crates/fhir/tests/data/R4/extension-observation-secondaryfinding.json b/crates/fhir/tests/data/json/R4/extension-observation-secondaryfinding.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-secondaryfinding.json rename to crates/fhir/tests/data/json/R4/extension-observation-secondaryfinding.json diff --git a/crates/fhir/tests/data/R4/extension-observation-sequelto.json b/crates/fhir/tests/data/json/R4/extension-observation-sequelto.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-sequelto.json rename to crates/fhir/tests/data/json/R4/extension-observation-sequelto.json diff --git a/crates/fhir/tests/data/R4/extension-observation-specimencode.json b/crates/fhir/tests/data/json/R4/extension-observation-specimencode.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-specimencode.json rename to crates/fhir/tests/data/json/R4/extension-observation-specimencode.json diff --git a/crates/fhir/tests/data/R4/extension-observation-timeoffset.json b/crates/fhir/tests/data/json/R4/extension-observation-timeoffset.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-observation-timeoffset.json rename to crates/fhir/tests/data/json/R4/extension-observation-timeoffset.json diff --git a/crates/fhir/tests/data/R4/extension-openehr-administration.json b/crates/fhir/tests/data/json/R4/extension-openehr-administration.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-openehr-administration.json rename to crates/fhir/tests/data/json/R4/extension-openehr-administration.json diff --git a/crates/fhir/tests/data/R4/extension-openehr-careplan.json b/crates/fhir/tests/data/json/R4/extension-openehr-careplan.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-openehr-careplan.json rename to crates/fhir/tests/data/json/R4/extension-openehr-careplan.json diff --git a/crates/fhir/tests/data/R4/extension-openehr-exposuredate.json b/crates/fhir/tests/data/json/R4/extension-openehr-exposuredate.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-openehr-exposuredate.json rename to crates/fhir/tests/data/json/R4/extension-openehr-exposuredate.json diff --git a/crates/fhir/tests/data/R4/extension-openehr-exposuredescription.json b/crates/fhir/tests/data/json/R4/extension-openehr-exposuredescription.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-openehr-exposuredescription.json rename to crates/fhir/tests/data/json/R4/extension-openehr-exposuredescription.json diff --git a/crates/fhir/tests/data/R4/extension-openehr-exposureduration.json b/crates/fhir/tests/data/json/R4/extension-openehr-exposureduration.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-openehr-exposureduration.json rename to crates/fhir/tests/data/json/R4/extension-openehr-exposureduration.json diff --git a/crates/fhir/tests/data/R4/extension-openehr-location.json b/crates/fhir/tests/data/json/R4/extension-openehr-location.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-openehr-location.json rename to crates/fhir/tests/data/json/R4/extension-openehr-location.json diff --git a/crates/fhir/tests/data/R4/extension-openehr-management.json b/crates/fhir/tests/data/json/R4/extension-openehr-management.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-openehr-management.json rename to crates/fhir/tests/data/json/R4/extension-openehr-management.json diff --git a/crates/fhir/tests/data/R4/extension-openehr-test.json b/crates/fhir/tests/data/json/R4/extension-openehr-test.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-openehr-test.json rename to crates/fhir/tests/data/json/R4/extension-openehr-test.json diff --git a/crates/fhir/tests/data/R4/extension-operationdefinition-allowed-type.json b/crates/fhir/tests/data/json/R4/extension-operationdefinition-allowed-type.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-operationdefinition-allowed-type.json rename to crates/fhir/tests/data/json/R4/extension-operationdefinition-allowed-type.json diff --git a/crates/fhir/tests/data/R4/extension-operationdefinition-profile.json b/crates/fhir/tests/data/json/R4/extension-operationdefinition-profile.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-operationdefinition-profile.json rename to crates/fhir/tests/data/json/R4/extension-operationdefinition-profile.json diff --git a/crates/fhir/tests/data/R4/extension-operationoutcome-authority.json b/crates/fhir/tests/data/json/R4/extension-operationoutcome-authority.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-operationoutcome-authority.json rename to crates/fhir/tests/data/json/R4/extension-operationoutcome-authority.json diff --git a/crates/fhir/tests/data/R4/extension-operationoutcome-detectedissue.json b/crates/fhir/tests/data/json/R4/extension-operationoutcome-detectedissue.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-operationoutcome-detectedissue.json rename to crates/fhir/tests/data/json/R4/extension-operationoutcome-detectedissue.json diff --git a/crates/fhir/tests/data/R4/extension-operationoutcome-issue-source.json b/crates/fhir/tests/data/json/R4/extension-operationoutcome-issue-source.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-operationoutcome-issue-source.json rename to crates/fhir/tests/data/json/R4/extension-operationoutcome-issue-source.json diff --git a/crates/fhir/tests/data/R4/extension-ordinalvalue.json b/crates/fhir/tests/data/json/R4/extension-ordinalvalue.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-ordinalvalue.json rename to crates/fhir/tests/data/json/R4/extension-ordinalvalue.json diff --git a/crates/fhir/tests/data/R4/extension-organization-period.json b/crates/fhir/tests/data/json/R4/extension-organization-period.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-organization-period.json rename to crates/fhir/tests/data/json/R4/extension-organization-period.json diff --git a/crates/fhir/tests/data/R4/extension-organization-preferredcontact.json b/crates/fhir/tests/data/json/R4/extension-organization-preferredcontact.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-organization-preferredcontact.json rename to crates/fhir/tests/data/json/R4/extension-organization-preferredcontact.json diff --git a/crates/fhir/tests/data/R4/extension-organizationaffiliation-primaryind.json b/crates/fhir/tests/data/json/R4/extension-organizationaffiliation-primaryind.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-organizationaffiliation-primaryind.json rename to crates/fhir/tests/data/json/R4/extension-organizationaffiliation-primaryind.json diff --git a/crates/fhir/tests/data/R4/extension-originaltext.json b/crates/fhir/tests/data/json/R4/extension-originaltext.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-originaltext.json rename to crates/fhir/tests/data/json/R4/extension-originaltext.json diff --git a/crates/fhir/tests/data/R4/extension-parameters-fullurl.json b/crates/fhir/tests/data/json/R4/extension-parameters-fullurl.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-parameters-fullurl.json rename to crates/fhir/tests/data/json/R4/extension-parameters-fullurl.json diff --git a/crates/fhir/tests/data/R4/extension-patient-adoptioninfo.json b/crates/fhir/tests/data/json/R4/extension-patient-adoptioninfo.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-patient-adoptioninfo.json rename to crates/fhir/tests/data/json/R4/extension-patient-adoptioninfo.json diff --git a/crates/fhir/tests/data/R4/extension-patient-animal.json b/crates/fhir/tests/data/json/R4/extension-patient-animal.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-patient-animal.json rename to crates/fhir/tests/data/json/R4/extension-patient-animal.json diff --git a/crates/fhir/tests/data/R4/extension-patient-birthplace.json b/crates/fhir/tests/data/json/R4/extension-patient-birthplace.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-patient-birthplace.json rename to crates/fhir/tests/data/json/R4/extension-patient-birthplace.json diff --git a/crates/fhir/tests/data/R4/extension-patient-birthtime.json b/crates/fhir/tests/data/json/R4/extension-patient-birthtime.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-patient-birthtime.json rename to crates/fhir/tests/data/json/R4/extension-patient-birthtime.json diff --git a/crates/fhir/tests/data/R4/extension-patient-cadavericdonor.json b/crates/fhir/tests/data/json/R4/extension-patient-cadavericdonor.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-patient-cadavericdonor.json rename to crates/fhir/tests/data/json/R4/extension-patient-cadavericdonor.json diff --git a/crates/fhir/tests/data/R4/extension-patient-citizenship.json b/crates/fhir/tests/data/json/R4/extension-patient-citizenship.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-patient-citizenship.json rename to crates/fhir/tests/data/json/R4/extension-patient-citizenship.json diff --git a/crates/fhir/tests/data/R4/extension-patient-congregation.json b/crates/fhir/tests/data/json/R4/extension-patient-congregation.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-patient-congregation.json rename to crates/fhir/tests/data/json/R4/extension-patient-congregation.json diff --git a/crates/fhir/tests/data/R4/extension-patient-disability.json b/crates/fhir/tests/data/json/R4/extension-patient-disability.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-patient-disability.json rename to crates/fhir/tests/data/json/R4/extension-patient-disability.json diff --git a/crates/fhir/tests/data/R4/extension-patient-genderidentity.json b/crates/fhir/tests/data/json/R4/extension-patient-genderidentity.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-patient-genderidentity.json rename to crates/fhir/tests/data/json/R4/extension-patient-genderidentity.json diff --git a/crates/fhir/tests/data/R4/extension-patient-importance.json b/crates/fhir/tests/data/json/R4/extension-patient-importance.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-patient-importance.json rename to crates/fhir/tests/data/json/R4/extension-patient-importance.json diff --git a/crates/fhir/tests/data/R4/extension-patient-interpreterrequired.json b/crates/fhir/tests/data/json/R4/extension-patient-interpreterrequired.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-patient-interpreterrequired.json rename to crates/fhir/tests/data/json/R4/extension-patient-interpreterrequired.json diff --git a/crates/fhir/tests/data/R4/extension-patient-mothersmaidenname.json b/crates/fhir/tests/data/json/R4/extension-patient-mothersmaidenname.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-patient-mothersmaidenname.json rename to crates/fhir/tests/data/json/R4/extension-patient-mothersmaidenname.json diff --git a/crates/fhir/tests/data/R4/extension-patient-nationality.json b/crates/fhir/tests/data/json/R4/extension-patient-nationality.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-patient-nationality.json rename to crates/fhir/tests/data/json/R4/extension-patient-nationality.json diff --git a/crates/fhir/tests/data/R4/extension-patient-preferencetype.json b/crates/fhir/tests/data/json/R4/extension-patient-preferencetype.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-patient-preferencetype.json rename to crates/fhir/tests/data/json/R4/extension-patient-preferencetype.json diff --git a/crates/fhir/tests/data/R4/extension-patient-proficiency.json b/crates/fhir/tests/data/json/R4/extension-patient-proficiency.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-patient-proficiency.json rename to crates/fhir/tests/data/json/R4/extension-patient-proficiency.json diff --git a/crates/fhir/tests/data/R4/extension-patient-relatedperson.json b/crates/fhir/tests/data/json/R4/extension-patient-relatedperson.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-patient-relatedperson.json rename to crates/fhir/tests/data/json/R4/extension-patient-relatedperson.json diff --git a/crates/fhir/tests/data/R4/extension-patient-religion.json b/crates/fhir/tests/data/json/R4/extension-patient-religion.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-patient-religion.json rename to crates/fhir/tests/data/json/R4/extension-patient-religion.json diff --git a/crates/fhir/tests/data/R4/extension-practitioner-animalspecies.json b/crates/fhir/tests/data/json/R4/extension-practitioner-animalspecies.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-practitioner-animalspecies.json rename to crates/fhir/tests/data/json/R4/extension-practitioner-animalspecies.json diff --git a/crates/fhir/tests/data/R4/extension-practitionerrole-primaryind.json b/crates/fhir/tests/data/json/R4/extension-practitionerrole-primaryind.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-practitionerrole-primaryind.json rename to crates/fhir/tests/data/json/R4/extension-practitionerrole-primaryind.json diff --git a/crates/fhir/tests/data/R4/extension-procedure-approachbodystructure.json b/crates/fhir/tests/data/json/R4/extension-procedure-approachbodystructure.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-procedure-approachbodystructure.json rename to crates/fhir/tests/data/json/R4/extension-procedure-approachbodystructure.json diff --git a/crates/fhir/tests/data/R4/extension-procedure-causedby.json b/crates/fhir/tests/data/json/R4/extension-procedure-causedby.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-procedure-causedby.json rename to crates/fhir/tests/data/json/R4/extension-procedure-causedby.json diff --git a/crates/fhir/tests/data/R4/extension-procedure-directedby.json b/crates/fhir/tests/data/json/R4/extension-procedure-directedby.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-procedure-directedby.json rename to crates/fhir/tests/data/json/R4/extension-procedure-directedby.json diff --git a/crates/fhir/tests/data/R4/extension-procedure-incisiondatetime.json b/crates/fhir/tests/data/json/R4/extension-procedure-incisiondatetime.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-procedure-incisiondatetime.json rename to crates/fhir/tests/data/json/R4/extension-procedure-incisiondatetime.json diff --git a/crates/fhir/tests/data/R4/extension-procedure-method.json b/crates/fhir/tests/data/json/R4/extension-procedure-method.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-procedure-method.json rename to crates/fhir/tests/data/json/R4/extension-procedure-method.json diff --git a/crates/fhir/tests/data/R4/extension-procedure-progressstatus.json b/crates/fhir/tests/data/json/R4/extension-procedure-progressstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-procedure-progressstatus.json rename to crates/fhir/tests/data/json/R4/extension-procedure-progressstatus.json diff --git a/crates/fhir/tests/data/R4/extension-procedure-schedule.json b/crates/fhir/tests/data/json/R4/extension-procedure-schedule.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-procedure-schedule.json rename to crates/fhir/tests/data/json/R4/extension-procedure-schedule.json diff --git a/crates/fhir/tests/data/R4/extension-procedure-targetbodystructure.json b/crates/fhir/tests/data/json/R4/extension-procedure-targetbodystructure.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-procedure-targetbodystructure.json rename to crates/fhir/tests/data/json/R4/extension-procedure-targetbodystructure.json diff --git a/crates/fhir/tests/data/R4/extension-quantity-precision.json b/crates/fhir/tests/data/json/R4/extension-quantity-precision.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-quantity-precision.json rename to crates/fhir/tests/data/json/R4/extension-quantity-precision.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-basetype.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-basetype.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-basetype.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-basetype.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-choiceorientation.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-choiceorientation.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-choiceorientation.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-choiceorientation.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-constraint.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-constraint.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-constraint.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-constraint.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-displaycategory.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-displaycategory.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-displaycategory.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-displaycategory.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-fhirtype.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-fhirtype.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-fhirtype.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-fhirtype.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-hidden.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-hidden.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-hidden.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-hidden.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-itemcontrol.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-itemcontrol.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-itemcontrol.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-itemcontrol.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-maxoccurs.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-maxoccurs.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-maxoccurs.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-maxoccurs.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-minoccurs.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-minoccurs.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-minoccurs.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-minoccurs.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-optionexclusive.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-optionexclusive.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-optionexclusive.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-optionexclusive.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-optionprefix.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-optionprefix.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-optionprefix.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-optionprefix.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-referencefilter.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-referencefilter.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-referencefilter.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-referencefilter.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-referenceprofile.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-referenceprofile.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-referenceprofile.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-referenceprofile.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-referenceresource.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-referenceresource.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-referenceresource.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-referenceresource.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-signaturerequired.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-signaturerequired.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-signaturerequired.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-signaturerequired.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-sliderstepvalue.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-sliderstepvalue.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-sliderstepvalue.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-sliderstepvalue.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-supportlink.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-supportlink.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-supportlink.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-supportlink.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-unit.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-unit.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-unit.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-unit.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-unitoption.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-unitoption.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-unitoption.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-unitoption.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-unitvalueset.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-unitvalueset.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-unitvalueset.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-unitvalueset.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaire-usagemode.json b/crates/fhir/tests/data/json/R4/extension-questionnaire-usagemode.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaire-usagemode.json rename to crates/fhir/tests/data/json/R4/extension-questionnaire-usagemode.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaireresponse-author.json b/crates/fhir/tests/data/json/R4/extension-questionnaireresponse-author.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaireresponse-author.json rename to crates/fhir/tests/data/json/R4/extension-questionnaireresponse-author.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaireresponse-completionmode.json b/crates/fhir/tests/data/json/R4/extension-questionnaireresponse-completionmode.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaireresponse-completionmode.json rename to crates/fhir/tests/data/json/R4/extension-questionnaireresponse-completionmode.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaireresponse-reason.json b/crates/fhir/tests/data/json/R4/extension-questionnaireresponse-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaireresponse-reason.json rename to crates/fhir/tests/data/json/R4/extension-questionnaireresponse-reason.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaireresponse-reviewer.json b/crates/fhir/tests/data/json/R4/extension-questionnaireresponse-reviewer.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaireresponse-reviewer.json rename to crates/fhir/tests/data/json/R4/extension-questionnaireresponse-reviewer.json diff --git a/crates/fhir/tests/data/R4/extension-questionnaireresponse-signature.json b/crates/fhir/tests/data/json/R4/extension-questionnaireresponse-signature.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-questionnaireresponse-signature.json rename to crates/fhir/tests/data/json/R4/extension-questionnaireresponse-signature.json diff --git a/crates/fhir/tests/data/R4/extension-regex.json b/crates/fhir/tests/data/json/R4/extension-regex.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-regex.json rename to crates/fhir/tests/data/json/R4/extension-regex.json diff --git a/crates/fhir/tests/data/R4/extension-relative-date.json b/crates/fhir/tests/data/json/R4/extension-relative-date.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-relative-date.json rename to crates/fhir/tests/data/json/R4/extension-relative-date.json diff --git a/crates/fhir/tests/data/R4/extension-rendered-value.json b/crates/fhir/tests/data/json/R4/extension-rendered-value.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-rendered-value.json rename to crates/fhir/tests/data/json/R4/extension-rendered-value.json diff --git a/crates/fhir/tests/data/R4/extension-rendering-markdown.json b/crates/fhir/tests/data/json/R4/extension-rendering-markdown.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-rendering-markdown.json rename to crates/fhir/tests/data/json/R4/extension-rendering-markdown.json diff --git a/crates/fhir/tests/data/R4/extension-rendering-style.json b/crates/fhir/tests/data/json/R4/extension-rendering-style.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-rendering-style.json rename to crates/fhir/tests/data/json/R4/extension-rendering-style.json diff --git a/crates/fhir/tests/data/R4/extension-rendering-stylesensitive.json b/crates/fhir/tests/data/json/R4/extension-rendering-stylesensitive.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-rendering-stylesensitive.json rename to crates/fhir/tests/data/json/R4/extension-rendering-stylesensitive.json diff --git a/crates/fhir/tests/data/R4/extension-rendering-xhtml.json b/crates/fhir/tests/data/json/R4/extension-rendering-xhtml.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-rendering-xhtml.json rename to crates/fhir/tests/data/json/R4/extension-rendering-xhtml.json diff --git a/crates/fhir/tests/data/R4/extension-replaces.json b/crates/fhir/tests/data/json/R4/extension-replaces.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-replaces.json rename to crates/fhir/tests/data/json/R4/extension-replaces.json diff --git a/crates/fhir/tests/data/R4/extension-request-donotperform.json b/crates/fhir/tests/data/json/R4/extension-request-donotperform.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-request-donotperform.json rename to crates/fhir/tests/data/json/R4/extension-request-donotperform.json diff --git a/crates/fhir/tests/data/R4/extension-request-insurance.json b/crates/fhir/tests/data/json/R4/extension-request-insurance.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-request-insurance.json rename to crates/fhir/tests/data/json/R4/extension-request-insurance.json diff --git a/crates/fhir/tests/data/R4/extension-request-performerorder.json b/crates/fhir/tests/data/json/R4/extension-request-performerorder.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-request-performerorder.json rename to crates/fhir/tests/data/json/R4/extension-request-performerorder.json diff --git a/crates/fhir/tests/data/R4/extension-request-relevanthistory.json b/crates/fhir/tests/data/json/R4/extension-request-relevanthistory.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-request-relevanthistory.json rename to crates/fhir/tests/data/json/R4/extension-request-relevanthistory.json diff --git a/crates/fhir/tests/data/R4/extension-request-replaces.json b/crates/fhir/tests/data/json/R4/extension-request-replaces.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-request-replaces.json rename to crates/fhir/tests/data/json/R4/extension-request-replaces.json diff --git a/crates/fhir/tests/data/R4/extension-request-statusreason.json b/crates/fhir/tests/data/json/R4/extension-request-statusreason.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-request-statusreason.json rename to crates/fhir/tests/data/json/R4/extension-request-statusreason.json diff --git a/crates/fhir/tests/data/R4/extension-resource-approvaldate.json b/crates/fhir/tests/data/json/R4/extension-resource-approvaldate.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-resource-approvaldate.json rename to crates/fhir/tests/data/json/R4/extension-resource-approvaldate.json diff --git a/crates/fhir/tests/data/R4/extension-resource-effectiveperiod.json b/crates/fhir/tests/data/json/R4/extension-resource-effectiveperiod.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-resource-effectiveperiod.json rename to crates/fhir/tests/data/json/R4/extension-resource-effectiveperiod.json diff --git a/crates/fhir/tests/data/R4/extension-resource-lastreviewdate.json b/crates/fhir/tests/data/json/R4/extension-resource-lastreviewdate.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-resource-lastreviewdate.json rename to crates/fhir/tests/data/json/R4/extension-resource-lastreviewdate.json diff --git a/crates/fhir/tests/data/R4/extension-resource-pertainstogoal.json b/crates/fhir/tests/data/json/R4/extension-resource-pertainstogoal.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-resource-pertainstogoal.json rename to crates/fhir/tests/data/json/R4/extension-resource-pertainstogoal.json diff --git a/crates/fhir/tests/data/R4/extension-servicerequest-geneticsitem.json b/crates/fhir/tests/data/json/R4/extension-servicerequest-geneticsitem.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-servicerequest-geneticsitem.json rename to crates/fhir/tests/data/json/R4/extension-servicerequest-geneticsitem.json diff --git a/crates/fhir/tests/data/R4/extension-servicerequest-precondition.json b/crates/fhir/tests/data/json/R4/extension-servicerequest-precondition.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-servicerequest-precondition.json rename to crates/fhir/tests/data/json/R4/extension-servicerequest-precondition.json diff --git a/crates/fhir/tests/data/R4/extension-servicerequest-questionnairerequest.json b/crates/fhir/tests/data/json/R4/extension-servicerequest-questionnairerequest.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-servicerequest-questionnairerequest.json rename to crates/fhir/tests/data/json/R4/extension-servicerequest-questionnairerequest.json diff --git a/crates/fhir/tests/data/R4/extension-specimen-collectionpriority.json b/crates/fhir/tests/data/json/R4/extension-specimen-collectionpriority.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-specimen-collectionpriority.json rename to crates/fhir/tests/data/json/R4/extension-specimen-collectionpriority.json diff --git a/crates/fhir/tests/data/R4/extension-specimen-isdryweight.json b/crates/fhir/tests/data/json/R4/extension-specimen-isdryweight.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-specimen-isdryweight.json rename to crates/fhir/tests/data/json/R4/extension-specimen-isdryweight.json diff --git a/crates/fhir/tests/data/R4/extension-specimen-processingtime.json b/crates/fhir/tests/data/json/R4/extension-specimen-processingtime.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-specimen-processingtime.json rename to crates/fhir/tests/data/json/R4/extension-specimen-processingtime.json diff --git a/crates/fhir/tests/data/R4/extension-specimen-sequencenumber.json b/crates/fhir/tests/data/json/R4/extension-specimen-sequencenumber.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-specimen-sequencenumber.json rename to crates/fhir/tests/data/json/R4/extension-specimen-sequencenumber.json diff --git a/crates/fhir/tests/data/R4/extension-specimen-specialhandling.json b/crates/fhir/tests/data/json/R4/extension-specimen-specialhandling.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-specimen-specialhandling.json rename to crates/fhir/tests/data/json/R4/extension-specimen-specialhandling.json diff --git a/crates/fhir/tests/data/R4/extension-structuredefinition-ancestor.json b/crates/fhir/tests/data/json/R4/extension-structuredefinition-ancestor.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-structuredefinition-ancestor.json rename to crates/fhir/tests/data/json/R4/extension-structuredefinition-ancestor.json diff --git a/crates/fhir/tests/data/R4/extension-structuredefinition-applicable-version.json b/crates/fhir/tests/data/json/R4/extension-structuredefinition-applicable-version.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-structuredefinition-applicable-version.json rename to crates/fhir/tests/data/json/R4/extension-structuredefinition-applicable-version.json diff --git a/crates/fhir/tests/data/R4/extension-structuredefinition-category.json b/crates/fhir/tests/data/json/R4/extension-structuredefinition-category.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-structuredefinition-category.json rename to crates/fhir/tests/data/json/R4/extension-structuredefinition-category.json diff --git a/crates/fhir/tests/data/R4/extension-structuredefinition-codegen-super.json b/crates/fhir/tests/data/json/R4/extension-structuredefinition-codegen-super.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-structuredefinition-codegen-super.json rename to crates/fhir/tests/data/json/R4/extension-structuredefinition-codegen-super.json diff --git a/crates/fhir/tests/data/R4/extension-structuredefinition-dependencies.json b/crates/fhir/tests/data/json/R4/extension-structuredefinition-dependencies.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-structuredefinition-dependencies.json rename to crates/fhir/tests/data/json/R4/extension-structuredefinition-dependencies.json diff --git a/crates/fhir/tests/data/R4/extension-structuredefinition-display-hint.json b/crates/fhir/tests/data/json/R4/extension-structuredefinition-display-hint.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-structuredefinition-display-hint.json rename to crates/fhir/tests/data/json/R4/extension-structuredefinition-display-hint.json diff --git a/crates/fhir/tests/data/R4/extension-structuredefinition-explicit-type-name.json b/crates/fhir/tests/data/json/R4/extension-structuredefinition-explicit-type-name.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-structuredefinition-explicit-type-name.json rename to crates/fhir/tests/data/json/R4/extension-structuredefinition-explicit-type-name.json diff --git a/crates/fhir/tests/data/R4/extension-structuredefinition-fhir-type.json b/crates/fhir/tests/data/json/R4/extension-structuredefinition-fhir-type.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-structuredefinition-fhir-type.json rename to crates/fhir/tests/data/json/R4/extension-structuredefinition-fhir-type.json diff --git a/crates/fhir/tests/data/R4/extension-structuredefinition-fmm-no-warnings.json b/crates/fhir/tests/data/json/R4/extension-structuredefinition-fmm-no-warnings.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-structuredefinition-fmm-no-warnings.json rename to crates/fhir/tests/data/json/R4/extension-structuredefinition-fmm-no-warnings.json diff --git a/crates/fhir/tests/data/R4/extension-structuredefinition-fmm.json b/crates/fhir/tests/data/json/R4/extension-structuredefinition-fmm.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-structuredefinition-fmm.json rename to crates/fhir/tests/data/json/R4/extension-structuredefinition-fmm.json diff --git a/crates/fhir/tests/data/R4/extension-structuredefinition-hierarchy.json b/crates/fhir/tests/data/json/R4/extension-structuredefinition-hierarchy.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-structuredefinition-hierarchy.json rename to crates/fhir/tests/data/json/R4/extension-structuredefinition-hierarchy.json diff --git a/crates/fhir/tests/data/R4/extension-structuredefinition-normative-version.json b/crates/fhir/tests/data/json/R4/extension-structuredefinition-normative-version.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-structuredefinition-normative-version.json rename to crates/fhir/tests/data/json/R4/extension-structuredefinition-normative-version.json diff --git a/crates/fhir/tests/data/R4/extension-structuredefinition-security-category.json b/crates/fhir/tests/data/json/R4/extension-structuredefinition-security-category.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-structuredefinition-security-category.json rename to crates/fhir/tests/data/json/R4/extension-structuredefinition-security-category.json diff --git a/crates/fhir/tests/data/R4/extension-structuredefinition-standards-status.json b/crates/fhir/tests/data/json/R4/extension-structuredefinition-standards-status.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-structuredefinition-standards-status.json rename to crates/fhir/tests/data/json/R4/extension-structuredefinition-standards-status.json diff --git a/crates/fhir/tests/data/R4/extension-structuredefinition-summary.json b/crates/fhir/tests/data/json/R4/extension-structuredefinition-summary.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-structuredefinition-summary.json rename to crates/fhir/tests/data/json/R4/extension-structuredefinition-summary.json diff --git a/crates/fhir/tests/data/R4/extension-structuredefinition-table-name.json b/crates/fhir/tests/data/json/R4/extension-structuredefinition-table-name.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-structuredefinition-table-name.json rename to crates/fhir/tests/data/json/R4/extension-structuredefinition-table-name.json diff --git a/crates/fhir/tests/data/R4/extension-structuredefinition-template-status.json b/crates/fhir/tests/data/json/R4/extension-structuredefinition-template-status.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-structuredefinition-template-status.json rename to crates/fhir/tests/data/json/R4/extension-structuredefinition-template-status.json diff --git a/crates/fhir/tests/data/R4/extension-structuredefinition-wg.json b/crates/fhir/tests/data/json/R4/extension-structuredefinition-wg.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-structuredefinition-wg.json rename to crates/fhir/tests/data/json/R4/extension-structuredefinition-wg.json diff --git a/crates/fhir/tests/data/R4/extension-structuredefinition-xml-no-order.json b/crates/fhir/tests/data/json/R4/extension-structuredefinition-xml-no-order.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-structuredefinition-xml-no-order.json rename to crates/fhir/tests/data/json/R4/extension-structuredefinition-xml-no-order.json diff --git a/crates/fhir/tests/data/R4/extension-task-candidatelist.json b/crates/fhir/tests/data/json/R4/extension-task-candidatelist.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-task-candidatelist.json rename to crates/fhir/tests/data/json/R4/extension-task-candidatelist.json diff --git a/crates/fhir/tests/data/R4/extension-task-replaces.json b/crates/fhir/tests/data/json/R4/extension-task-replaces.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-task-replaces.json rename to crates/fhir/tests/data/json/R4/extension-task-replaces.json diff --git a/crates/fhir/tests/data/R4/extension-timing-dayofmonth.json b/crates/fhir/tests/data/json/R4/extension-timing-dayofmonth.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-timing-dayofmonth.json rename to crates/fhir/tests/data/json/R4/extension-timing-dayofmonth.json diff --git a/crates/fhir/tests/data/R4/extension-timing-daysofcycle.json b/crates/fhir/tests/data/json/R4/extension-timing-daysofcycle.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-timing-daysofcycle.json rename to crates/fhir/tests/data/json/R4/extension-timing-daysofcycle.json diff --git a/crates/fhir/tests/data/R4/extension-timing-exact.json b/crates/fhir/tests/data/json/R4/extension-timing-exact.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-timing-exact.json rename to crates/fhir/tests/data/json/R4/extension-timing-exact.json diff --git a/crates/fhir/tests/data/R4/extension-translation.json b/crates/fhir/tests/data/json/R4/extension-translation.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-translation.json rename to crates/fhir/tests/data/json/R4/extension-translation.json diff --git a/crates/fhir/tests/data/R4/extension-tz-code.json b/crates/fhir/tests/data/json/R4/extension-tz-code.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-tz-code.json rename to crates/fhir/tests/data/json/R4/extension-tz-code.json diff --git a/crates/fhir/tests/data/R4/extension-tz-offset.json b/crates/fhir/tests/data/json/R4/extension-tz-offset.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-tz-offset.json rename to crates/fhir/tests/data/json/R4/extension-tz-offset.json diff --git a/crates/fhir/tests/data/R4/extension-usagecontext-group.json b/crates/fhir/tests/data/json/R4/extension-usagecontext-group.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-usagecontext-group.json rename to crates/fhir/tests/data/json/R4/extension-usagecontext-group.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-activitystatusdate.json b/crates/fhir/tests/data/json/R4/extension-valueset-activitystatusdate.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-activitystatusdate.json rename to crates/fhir/tests/data/json/R4/extension-valueset-activitystatusdate.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-author.json b/crates/fhir/tests/data/json/R4/extension-valueset-author.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-author.json rename to crates/fhir/tests/data/json/R4/extension-valueset-author.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-authoritativesource.json b/crates/fhir/tests/data/json/R4/extension-valueset-authoritativesource.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-authoritativesource.json rename to crates/fhir/tests/data/json/R4/extension-valueset-authoritativesource.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-casesensitive.json b/crates/fhir/tests/data/json/R4/extension-valueset-casesensitive.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-casesensitive.json rename to crates/fhir/tests/data/json/R4/extension-valueset-casesensitive.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-concept-comments.json b/crates/fhir/tests/data/json/R4/extension-valueset-concept-comments.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-concept-comments.json rename to crates/fhir/tests/data/json/R4/extension-valueset-concept-comments.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-concept-definition.json b/crates/fhir/tests/data/json/R4/extension-valueset-concept-definition.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-concept-definition.json rename to crates/fhir/tests/data/json/R4/extension-valueset-concept-definition.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-conceptorder.json b/crates/fhir/tests/data/json/R4/extension-valueset-conceptorder.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-conceptorder.json rename to crates/fhir/tests/data/json/R4/extension-valueset-conceptorder.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-deprecated.json b/crates/fhir/tests/data/json/R4/extension-valueset-deprecated.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-deprecated.json rename to crates/fhir/tests/data/json/R4/extension-valueset-deprecated.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-effectivedate.json b/crates/fhir/tests/data/json/R4/extension-valueset-effectivedate.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-effectivedate.json rename to crates/fhir/tests/data/json/R4/extension-valueset-effectivedate.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-expand-group.json b/crates/fhir/tests/data/json/R4/extension-valueset-expand-group.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-expand-group.json rename to crates/fhir/tests/data/json/R4/extension-valueset-expand-group.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-expand-rules.json b/crates/fhir/tests/data/json/R4/extension-valueset-expand-rules.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-expand-rules.json rename to crates/fhir/tests/data/json/R4/extension-valueset-expand-rules.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-expansionsource.json b/crates/fhir/tests/data/json/R4/extension-valueset-expansionsource.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-expansionsource.json rename to crates/fhir/tests/data/json/R4/extension-valueset-expansionsource.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-expirationdate.json b/crates/fhir/tests/data/json/R4/extension-valueset-expirationdate.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-expirationdate.json rename to crates/fhir/tests/data/json/R4/extension-valueset-expirationdate.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-expression.json b/crates/fhir/tests/data/json/R4/extension-valueset-expression.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-expression.json rename to crates/fhir/tests/data/json/R4/extension-valueset-expression.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-extensible.json b/crates/fhir/tests/data/json/R4/extension-valueset-extensible.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-extensible.json rename to crates/fhir/tests/data/json/R4/extension-valueset-extensible.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-keyword.json b/crates/fhir/tests/data/json/R4/extension-valueset-keyword.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-keyword.json rename to crates/fhir/tests/data/json/R4/extension-valueset-keyword.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-label.json b/crates/fhir/tests/data/json/R4/extension-valueset-label.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-label.json rename to crates/fhir/tests/data/json/R4/extension-valueset-label.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-map.json b/crates/fhir/tests/data/json/R4/extension-valueset-map.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-map.json rename to crates/fhir/tests/data/json/R4/extension-valueset-map.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-othername.json b/crates/fhir/tests/data/json/R4/extension-valueset-othername.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-othername.json rename to crates/fhir/tests/data/json/R4/extension-valueset-othername.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-parametersource.json b/crates/fhir/tests/data/json/R4/extension-valueset-parametersource.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-parametersource.json rename to crates/fhir/tests/data/json/R4/extension-valueset-parametersource.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-reference.json b/crates/fhir/tests/data/json/R4/extension-valueset-reference.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-reference.json rename to crates/fhir/tests/data/json/R4/extension-valueset-reference.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-rules-text.json b/crates/fhir/tests/data/json/R4/extension-valueset-rules-text.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-rules-text.json rename to crates/fhir/tests/data/json/R4/extension-valueset-rules-text.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-sourcereference.json b/crates/fhir/tests/data/json/R4/extension-valueset-sourcereference.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-sourcereference.json rename to crates/fhir/tests/data/json/R4/extension-valueset-sourcereference.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-special-status.json b/crates/fhir/tests/data/json/R4/extension-valueset-special-status.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-special-status.json rename to crates/fhir/tests/data/json/R4/extension-valueset-special-status.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-steward.json b/crates/fhir/tests/data/json/R4/extension-valueset-steward.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-steward.json rename to crates/fhir/tests/data/json/R4/extension-valueset-steward.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-supplement.json b/crates/fhir/tests/data/json/R4/extension-valueset-supplement.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-supplement.json rename to crates/fhir/tests/data/json/R4/extension-valueset-supplement.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-system.json b/crates/fhir/tests/data/json/R4/extension-valueset-system.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-system.json rename to crates/fhir/tests/data/json/R4/extension-valueset-system.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-systemname.json b/crates/fhir/tests/data/json/R4/extension-valueset-systemname.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-systemname.json rename to crates/fhir/tests/data/json/R4/extension-valueset-systemname.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-systemref.json b/crates/fhir/tests/data/json/R4/extension-valueset-systemref.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-systemref.json rename to crates/fhir/tests/data/json/R4/extension-valueset-systemref.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-toocostly.json b/crates/fhir/tests/data/json/R4/extension-valueset-toocostly.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-toocostly.json rename to crates/fhir/tests/data/json/R4/extension-valueset-toocostly.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-trusted-expansion.json b/crates/fhir/tests/data/json/R4/extension-valueset-trusted-expansion.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-trusted-expansion.json rename to crates/fhir/tests/data/json/R4/extension-valueset-trusted-expansion.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-unclosed.json b/crates/fhir/tests/data/json/R4/extension-valueset-unclosed.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-unclosed.json rename to crates/fhir/tests/data/json/R4/extension-valueset-unclosed.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-usage.json b/crates/fhir/tests/data/json/R4/extension-valueset-usage.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-usage.json rename to crates/fhir/tests/data/json/R4/extension-valueset-usage.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-warning.json b/crates/fhir/tests/data/json/R4/extension-valueset-warning.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-warning.json rename to crates/fhir/tests/data/json/R4/extension-valueset-warning.json diff --git a/crates/fhir/tests/data/R4/extension-valueset-workflowstatus.json b/crates/fhir/tests/data/json/R4/extension-valueset-workflowstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-valueset-workflowstatus.json rename to crates/fhir/tests/data/json/R4/extension-valueset-workflowstatus.json diff --git a/crates/fhir/tests/data/R4/extension-variable.json b/crates/fhir/tests/data/json/R4/extension-variable.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-variable.json rename to crates/fhir/tests/data/json/R4/extension-variable.json diff --git a/crates/fhir/tests/data/R4/extension-workflow-episodeofcare.json b/crates/fhir/tests/data/json/R4/extension-workflow-episodeofcare.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-workflow-episodeofcare.json rename to crates/fhir/tests/data/json/R4/extension-workflow-episodeofcare.json diff --git a/crates/fhir/tests/data/R4/extension-workflow-instantiatescanonical.json b/crates/fhir/tests/data/json/R4/extension-workflow-instantiatescanonical.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-workflow-instantiatescanonical.json rename to crates/fhir/tests/data/json/R4/extension-workflow-instantiatescanonical.json diff --git a/crates/fhir/tests/data/R4/extension-workflow-instantiatesuri.json b/crates/fhir/tests/data/json/R4/extension-workflow-instantiatesuri.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-workflow-instantiatesuri.json rename to crates/fhir/tests/data/json/R4/extension-workflow-instantiatesuri.json diff --git a/crates/fhir/tests/data/R4/extension-workflow-reasoncode.json b/crates/fhir/tests/data/json/R4/extension-workflow-reasoncode.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-workflow-reasoncode.json rename to crates/fhir/tests/data/json/R4/extension-workflow-reasoncode.json diff --git a/crates/fhir/tests/data/R4/extension-workflow-reasonreference.json b/crates/fhir/tests/data/json/R4/extension-workflow-reasonreference.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-workflow-reasonreference.json rename to crates/fhir/tests/data/json/R4/extension-workflow-reasonreference.json diff --git a/crates/fhir/tests/data/R4/extension-workflow-relatedartifact.json b/crates/fhir/tests/data/json/R4/extension-workflow-relatedartifact.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-workflow-relatedartifact.json rename to crates/fhir/tests/data/json/R4/extension-workflow-relatedartifact.json diff --git a/crates/fhir/tests/data/R4/extension-workflow-researchstudy.json b/crates/fhir/tests/data/json/R4/extension-workflow-researchstudy.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-workflow-researchstudy.json rename to crates/fhir/tests/data/json/R4/extension-workflow-researchstudy.json diff --git a/crates/fhir/tests/data/R4/extension-workflow-supportinginfo.json b/crates/fhir/tests/data/json/R4/extension-workflow-supportinginfo.json similarity index 100% rename from crates/fhir/tests/data/R4/extension-workflow-supportinginfo.json rename to crates/fhir/tests/data/json/R4/extension-workflow-supportinginfo.json diff --git a/crates/fhir/tests/data/R4/extension.profile.json b/crates/fhir/tests/data/json/R4/extension.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/extension.profile.json rename to crates/fhir/tests/data/json/R4/extension.profile.json diff --git a/crates/fhir/tests/data/R4/external-resources.json b/crates/fhir/tests/data/json/R4/external-resources.json similarity index 100% rename from crates/fhir/tests/data/R4/external-resources.json rename to crates/fhir/tests/data/json/R4/external-resources.json diff --git a/crates/fhir/tests/data/R4/familymemberhistory-example-mother.json b/crates/fhir/tests/data/json/R4/familymemberhistory-example-mother.json similarity index 100% rename from crates/fhir/tests/data/R4/familymemberhistory-example-mother.json rename to crates/fhir/tests/data/json/R4/familymemberhistory-example-mother.json diff --git a/crates/fhir/tests/data/R4/familymemberhistory-example.json b/crates/fhir/tests/data/json/R4/familymemberhistory-example.json similarity index 100% rename from crates/fhir/tests/data/R4/familymemberhistory-example.json rename to crates/fhir/tests/data/json/R4/familymemberhistory-example.json diff --git a/crates/fhir/tests/data/R4/familymemberhistory-genetic-questionnaire.json b/crates/fhir/tests/data/json/R4/familymemberhistory-genetic-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/familymemberhistory-genetic-questionnaire.json rename to crates/fhir/tests/data/json/R4/familymemberhistory-genetic-questionnaire.json diff --git a/crates/fhir/tests/data/R4/familymemberhistory-genetic.profile.json b/crates/fhir/tests/data/json/R4/familymemberhistory-genetic.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/familymemberhistory-genetic.profile.json rename to crates/fhir/tests/data/json/R4/familymemberhistory-genetic.profile.json diff --git a/crates/fhir/tests/data/R4/familymemberhistory-questionnaire.json b/crates/fhir/tests/data/json/R4/familymemberhistory-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/familymemberhistory-questionnaire.json rename to crates/fhir/tests/data/json/R4/familymemberhistory-questionnaire.json diff --git a/crates/fhir/tests/data/R4/familymemberhistory.profile.json b/crates/fhir/tests/data/json/R4/familymemberhistory.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/familymemberhistory.profile.json rename to crates/fhir/tests/data/json/R4/familymemberhistory.profile.json diff --git a/crates/fhir/tests/data/R4/fivews.json b/crates/fhir/tests/data/json/R4/fivews.json similarity index 100% rename from crates/fhir/tests/data/R4/fivews.json rename to crates/fhir/tests/data/json/R4/fivews.json diff --git a/crates/fhir/tests/data/R4/flag-example-encounter.json b/crates/fhir/tests/data/json/R4/flag-example-encounter.json similarity index 100% rename from crates/fhir/tests/data/R4/flag-example-encounter.json rename to crates/fhir/tests/data/json/R4/flag-example-encounter.json diff --git a/crates/fhir/tests/data/R4/flag-example.json b/crates/fhir/tests/data/json/R4/flag-example.json similarity index 100% rename from crates/fhir/tests/data/R4/flag-example.json rename to crates/fhir/tests/data/json/R4/flag-example.json diff --git a/crates/fhir/tests/data/R4/flag-questionnaire.json b/crates/fhir/tests/data/json/R4/flag-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/flag-questionnaire.json rename to crates/fhir/tests/data/json/R4/flag-questionnaire.json diff --git a/crates/fhir/tests/data/R4/flag.profile.json b/crates/fhir/tests/data/json/R4/flag.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/flag.profile.json rename to crates/fhir/tests/data/json/R4/flag.profile.json diff --git a/crates/fhir/tests/data/R4/goal-example-stop-smoking.json b/crates/fhir/tests/data/json/R4/goal-example-stop-smoking.json similarity index 100% rename from crates/fhir/tests/data/R4/goal-example-stop-smoking.json rename to crates/fhir/tests/data/json/R4/goal-example-stop-smoking.json diff --git a/crates/fhir/tests/data/R4/goal-example.json b/crates/fhir/tests/data/json/R4/goal-example.json similarity index 100% rename from crates/fhir/tests/data/R4/goal-example.json rename to crates/fhir/tests/data/json/R4/goal-example.json diff --git a/crates/fhir/tests/data/R4/goal-questionnaire.json b/crates/fhir/tests/data/json/R4/goal-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/goal-questionnaire.json rename to crates/fhir/tests/data/json/R4/goal-questionnaire.json diff --git a/crates/fhir/tests/data/R4/goal.profile.json b/crates/fhir/tests/data/json/R4/goal.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/goal.profile.json rename to crates/fhir/tests/data/json/R4/goal.profile.json diff --git a/crates/fhir/tests/data/R4/graphdefinition-example.json b/crates/fhir/tests/data/json/R4/graphdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4/graphdefinition-example.json rename to crates/fhir/tests/data/json/R4/graphdefinition-example.json diff --git a/crates/fhir/tests/data/R4/graphdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/graphdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/graphdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/graphdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/graphdefinition.profile.json b/crates/fhir/tests/data/json/R4/graphdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/graphdefinition.profile.json rename to crates/fhir/tests/data/json/R4/graphdefinition.profile.json diff --git a/crates/fhir/tests/data/R4/group-example-herd1.json b/crates/fhir/tests/data/json/R4/group-example-herd1.json similarity index 100% rename from crates/fhir/tests/data/R4/group-example-herd1.json rename to crates/fhir/tests/data/json/R4/group-example-herd1.json diff --git a/crates/fhir/tests/data/R4/group-example-member.json b/crates/fhir/tests/data/json/R4/group-example-member.json similarity index 100% rename from crates/fhir/tests/data/R4/group-example-member.json rename to crates/fhir/tests/data/json/R4/group-example-member.json diff --git a/crates/fhir/tests/data/R4/group-example-patientlist.json b/crates/fhir/tests/data/json/R4/group-example-patientlist.json similarity index 100% rename from crates/fhir/tests/data/R4/group-example-patientlist.json rename to crates/fhir/tests/data/json/R4/group-example-patientlist.json diff --git a/crates/fhir/tests/data/R4/group-example.json b/crates/fhir/tests/data/json/R4/group-example.json similarity index 100% rename from crates/fhir/tests/data/R4/group-example.json rename to crates/fhir/tests/data/json/R4/group-example.json diff --git a/crates/fhir/tests/data/R4/group-questionnaire.json b/crates/fhir/tests/data/json/R4/group-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/group-questionnaire.json rename to crates/fhir/tests/data/json/R4/group-questionnaire.json diff --git a/crates/fhir/tests/data/R4/group.profile.json b/crates/fhir/tests/data/json/R4/group.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/group.profile.json rename to crates/fhir/tests/data/json/R4/group.profile.json diff --git a/crates/fhir/tests/data/R4/groupdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/groupdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/groupdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/groupdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/groupdefinition.profile.json b/crates/fhir/tests/data/json/R4/groupdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/groupdefinition.profile.json rename to crates/fhir/tests/data/json/R4/groupdefinition.profile.json diff --git a/crates/fhir/tests/data/R4/guidanceresponse-example.json b/crates/fhir/tests/data/json/R4/guidanceresponse-example.json similarity index 100% rename from crates/fhir/tests/data/R4/guidanceresponse-example.json rename to crates/fhir/tests/data/json/R4/guidanceresponse-example.json diff --git a/crates/fhir/tests/data/R4/guidanceresponse-questionnaire.json b/crates/fhir/tests/data/json/R4/guidanceresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/guidanceresponse-questionnaire.json rename to crates/fhir/tests/data/json/R4/guidanceresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R4/guidanceresponse.profile.json b/crates/fhir/tests/data/json/R4/guidanceresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/guidanceresponse.profile.json rename to crates/fhir/tests/data/json/R4/guidanceresponse.profile.json diff --git a/crates/fhir/tests/data/R4/hdlcholesterol-questionnaire.json b/crates/fhir/tests/data/json/R4/hdlcholesterol-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/hdlcholesterol-questionnaire.json rename to crates/fhir/tests/data/json/R4/hdlcholesterol-questionnaire.json diff --git a/crates/fhir/tests/data/R4/hdlcholesterol.profile.json b/crates/fhir/tests/data/json/R4/hdlcholesterol.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/hdlcholesterol.profile.json rename to crates/fhir/tests/data/json/R4/hdlcholesterol.profile.json diff --git a/crates/fhir/tests/data/R4/headcircum-questionnaire.json b/crates/fhir/tests/data/json/R4/headcircum-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/headcircum-questionnaire.json rename to crates/fhir/tests/data/json/R4/headcircum-questionnaire.json diff --git a/crates/fhir/tests/data/R4/headcircum.profile.json b/crates/fhir/tests/data/json/R4/headcircum.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/headcircum.profile.json rename to crates/fhir/tests/data/json/R4/headcircum.profile.json diff --git a/crates/fhir/tests/data/R4/healthcareservice-example.json b/crates/fhir/tests/data/json/R4/healthcareservice-example.json similarity index 100% rename from crates/fhir/tests/data/R4/healthcareservice-example.json rename to crates/fhir/tests/data/json/R4/healthcareservice-example.json diff --git a/crates/fhir/tests/data/R4/healthcareservice-questionnaire.json b/crates/fhir/tests/data/json/R4/healthcareservice-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/healthcareservice-questionnaire.json rename to crates/fhir/tests/data/json/R4/healthcareservice-questionnaire.json diff --git a/crates/fhir/tests/data/R4/healthcareservice.profile.json b/crates/fhir/tests/data/json/R4/healthcareservice.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/healthcareservice.profile.json rename to crates/fhir/tests/data/json/R4/healthcareservice.profile.json diff --git a/crates/fhir/tests/data/R4/heartrate-questionnaire.json b/crates/fhir/tests/data/json/R4/heartrate-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/heartrate-questionnaire.json rename to crates/fhir/tests/data/json/R4/heartrate-questionnaire.json diff --git a/crates/fhir/tests/data/R4/heartrate.profile.json b/crates/fhir/tests/data/json/R4/heartrate.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/heartrate.profile.json rename to crates/fhir/tests/data/json/R4/heartrate.profile.json diff --git a/crates/fhir/tests/data/R4/hlaresult-questionnaire.json b/crates/fhir/tests/data/json/R4/hlaresult-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/hlaresult-questionnaire.json rename to crates/fhir/tests/data/json/R4/hlaresult-questionnaire.json diff --git a/crates/fhir/tests/data/R4/hlaresult.profile.json b/crates/fhir/tests/data/json/R4/hlaresult.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/hlaresult.profile.json rename to crates/fhir/tests/data/json/R4/hlaresult.profile.json diff --git a/crates/fhir/tests/data/R4/humanname.profile.json b/crates/fhir/tests/data/json/R4/humanname.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/humanname.profile.json rename to crates/fhir/tests/data/json/R4/humanname.profile.json diff --git a/crates/fhir/tests/data/R4/id.profile.json b/crates/fhir/tests/data/json/R4/id.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/id.profile.json rename to crates/fhir/tests/data/json/R4/id.profile.json diff --git a/crates/fhir/tests/data/R4/identifier.profile.json b/crates/fhir/tests/data/json/R4/identifier.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/identifier.profile.json rename to crates/fhir/tests/data/json/R4/identifier.profile.json diff --git a/crates/fhir/tests/data/R4/imagingstudy-example-xr.json b/crates/fhir/tests/data/json/R4/imagingstudy-example-xr.json similarity index 100% rename from crates/fhir/tests/data/R4/imagingstudy-example-xr.json rename to crates/fhir/tests/data/json/R4/imagingstudy-example-xr.json diff --git a/crates/fhir/tests/data/R4/imagingstudy-example.json b/crates/fhir/tests/data/json/R4/imagingstudy-example.json similarity index 100% rename from crates/fhir/tests/data/R4/imagingstudy-example.json rename to crates/fhir/tests/data/json/R4/imagingstudy-example.json diff --git a/crates/fhir/tests/data/R4/imagingstudy-questionnaire.json b/crates/fhir/tests/data/json/R4/imagingstudy-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/imagingstudy-questionnaire.json rename to crates/fhir/tests/data/json/R4/imagingstudy-questionnaire.json diff --git a/crates/fhir/tests/data/R4/imagingstudy.profile.json b/crates/fhir/tests/data/json/R4/imagingstudy.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/imagingstudy.profile.json rename to crates/fhir/tests/data/json/R4/imagingstudy.profile.json diff --git a/crates/fhir/tests/data/R4/immunization-example-historical.json b/crates/fhir/tests/data/json/R4/immunization-example-historical.json similarity index 100% rename from crates/fhir/tests/data/R4/immunization-example-historical.json rename to crates/fhir/tests/data/json/R4/immunization-example-historical.json diff --git a/crates/fhir/tests/data/R4/immunization-example-protocol.json b/crates/fhir/tests/data/json/R4/immunization-example-protocol.json similarity index 100% rename from crates/fhir/tests/data/R4/immunization-example-protocol.json rename to crates/fhir/tests/data/json/R4/immunization-example-protocol.json diff --git a/crates/fhir/tests/data/R4/immunization-example-refused.json b/crates/fhir/tests/data/json/R4/immunization-example-refused.json similarity index 100% rename from crates/fhir/tests/data/R4/immunization-example-refused.json rename to crates/fhir/tests/data/json/R4/immunization-example-refused.json diff --git a/crates/fhir/tests/data/R4/immunization-example-subpotent.json b/crates/fhir/tests/data/json/R4/immunization-example-subpotent.json similarity index 100% rename from crates/fhir/tests/data/R4/immunization-example-subpotent.json rename to crates/fhir/tests/data/json/R4/immunization-example-subpotent.json diff --git a/crates/fhir/tests/data/R4/immunization-example.json b/crates/fhir/tests/data/json/R4/immunization-example.json similarity index 100% rename from crates/fhir/tests/data/R4/immunization-example.json rename to crates/fhir/tests/data/json/R4/immunization-example.json diff --git a/crates/fhir/tests/data/R4/immunization-questionnaire.json b/crates/fhir/tests/data/json/R4/immunization-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/immunization-questionnaire.json rename to crates/fhir/tests/data/json/R4/immunization-questionnaire.json diff --git a/crates/fhir/tests/data/R4/immunization.profile.json b/crates/fhir/tests/data/json/R4/immunization.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/immunization.profile.json rename to crates/fhir/tests/data/json/R4/immunization.profile.json diff --git a/crates/fhir/tests/data/R4/immunizationevaluation-example-notvalid.json b/crates/fhir/tests/data/json/R4/immunizationevaluation-example-notvalid.json similarity index 100% rename from crates/fhir/tests/data/R4/immunizationevaluation-example-notvalid.json rename to crates/fhir/tests/data/json/R4/immunizationevaluation-example-notvalid.json diff --git a/crates/fhir/tests/data/R4/immunizationevaluation-example.json b/crates/fhir/tests/data/json/R4/immunizationevaluation-example.json similarity index 100% rename from crates/fhir/tests/data/R4/immunizationevaluation-example.json rename to crates/fhir/tests/data/json/R4/immunizationevaluation-example.json diff --git a/crates/fhir/tests/data/R4/immunizationevaluation-questionnaire.json b/crates/fhir/tests/data/json/R4/immunizationevaluation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/immunizationevaluation-questionnaire.json rename to crates/fhir/tests/data/json/R4/immunizationevaluation-questionnaire.json diff --git a/crates/fhir/tests/data/R4/immunizationevaluation.profile.json b/crates/fhir/tests/data/json/R4/immunizationevaluation.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/immunizationevaluation.profile.json rename to crates/fhir/tests/data/json/R4/immunizationevaluation.profile.json diff --git a/crates/fhir/tests/data/R4/immunizationrecommendation-example-target-disease.json b/crates/fhir/tests/data/json/R4/immunizationrecommendation-example-target-disease.json similarity index 100% rename from crates/fhir/tests/data/R4/immunizationrecommendation-example-target-disease.json rename to crates/fhir/tests/data/json/R4/immunizationrecommendation-example-target-disease.json diff --git a/crates/fhir/tests/data/R4/immunizationrecommendation-example.json b/crates/fhir/tests/data/json/R4/immunizationrecommendation-example.json similarity index 100% rename from crates/fhir/tests/data/R4/immunizationrecommendation-example.json rename to crates/fhir/tests/data/json/R4/immunizationrecommendation-example.json diff --git a/crates/fhir/tests/data/R4/immunizationrecommendation-questionnaire.json b/crates/fhir/tests/data/json/R4/immunizationrecommendation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/immunizationrecommendation-questionnaire.json rename to crates/fhir/tests/data/json/R4/immunizationrecommendation-questionnaire.json diff --git a/crates/fhir/tests/data/R4/immunizationrecommendation.profile.json b/crates/fhir/tests/data/json/R4/immunizationrecommendation.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/immunizationrecommendation.profile.json rename to crates/fhir/tests/data/json/R4/immunizationrecommendation.profile.json diff --git a/crates/fhir/tests/data/R4/implementationguide-example.json b/crates/fhir/tests/data/json/R4/implementationguide-example.json similarity index 100% rename from crates/fhir/tests/data/R4/implementationguide-example.json rename to crates/fhir/tests/data/json/R4/implementationguide-example.json diff --git a/crates/fhir/tests/data/R4/implementationguide-questionnaire.json b/crates/fhir/tests/data/json/R4/implementationguide-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/implementationguide-questionnaire.json rename to crates/fhir/tests/data/json/R4/implementationguide-questionnaire.json diff --git a/crates/fhir/tests/data/R4/implementationguide.profile.json b/crates/fhir/tests/data/json/R4/implementationguide.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/implementationguide.profile.json rename to crates/fhir/tests/data/json/R4/implementationguide.profile.json diff --git a/crates/fhir/tests/data/R4/instant.profile.json b/crates/fhir/tests/data/json/R4/instant.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/instant.profile.json rename to crates/fhir/tests/data/json/R4/instant.profile.json diff --git a/crates/fhir/tests/data/R4/insuranceplan-example.json b/crates/fhir/tests/data/json/R4/insuranceplan-example.json similarity index 100% rename from crates/fhir/tests/data/R4/insuranceplan-example.json rename to crates/fhir/tests/data/json/R4/insuranceplan-example.json diff --git a/crates/fhir/tests/data/R4/insuranceplan-questionnaire.json b/crates/fhir/tests/data/json/R4/insuranceplan-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/insuranceplan-questionnaire.json rename to crates/fhir/tests/data/json/R4/insuranceplan-questionnaire.json diff --git a/crates/fhir/tests/data/R4/insuranceplan.profile.json b/crates/fhir/tests/data/json/R4/insuranceplan.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/insuranceplan.profile.json rename to crates/fhir/tests/data/json/R4/insuranceplan.profile.json diff --git a/crates/fhir/tests/data/R4/integer.profile.json b/crates/fhir/tests/data/json/R4/integer.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/integer.profile.json rename to crates/fhir/tests/data/json/R4/integer.profile.json diff --git a/crates/fhir/tests/data/R4/invoice-example.json b/crates/fhir/tests/data/json/R4/invoice-example.json similarity index 100% rename from crates/fhir/tests/data/R4/invoice-example.json rename to crates/fhir/tests/data/json/R4/invoice-example.json diff --git a/crates/fhir/tests/data/R4/invoice-questionnaire.json b/crates/fhir/tests/data/json/R4/invoice-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/invoice-questionnaire.json rename to crates/fhir/tests/data/json/R4/invoice-questionnaire.json diff --git a/crates/fhir/tests/data/R4/invoice.profile.json b/crates/fhir/tests/data/json/R4/invoice.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/invoice.profile.json rename to crates/fhir/tests/data/json/R4/invoice.profile.json diff --git a/crates/fhir/tests/data/R4/json-edge-cases.json b/crates/fhir/tests/data/json/R4/json-edge-cases.json similarity index 100% rename from crates/fhir/tests/data/R4/json-edge-cases.json rename to crates/fhir/tests/data/json/R4/json-edge-cases.json diff --git a/crates/fhir/tests/data/R4/ldlcholesterol-questionnaire.json b/crates/fhir/tests/data/json/R4/ldlcholesterol-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/ldlcholesterol-questionnaire.json rename to crates/fhir/tests/data/json/R4/ldlcholesterol-questionnaire.json diff --git a/crates/fhir/tests/data/R4/ldlcholesterol.profile.json b/crates/fhir/tests/data/json/R4/ldlcholesterol.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/ldlcholesterol.profile.json rename to crates/fhir/tests/data/json/R4/ldlcholesterol.profile.json diff --git a/crates/fhir/tests/data/R4/library-cms146-example.json b/crates/fhir/tests/data/json/R4/library-cms146-example.json similarity index 100% rename from crates/fhir/tests/data/R4/library-cms146-example.json rename to crates/fhir/tests/data/json/R4/library-cms146-example.json diff --git a/crates/fhir/tests/data/R4/library-composition-example.json b/crates/fhir/tests/data/json/R4/library-composition-example.json similarity index 100% rename from crates/fhir/tests/data/R4/library-composition-example.json rename to crates/fhir/tests/data/json/R4/library-composition-example.json diff --git a/crates/fhir/tests/data/R4/library-example.json b/crates/fhir/tests/data/json/R4/library-example.json similarity index 100% rename from crates/fhir/tests/data/R4/library-example.json rename to crates/fhir/tests/data/json/R4/library-example.json diff --git a/crates/fhir/tests/data/R4/library-exclusive-breastfeeding-cds-logic.json b/crates/fhir/tests/data/json/R4/library-exclusive-breastfeeding-cds-logic.json similarity index 100% rename from crates/fhir/tests/data/R4/library-exclusive-breastfeeding-cds-logic.json rename to crates/fhir/tests/data/json/R4/library-exclusive-breastfeeding-cds-logic.json diff --git a/crates/fhir/tests/data/R4/library-exclusive-breastfeeding-cqm-logic.json b/crates/fhir/tests/data/json/R4/library-exclusive-breastfeeding-cqm-logic.json similarity index 100% rename from crates/fhir/tests/data/R4/library-exclusive-breastfeeding-cqm-logic.json rename to crates/fhir/tests/data/json/R4/library-exclusive-breastfeeding-cqm-logic.json diff --git a/crates/fhir/tests/data/R4/library-fhir-helpers.json b/crates/fhir/tests/data/json/R4/library-fhir-helpers.json similarity index 100% rename from crates/fhir/tests/data/R4/library-fhir-helpers.json rename to crates/fhir/tests/data/json/R4/library-fhir-helpers.json diff --git a/crates/fhir/tests/data/R4/library-fhir-model-definition.json b/crates/fhir/tests/data/json/R4/library-fhir-model-definition.json similarity index 100% rename from crates/fhir/tests/data/R4/library-fhir-model-definition.json rename to crates/fhir/tests/data/json/R4/library-fhir-model-definition.json diff --git a/crates/fhir/tests/data/R4/library-hiv-indicators.json b/crates/fhir/tests/data/json/R4/library-hiv-indicators.json similarity index 100% rename from crates/fhir/tests/data/R4/library-hiv-indicators.json rename to crates/fhir/tests/data/json/R4/library-hiv-indicators.json diff --git a/crates/fhir/tests/data/R4/library-mmi-suiciderisk-orderset-logic.json b/crates/fhir/tests/data/json/R4/library-mmi-suiciderisk-orderset-logic.json similarity index 100% rename from crates/fhir/tests/data/R4/library-mmi-suiciderisk-orderset-logic.json rename to crates/fhir/tests/data/json/R4/library-mmi-suiciderisk-orderset-logic.json diff --git a/crates/fhir/tests/data/R4/library-omtk-logic.json b/crates/fhir/tests/data/json/R4/library-omtk-logic.json similarity index 100% rename from crates/fhir/tests/data/R4/library-omtk-logic.json rename to crates/fhir/tests/data/json/R4/library-omtk-logic.json diff --git a/crates/fhir/tests/data/R4/library-omtk-modelinfo.json b/crates/fhir/tests/data/json/R4/library-omtk-modelinfo.json similarity index 100% rename from crates/fhir/tests/data/R4/library-omtk-modelinfo.json rename to crates/fhir/tests/data/json/R4/library-omtk-modelinfo.json diff --git a/crates/fhir/tests/data/R4/library-opioidcds-common.json b/crates/fhir/tests/data/json/R4/library-opioidcds-common.json similarity index 100% rename from crates/fhir/tests/data/R4/library-opioidcds-common.json rename to crates/fhir/tests/data/json/R4/library-opioidcds-common.json diff --git a/crates/fhir/tests/data/R4/library-opioidcds-recommendation-04.json b/crates/fhir/tests/data/json/R4/library-opioidcds-recommendation-04.json similarity index 100% rename from crates/fhir/tests/data/R4/library-opioidcds-recommendation-04.json rename to crates/fhir/tests/data/json/R4/library-opioidcds-recommendation-04.json diff --git a/crates/fhir/tests/data/R4/library-opioidcds-recommendation-05.json b/crates/fhir/tests/data/json/R4/library-opioidcds-recommendation-05.json similarity index 100% rename from crates/fhir/tests/data/R4/library-opioidcds-recommendation-05.json rename to crates/fhir/tests/data/json/R4/library-opioidcds-recommendation-05.json diff --git a/crates/fhir/tests/data/R4/library-opioidcds-recommendation-07.json b/crates/fhir/tests/data/json/R4/library-opioidcds-recommendation-07.json similarity index 100% rename from crates/fhir/tests/data/R4/library-opioidcds-recommendation-07.json rename to crates/fhir/tests/data/json/R4/library-opioidcds-recommendation-07.json diff --git a/crates/fhir/tests/data/R4/library-opioidcds-recommendation-08.json b/crates/fhir/tests/data/json/R4/library-opioidcds-recommendation-08.json similarity index 100% rename from crates/fhir/tests/data/R4/library-opioidcds-recommendation-08.json rename to crates/fhir/tests/data/json/R4/library-opioidcds-recommendation-08.json diff --git a/crates/fhir/tests/data/R4/library-opioidcds-recommendation-10.json b/crates/fhir/tests/data/json/R4/library-opioidcds-recommendation-10.json similarity index 100% rename from crates/fhir/tests/data/R4/library-opioidcds-recommendation-10.json rename to crates/fhir/tests/data/json/R4/library-opioidcds-recommendation-10.json diff --git a/crates/fhir/tests/data/R4/library-opioidcds-recommendation-11.json b/crates/fhir/tests/data/json/R4/library-opioidcds-recommendation-11.json similarity index 100% rename from crates/fhir/tests/data/R4/library-opioidcds-recommendation-11.json rename to crates/fhir/tests/data/json/R4/library-opioidcds-recommendation-11.json diff --git a/crates/fhir/tests/data/R4/library-predecessor-example.json b/crates/fhir/tests/data/json/R4/library-predecessor-example.json similarity index 100% rename from crates/fhir/tests/data/R4/library-predecessor-example.json rename to crates/fhir/tests/data/json/R4/library-predecessor-example.json diff --git a/crates/fhir/tests/data/R4/library-questionnaire.json b/crates/fhir/tests/data/json/R4/library-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/library-questionnaire.json rename to crates/fhir/tests/data/json/R4/library-questionnaire.json diff --git a/crates/fhir/tests/data/R4/library-quick-model-definition.json b/crates/fhir/tests/data/json/R4/library-quick-model-definition.json similarity index 100% rename from crates/fhir/tests/data/R4/library-quick-model-definition.json rename to crates/fhir/tests/data/json/R4/library-quick-model-definition.json diff --git a/crates/fhir/tests/data/R4/library-zika-virus-intervention-logic.json b/crates/fhir/tests/data/json/R4/library-zika-virus-intervention-logic.json similarity index 100% rename from crates/fhir/tests/data/R4/library-zika-virus-intervention-logic.json rename to crates/fhir/tests/data/json/R4/library-zika-virus-intervention-logic.json diff --git a/crates/fhir/tests/data/R4/library.profile.json b/crates/fhir/tests/data/json/R4/library.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/library.profile.json rename to crates/fhir/tests/data/json/R4/library.profile.json diff --git a/crates/fhir/tests/data/R4/linkage-example.json b/crates/fhir/tests/data/json/R4/linkage-example.json similarity index 100% rename from crates/fhir/tests/data/R4/linkage-example.json rename to crates/fhir/tests/data/json/R4/linkage-example.json diff --git a/crates/fhir/tests/data/R4/linkage-questionnaire.json b/crates/fhir/tests/data/json/R4/linkage-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/linkage-questionnaire.json rename to crates/fhir/tests/data/json/R4/linkage-questionnaire.json diff --git a/crates/fhir/tests/data/R4/linkage.profile.json b/crates/fhir/tests/data/json/R4/linkage.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/linkage.profile.json rename to crates/fhir/tests/data/json/R4/linkage.profile.json diff --git a/crates/fhir/tests/data/R4/lipidprofile-questionnaire.json b/crates/fhir/tests/data/json/R4/lipidprofile-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/lipidprofile-questionnaire.json rename to crates/fhir/tests/data/json/R4/lipidprofile-questionnaire.json diff --git a/crates/fhir/tests/data/R4/lipidprofile.profile.json b/crates/fhir/tests/data/json/R4/lipidprofile.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/lipidprofile.profile.json rename to crates/fhir/tests/data/json/R4/lipidprofile.profile.json diff --git a/crates/fhir/tests/data/R4/list-example-allergies.json b/crates/fhir/tests/data/json/R4/list-example-allergies.json similarity index 100% rename from crates/fhir/tests/data/R4/list-example-allergies.json rename to crates/fhir/tests/data/json/R4/list-example-allergies.json diff --git a/crates/fhir/tests/data/R4/list-example-double-cousin-relationship-pedigree.json b/crates/fhir/tests/data/json/R4/list-example-double-cousin-relationship-pedigree.json similarity index 100% rename from crates/fhir/tests/data/R4/list-example-double-cousin-relationship-pedigree.json rename to crates/fhir/tests/data/json/R4/list-example-double-cousin-relationship-pedigree.json diff --git a/crates/fhir/tests/data/R4/list-example-empty.json b/crates/fhir/tests/data/json/R4/list-example-empty.json similarity index 100% rename from crates/fhir/tests/data/R4/list-example-empty.json rename to crates/fhir/tests/data/json/R4/list-example-empty.json diff --git a/crates/fhir/tests/data/R4/list-example-familyhistory-f201-roel.json b/crates/fhir/tests/data/json/R4/list-example-familyhistory-f201-roel.json similarity index 100% rename from crates/fhir/tests/data/R4/list-example-familyhistory-f201-roel.json rename to crates/fhir/tests/data/json/R4/list-example-familyhistory-f201-roel.json diff --git a/crates/fhir/tests/data/R4/list-example-familyhistory-genetics-profile-annie.json b/crates/fhir/tests/data/json/R4/list-example-familyhistory-genetics-profile-annie.json similarity index 100% rename from crates/fhir/tests/data/R4/list-example-familyhistory-genetics-profile-annie.json rename to crates/fhir/tests/data/json/R4/list-example-familyhistory-genetics-profile-annie.json diff --git a/crates/fhir/tests/data/R4/list-example-familyhistory-genetics-profile.json b/crates/fhir/tests/data/json/R4/list-example-familyhistory-genetics-profile.json similarity index 100% rename from crates/fhir/tests/data/R4/list-example-familyhistory-genetics-profile.json rename to crates/fhir/tests/data/json/R4/list-example-familyhistory-genetics-profile.json diff --git a/crates/fhir/tests/data/R4/list-example-long.json b/crates/fhir/tests/data/json/R4/list-example-long.json similarity index 100% rename from crates/fhir/tests/data/R4/list-example-long.json rename to crates/fhir/tests/data/json/R4/list-example-long.json diff --git a/crates/fhir/tests/data/R4/list-example-medlist.json b/crates/fhir/tests/data/json/R4/list-example-medlist.json similarity index 100% rename from crates/fhir/tests/data/R4/list-example-medlist.json rename to crates/fhir/tests/data/json/R4/list-example-medlist.json diff --git a/crates/fhir/tests/data/R4/list-example-simple-empty.json b/crates/fhir/tests/data/json/R4/list-example-simple-empty.json similarity index 100% rename from crates/fhir/tests/data/R4/list-example-simple-empty.json rename to crates/fhir/tests/data/json/R4/list-example-simple-empty.json diff --git a/crates/fhir/tests/data/R4/list-example.json b/crates/fhir/tests/data/json/R4/list-example.json similarity index 100% rename from crates/fhir/tests/data/R4/list-example.json rename to crates/fhir/tests/data/json/R4/list-example.json diff --git a/crates/fhir/tests/data/R4/list-questionnaire.json b/crates/fhir/tests/data/json/R4/list-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/list-questionnaire.json rename to crates/fhir/tests/data/json/R4/list-questionnaire.json diff --git a/crates/fhir/tests/data/R4/list.profile.json b/crates/fhir/tests/data/json/R4/list.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/list.profile.json rename to crates/fhir/tests/data/json/R4/list.profile.json diff --git a/crates/fhir/tests/data/R4/location-example-ambulance.json b/crates/fhir/tests/data/json/R4/location-example-ambulance.json similarity index 100% rename from crates/fhir/tests/data/R4/location-example-ambulance.json rename to crates/fhir/tests/data/json/R4/location-example-ambulance.json diff --git a/crates/fhir/tests/data/R4/location-example-hl7hq.json b/crates/fhir/tests/data/json/R4/location-example-hl7hq.json similarity index 100% rename from crates/fhir/tests/data/R4/location-example-hl7hq.json rename to crates/fhir/tests/data/json/R4/location-example-hl7hq.json diff --git a/crates/fhir/tests/data/R4/location-example-patients-home.json b/crates/fhir/tests/data/json/R4/location-example-patients-home.json similarity index 100% rename from crates/fhir/tests/data/R4/location-example-patients-home.json rename to crates/fhir/tests/data/json/R4/location-example-patients-home.json diff --git a/crates/fhir/tests/data/R4/location-example-room.json b/crates/fhir/tests/data/json/R4/location-example-room.json similarity index 100% rename from crates/fhir/tests/data/R4/location-example-room.json rename to crates/fhir/tests/data/json/R4/location-example-room.json diff --git a/crates/fhir/tests/data/R4/location-example-ukpharmacy.json b/crates/fhir/tests/data/json/R4/location-example-ukpharmacy.json similarity index 100% rename from crates/fhir/tests/data/R4/location-example-ukpharmacy.json rename to crates/fhir/tests/data/json/R4/location-example-ukpharmacy.json diff --git a/crates/fhir/tests/data/R4/location-example.json b/crates/fhir/tests/data/json/R4/location-example.json similarity index 100% rename from crates/fhir/tests/data/R4/location-example.json rename to crates/fhir/tests/data/json/R4/location-example.json diff --git a/crates/fhir/tests/data/R4/location-examples-general.json b/crates/fhir/tests/data/json/R4/location-examples-general.json similarity index 100% rename from crates/fhir/tests/data/R4/location-examples-general.json rename to crates/fhir/tests/data/json/R4/location-examples-general.json diff --git a/crates/fhir/tests/data/R4/location-questionnaire.json b/crates/fhir/tests/data/json/R4/location-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/location-questionnaire.json rename to crates/fhir/tests/data/json/R4/location-questionnaire.json diff --git a/crates/fhir/tests/data/R4/location.profile.json b/crates/fhir/tests/data/json/R4/location.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/location.profile.json rename to crates/fhir/tests/data/json/R4/location.profile.json diff --git a/crates/fhir/tests/data/R4/markdown.profile.json b/crates/fhir/tests/data/json/R4/markdown.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/markdown.profile.json rename to crates/fhir/tests/data/json/R4/markdown.profile.json diff --git a/crates/fhir/tests/data/R4/marketingstatus.profile.json b/crates/fhir/tests/data/json/R4/marketingstatus.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/marketingstatus.profile.json rename to crates/fhir/tests/data/json/R4/marketingstatus.profile.json diff --git a/crates/fhir/tests/data/R4/measure-cms146-example.json b/crates/fhir/tests/data/json/R4/measure-cms146-example.json similarity index 100% rename from crates/fhir/tests/data/R4/measure-cms146-example.json rename to crates/fhir/tests/data/json/R4/measure-cms146-example.json diff --git a/crates/fhir/tests/data/R4/measure-component-a-example.json b/crates/fhir/tests/data/json/R4/measure-component-a-example.json similarity index 100% rename from crates/fhir/tests/data/R4/measure-component-a-example.json rename to crates/fhir/tests/data/json/R4/measure-component-a-example.json diff --git a/crates/fhir/tests/data/R4/measure-component-b-example.json b/crates/fhir/tests/data/json/R4/measure-component-b-example.json similarity index 100% rename from crates/fhir/tests/data/R4/measure-component-b-example.json rename to crates/fhir/tests/data/json/R4/measure-component-b-example.json diff --git a/crates/fhir/tests/data/R4/measure-composite-example.json b/crates/fhir/tests/data/json/R4/measure-composite-example.json similarity index 100% rename from crates/fhir/tests/data/R4/measure-composite-example.json rename to crates/fhir/tests/data/json/R4/measure-composite-example.json diff --git a/crates/fhir/tests/data/R4/measure-exclusive-breastfeeding.json b/crates/fhir/tests/data/json/R4/measure-exclusive-breastfeeding.json similarity index 100% rename from crates/fhir/tests/data/R4/measure-exclusive-breastfeeding.json rename to crates/fhir/tests/data/json/R4/measure-exclusive-breastfeeding.json diff --git a/crates/fhir/tests/data/R4/measure-hiv-indicators.json b/crates/fhir/tests/data/json/R4/measure-hiv-indicators.json similarity index 100% rename from crates/fhir/tests/data/R4/measure-hiv-indicators.json rename to crates/fhir/tests/data/json/R4/measure-hiv-indicators.json diff --git a/crates/fhir/tests/data/R4/measure-predecessor-example.json b/crates/fhir/tests/data/json/R4/measure-predecessor-example.json similarity index 100% rename from crates/fhir/tests/data/R4/measure-predecessor-example.json rename to crates/fhir/tests/data/json/R4/measure-predecessor-example.json diff --git a/crates/fhir/tests/data/R4/measure-questionnaire.json b/crates/fhir/tests/data/json/R4/measure-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/measure-questionnaire.json rename to crates/fhir/tests/data/json/R4/measure-questionnaire.json diff --git a/crates/fhir/tests/data/R4/measure.profile.json b/crates/fhir/tests/data/json/R4/measure.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/measure.profile.json rename to crates/fhir/tests/data/json/R4/measure.profile.json diff --git a/crates/fhir/tests/data/R4/measurereport-cms146-cat1-example.json b/crates/fhir/tests/data/json/R4/measurereport-cms146-cat1-example.json similarity index 100% rename from crates/fhir/tests/data/R4/measurereport-cms146-cat1-example.json rename to crates/fhir/tests/data/json/R4/measurereport-cms146-cat1-example.json diff --git a/crates/fhir/tests/data/R4/measurereport-cms146-cat2-example.json b/crates/fhir/tests/data/json/R4/measurereport-cms146-cat2-example.json similarity index 100% rename from crates/fhir/tests/data/R4/measurereport-cms146-cat2-example.json rename to crates/fhir/tests/data/json/R4/measurereport-cms146-cat2-example.json diff --git a/crates/fhir/tests/data/R4/measurereport-cms146-cat3-example.json b/crates/fhir/tests/data/json/R4/measurereport-cms146-cat3-example.json similarity index 100% rename from crates/fhir/tests/data/R4/measurereport-cms146-cat3-example.json rename to crates/fhir/tests/data/json/R4/measurereport-cms146-cat3-example.json diff --git a/crates/fhir/tests/data/R4/measurereport-hiv-indicators.json b/crates/fhir/tests/data/json/R4/measurereport-hiv-indicators.json similarity index 100% rename from crates/fhir/tests/data/R4/measurereport-hiv-indicators.json rename to crates/fhir/tests/data/json/R4/measurereport-hiv-indicators.json diff --git a/crates/fhir/tests/data/R4/measurereport-questionnaire.json b/crates/fhir/tests/data/json/R4/measurereport-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/measurereport-questionnaire.json rename to crates/fhir/tests/data/json/R4/measurereport-questionnaire.json diff --git a/crates/fhir/tests/data/R4/measurereport.profile.json b/crates/fhir/tests/data/json/R4/measurereport.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/measurereport.profile.json rename to crates/fhir/tests/data/json/R4/measurereport.profile.json diff --git a/crates/fhir/tests/data/R4/media-example-dicom.json b/crates/fhir/tests/data/json/R4/media-example-dicom.json similarity index 100% rename from crates/fhir/tests/data/R4/media-example-dicom.json rename to crates/fhir/tests/data/json/R4/media-example-dicom.json diff --git a/crates/fhir/tests/data/R4/media-example-sound.json b/crates/fhir/tests/data/json/R4/media-example-sound.json similarity index 100% rename from crates/fhir/tests/data/R4/media-example-sound.json rename to crates/fhir/tests/data/json/R4/media-example-sound.json diff --git a/crates/fhir/tests/data/R4/media-example-xray.json b/crates/fhir/tests/data/json/R4/media-example-xray.json similarity index 100% rename from crates/fhir/tests/data/R4/media-example-xray.json rename to crates/fhir/tests/data/json/R4/media-example-xray.json diff --git a/crates/fhir/tests/data/R4/media-example.json b/crates/fhir/tests/data/json/R4/media-example.json similarity index 100% rename from crates/fhir/tests/data/R4/media-example.json rename to crates/fhir/tests/data/json/R4/media-example.json diff --git a/crates/fhir/tests/data/R4/media-questionnaire.json b/crates/fhir/tests/data/json/R4/media-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/media-questionnaire.json rename to crates/fhir/tests/data/json/R4/media-questionnaire.json diff --git a/crates/fhir/tests/data/R4/media.profile.json b/crates/fhir/tests/data/json/R4/media.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/media.profile.json rename to crates/fhir/tests/data/json/R4/media.profile.json diff --git a/crates/fhir/tests/data/R4/medication-questionnaire.json b/crates/fhir/tests/data/json/R4/medication-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/medication-questionnaire.json rename to crates/fhir/tests/data/json/R4/medication-questionnaire.json diff --git a/crates/fhir/tests/data/R4/medication.profile.json b/crates/fhir/tests/data/json/R4/medication.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/medication.profile.json rename to crates/fhir/tests/data/json/R4/medication.profile.json diff --git a/crates/fhir/tests/data/R4/medicationadministration-questionnaire.json b/crates/fhir/tests/data/json/R4/medicationadministration-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationadministration-questionnaire.json rename to crates/fhir/tests/data/json/R4/medicationadministration-questionnaire.json diff --git a/crates/fhir/tests/data/R4/medicationadministration.profile.json b/crates/fhir/tests/data/json/R4/medicationadministration.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationadministration.profile.json rename to crates/fhir/tests/data/json/R4/medicationadministration.profile.json diff --git a/crates/fhir/tests/data/R4/medicationadministration0301.json b/crates/fhir/tests/data/json/R4/medicationadministration0301.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationadministration0301.json rename to crates/fhir/tests/data/json/R4/medicationadministration0301.json diff --git a/crates/fhir/tests/data/R4/medicationadministration0302.json b/crates/fhir/tests/data/json/R4/medicationadministration0302.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationadministration0302.json rename to crates/fhir/tests/data/json/R4/medicationadministration0302.json diff --git a/crates/fhir/tests/data/R4/medicationadministration0303.json b/crates/fhir/tests/data/json/R4/medicationadministration0303.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationadministration0303.json rename to crates/fhir/tests/data/json/R4/medicationadministration0303.json diff --git a/crates/fhir/tests/data/R4/medicationadministration0304.json b/crates/fhir/tests/data/json/R4/medicationadministration0304.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationadministration0304.json rename to crates/fhir/tests/data/json/R4/medicationadministration0304.json diff --git a/crates/fhir/tests/data/R4/medicationadministration0305.json b/crates/fhir/tests/data/json/R4/medicationadministration0305.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationadministration0305.json rename to crates/fhir/tests/data/json/R4/medicationadministration0305.json diff --git a/crates/fhir/tests/data/R4/medicationadministration0306.json b/crates/fhir/tests/data/json/R4/medicationadministration0306.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationadministration0306.json rename to crates/fhir/tests/data/json/R4/medicationadministration0306.json diff --git a/crates/fhir/tests/data/R4/medicationadministration0307.json b/crates/fhir/tests/data/json/R4/medicationadministration0307.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationadministration0307.json rename to crates/fhir/tests/data/json/R4/medicationadministration0307.json diff --git a/crates/fhir/tests/data/R4/medicationadministration0308.json b/crates/fhir/tests/data/json/R4/medicationadministration0308.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationadministration0308.json rename to crates/fhir/tests/data/json/R4/medicationadministration0308.json diff --git a/crates/fhir/tests/data/R4/medicationadministration0309.json b/crates/fhir/tests/data/json/R4/medicationadministration0309.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationadministration0309.json rename to crates/fhir/tests/data/json/R4/medicationadministration0309.json diff --git a/crates/fhir/tests/data/R4/medicationadministration0310.json b/crates/fhir/tests/data/json/R4/medicationadministration0310.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationadministration0310.json rename to crates/fhir/tests/data/json/R4/medicationadministration0310.json diff --git a/crates/fhir/tests/data/R4/medicationadministration0311.json b/crates/fhir/tests/data/json/R4/medicationadministration0311.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationadministration0311.json rename to crates/fhir/tests/data/json/R4/medicationadministration0311.json diff --git a/crates/fhir/tests/data/R4/medicationadministration0312.json b/crates/fhir/tests/data/json/R4/medicationadministration0312.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationadministration0312.json rename to crates/fhir/tests/data/json/R4/medicationadministration0312.json diff --git a/crates/fhir/tests/data/R4/medicationadministration0313.json b/crates/fhir/tests/data/json/R4/medicationadministration0313.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationadministration0313.json rename to crates/fhir/tests/data/json/R4/medicationadministration0313.json diff --git a/crates/fhir/tests/data/R4/medicationadministrationexample3.json b/crates/fhir/tests/data/json/R4/medicationadministrationexample3.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationadministrationexample3.json rename to crates/fhir/tests/data/json/R4/medicationadministrationexample3.json diff --git a/crates/fhir/tests/data/R4/medicationdispense-questionnaire.json b/crates/fhir/tests/data/json/R4/medicationdispense-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense-questionnaire.json rename to crates/fhir/tests/data/json/R4/medicationdispense-questionnaire.json diff --git a/crates/fhir/tests/data/R4/medicationdispense.profile.json b/crates/fhir/tests/data/json/R4/medicationdispense.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense.profile.json rename to crates/fhir/tests/data/json/R4/medicationdispense.profile.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0301.json b/crates/fhir/tests/data/json/R4/medicationdispense0301.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0301.json rename to crates/fhir/tests/data/json/R4/medicationdispense0301.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0302.json b/crates/fhir/tests/data/json/R4/medicationdispense0302.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0302.json rename to crates/fhir/tests/data/json/R4/medicationdispense0302.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0303.json b/crates/fhir/tests/data/json/R4/medicationdispense0303.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0303.json rename to crates/fhir/tests/data/json/R4/medicationdispense0303.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0304.json b/crates/fhir/tests/data/json/R4/medicationdispense0304.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0304.json rename to crates/fhir/tests/data/json/R4/medicationdispense0304.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0305.json b/crates/fhir/tests/data/json/R4/medicationdispense0305.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0305.json rename to crates/fhir/tests/data/json/R4/medicationdispense0305.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0306.json b/crates/fhir/tests/data/json/R4/medicationdispense0306.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0306.json rename to crates/fhir/tests/data/json/R4/medicationdispense0306.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0307.json b/crates/fhir/tests/data/json/R4/medicationdispense0307.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0307.json rename to crates/fhir/tests/data/json/R4/medicationdispense0307.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0308.json b/crates/fhir/tests/data/json/R4/medicationdispense0308.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0308.json rename to crates/fhir/tests/data/json/R4/medicationdispense0308.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0309.json b/crates/fhir/tests/data/json/R4/medicationdispense0309.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0309.json rename to crates/fhir/tests/data/json/R4/medicationdispense0309.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0310.json b/crates/fhir/tests/data/json/R4/medicationdispense0310.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0310.json rename to crates/fhir/tests/data/json/R4/medicationdispense0310.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0311.json b/crates/fhir/tests/data/json/R4/medicationdispense0311.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0311.json rename to crates/fhir/tests/data/json/R4/medicationdispense0311.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0312.json b/crates/fhir/tests/data/json/R4/medicationdispense0312.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0312.json rename to crates/fhir/tests/data/json/R4/medicationdispense0312.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0313.json b/crates/fhir/tests/data/json/R4/medicationdispense0313.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0313.json rename to crates/fhir/tests/data/json/R4/medicationdispense0313.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0314.json b/crates/fhir/tests/data/json/R4/medicationdispense0314.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0314.json rename to crates/fhir/tests/data/json/R4/medicationdispense0314.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0315.json b/crates/fhir/tests/data/json/R4/medicationdispense0315.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0315.json rename to crates/fhir/tests/data/json/R4/medicationdispense0315.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0316.json b/crates/fhir/tests/data/json/R4/medicationdispense0316.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0316.json rename to crates/fhir/tests/data/json/R4/medicationdispense0316.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0317.json b/crates/fhir/tests/data/json/R4/medicationdispense0317.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0317.json rename to crates/fhir/tests/data/json/R4/medicationdispense0317.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0318.json b/crates/fhir/tests/data/json/R4/medicationdispense0318.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0318.json rename to crates/fhir/tests/data/json/R4/medicationdispense0318.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0319.json b/crates/fhir/tests/data/json/R4/medicationdispense0319.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0319.json rename to crates/fhir/tests/data/json/R4/medicationdispense0319.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0320.json b/crates/fhir/tests/data/json/R4/medicationdispense0320.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0320.json rename to crates/fhir/tests/data/json/R4/medicationdispense0320.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0321.json b/crates/fhir/tests/data/json/R4/medicationdispense0321.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0321.json rename to crates/fhir/tests/data/json/R4/medicationdispense0321.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0322.json b/crates/fhir/tests/data/json/R4/medicationdispense0322.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0322.json rename to crates/fhir/tests/data/json/R4/medicationdispense0322.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0324.json b/crates/fhir/tests/data/json/R4/medicationdispense0324.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0324.json rename to crates/fhir/tests/data/json/R4/medicationdispense0324.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0325.json b/crates/fhir/tests/data/json/R4/medicationdispense0325.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0325.json rename to crates/fhir/tests/data/json/R4/medicationdispense0325.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0326.json b/crates/fhir/tests/data/json/R4/medicationdispense0326.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0326.json rename to crates/fhir/tests/data/json/R4/medicationdispense0326.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0327.json b/crates/fhir/tests/data/json/R4/medicationdispense0327.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0327.json rename to crates/fhir/tests/data/json/R4/medicationdispense0327.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0328.json b/crates/fhir/tests/data/json/R4/medicationdispense0328.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0328.json rename to crates/fhir/tests/data/json/R4/medicationdispense0328.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0329.json b/crates/fhir/tests/data/json/R4/medicationdispense0329.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0329.json rename to crates/fhir/tests/data/json/R4/medicationdispense0329.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0330.json b/crates/fhir/tests/data/json/R4/medicationdispense0330.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0330.json rename to crates/fhir/tests/data/json/R4/medicationdispense0330.json diff --git a/crates/fhir/tests/data/R4/medicationdispense0331.json b/crates/fhir/tests/data/json/R4/medicationdispense0331.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispense0331.json rename to crates/fhir/tests/data/json/R4/medicationdispense0331.json diff --git a/crates/fhir/tests/data/R4/medicationdispenseexample8.json b/crates/fhir/tests/data/json/R4/medicationdispenseexample8.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationdispenseexample8.json rename to crates/fhir/tests/data/json/R4/medicationdispenseexample8.json diff --git a/crates/fhir/tests/data/R4/medicationexample0301.json b/crates/fhir/tests/data/json/R4/medicationexample0301.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0301.json rename to crates/fhir/tests/data/json/R4/medicationexample0301.json diff --git a/crates/fhir/tests/data/R4/medicationexample0302.json b/crates/fhir/tests/data/json/R4/medicationexample0302.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0302.json rename to crates/fhir/tests/data/json/R4/medicationexample0302.json diff --git a/crates/fhir/tests/data/R4/medicationexample0303.json b/crates/fhir/tests/data/json/R4/medicationexample0303.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0303.json rename to crates/fhir/tests/data/json/R4/medicationexample0303.json diff --git a/crates/fhir/tests/data/R4/medicationexample0304.json b/crates/fhir/tests/data/json/R4/medicationexample0304.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0304.json rename to crates/fhir/tests/data/json/R4/medicationexample0304.json diff --git a/crates/fhir/tests/data/R4/medicationexample0305.json b/crates/fhir/tests/data/json/R4/medicationexample0305.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0305.json rename to crates/fhir/tests/data/json/R4/medicationexample0305.json diff --git a/crates/fhir/tests/data/R4/medicationexample0306.json b/crates/fhir/tests/data/json/R4/medicationexample0306.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0306.json rename to crates/fhir/tests/data/json/R4/medicationexample0306.json diff --git a/crates/fhir/tests/data/R4/medicationexample0307.json b/crates/fhir/tests/data/json/R4/medicationexample0307.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0307.json rename to crates/fhir/tests/data/json/R4/medicationexample0307.json diff --git a/crates/fhir/tests/data/R4/medicationexample0308.json b/crates/fhir/tests/data/json/R4/medicationexample0308.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0308.json rename to crates/fhir/tests/data/json/R4/medicationexample0308.json diff --git a/crates/fhir/tests/data/R4/medicationexample0309.json b/crates/fhir/tests/data/json/R4/medicationexample0309.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0309.json rename to crates/fhir/tests/data/json/R4/medicationexample0309.json diff --git a/crates/fhir/tests/data/R4/medicationexample0310.json b/crates/fhir/tests/data/json/R4/medicationexample0310.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0310.json rename to crates/fhir/tests/data/json/R4/medicationexample0310.json diff --git a/crates/fhir/tests/data/R4/medicationexample0311.json b/crates/fhir/tests/data/json/R4/medicationexample0311.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0311.json rename to crates/fhir/tests/data/json/R4/medicationexample0311.json diff --git a/crates/fhir/tests/data/R4/medicationexample0312.json b/crates/fhir/tests/data/json/R4/medicationexample0312.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0312.json rename to crates/fhir/tests/data/json/R4/medicationexample0312.json diff --git a/crates/fhir/tests/data/R4/medicationexample0313.json b/crates/fhir/tests/data/json/R4/medicationexample0313.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0313.json rename to crates/fhir/tests/data/json/R4/medicationexample0313.json diff --git a/crates/fhir/tests/data/R4/medicationexample0314.json b/crates/fhir/tests/data/json/R4/medicationexample0314.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0314.json rename to crates/fhir/tests/data/json/R4/medicationexample0314.json diff --git a/crates/fhir/tests/data/R4/medicationexample0315.json b/crates/fhir/tests/data/json/R4/medicationexample0315.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0315.json rename to crates/fhir/tests/data/json/R4/medicationexample0315.json diff --git a/crates/fhir/tests/data/R4/medicationexample0316.json b/crates/fhir/tests/data/json/R4/medicationexample0316.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0316.json rename to crates/fhir/tests/data/json/R4/medicationexample0316.json diff --git a/crates/fhir/tests/data/R4/medicationexample0317.json b/crates/fhir/tests/data/json/R4/medicationexample0317.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0317.json rename to crates/fhir/tests/data/json/R4/medicationexample0317.json diff --git a/crates/fhir/tests/data/R4/medicationexample0318.json b/crates/fhir/tests/data/json/R4/medicationexample0318.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0318.json rename to crates/fhir/tests/data/json/R4/medicationexample0318.json diff --git a/crates/fhir/tests/data/R4/medicationexample0319.json b/crates/fhir/tests/data/json/R4/medicationexample0319.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0319.json rename to crates/fhir/tests/data/json/R4/medicationexample0319.json diff --git a/crates/fhir/tests/data/R4/medicationexample0320.json b/crates/fhir/tests/data/json/R4/medicationexample0320.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0320.json rename to crates/fhir/tests/data/json/R4/medicationexample0320.json diff --git a/crates/fhir/tests/data/R4/medicationexample0321.json b/crates/fhir/tests/data/json/R4/medicationexample0321.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample0321.json rename to crates/fhir/tests/data/json/R4/medicationexample0321.json diff --git a/crates/fhir/tests/data/R4/medicationexample1.json b/crates/fhir/tests/data/json/R4/medicationexample1.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample1.json rename to crates/fhir/tests/data/json/R4/medicationexample1.json diff --git a/crates/fhir/tests/data/R4/medicationexample15.json b/crates/fhir/tests/data/json/R4/medicationexample15.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationexample15.json rename to crates/fhir/tests/data/json/R4/medicationexample15.json diff --git a/crates/fhir/tests/data/R4/medicationknowledge-example.json b/crates/fhir/tests/data/json/R4/medicationknowledge-example.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationknowledge-example.json rename to crates/fhir/tests/data/json/R4/medicationknowledge-example.json diff --git a/crates/fhir/tests/data/R4/medicationknowledge-questionnaire.json b/crates/fhir/tests/data/json/R4/medicationknowledge-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationknowledge-questionnaire.json rename to crates/fhir/tests/data/json/R4/medicationknowledge-questionnaire.json diff --git a/crates/fhir/tests/data/R4/medicationknowledge.profile.json b/crates/fhir/tests/data/json/R4/medicationknowledge.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationknowledge.profile.json rename to crates/fhir/tests/data/json/R4/medicationknowledge.profile.json diff --git a/crates/fhir/tests/data/R4/medicationrequest-questionnaire.json b/crates/fhir/tests/data/json/R4/medicationrequest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest-questionnaire.json rename to crates/fhir/tests/data/json/R4/medicationrequest-questionnaire.json diff --git a/crates/fhir/tests/data/R4/medicationrequest.profile.json b/crates/fhir/tests/data/json/R4/medicationrequest.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest.profile.json rename to crates/fhir/tests/data/json/R4/medicationrequest.profile.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0301.json b/crates/fhir/tests/data/json/R4/medicationrequest0301.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0301.json rename to crates/fhir/tests/data/json/R4/medicationrequest0301.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0302.json b/crates/fhir/tests/data/json/R4/medicationrequest0302.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0302.json rename to crates/fhir/tests/data/json/R4/medicationrequest0302.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0303.json b/crates/fhir/tests/data/json/R4/medicationrequest0303.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0303.json rename to crates/fhir/tests/data/json/R4/medicationrequest0303.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0304.json b/crates/fhir/tests/data/json/R4/medicationrequest0304.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0304.json rename to crates/fhir/tests/data/json/R4/medicationrequest0304.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0305.json b/crates/fhir/tests/data/json/R4/medicationrequest0305.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0305.json rename to crates/fhir/tests/data/json/R4/medicationrequest0305.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0306.json b/crates/fhir/tests/data/json/R4/medicationrequest0306.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0306.json rename to crates/fhir/tests/data/json/R4/medicationrequest0306.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0307.json b/crates/fhir/tests/data/json/R4/medicationrequest0307.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0307.json rename to crates/fhir/tests/data/json/R4/medicationrequest0307.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0308.json b/crates/fhir/tests/data/json/R4/medicationrequest0308.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0308.json rename to crates/fhir/tests/data/json/R4/medicationrequest0308.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0309.json b/crates/fhir/tests/data/json/R4/medicationrequest0309.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0309.json rename to crates/fhir/tests/data/json/R4/medicationrequest0309.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0310.json b/crates/fhir/tests/data/json/R4/medicationrequest0310.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0310.json rename to crates/fhir/tests/data/json/R4/medicationrequest0310.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0312.json b/crates/fhir/tests/data/json/R4/medicationrequest0312.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0312.json rename to crates/fhir/tests/data/json/R4/medicationrequest0312.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0313.json b/crates/fhir/tests/data/json/R4/medicationrequest0313.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0313.json rename to crates/fhir/tests/data/json/R4/medicationrequest0313.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0314.json b/crates/fhir/tests/data/json/R4/medicationrequest0314.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0314.json rename to crates/fhir/tests/data/json/R4/medicationrequest0314.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0315.json b/crates/fhir/tests/data/json/R4/medicationrequest0315.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0315.json rename to crates/fhir/tests/data/json/R4/medicationrequest0315.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0316.json b/crates/fhir/tests/data/json/R4/medicationrequest0316.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0316.json rename to crates/fhir/tests/data/json/R4/medicationrequest0316.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0317.json b/crates/fhir/tests/data/json/R4/medicationrequest0317.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0317.json rename to crates/fhir/tests/data/json/R4/medicationrequest0317.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0318.json b/crates/fhir/tests/data/json/R4/medicationrequest0318.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0318.json rename to crates/fhir/tests/data/json/R4/medicationrequest0318.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0319.json b/crates/fhir/tests/data/json/R4/medicationrequest0319.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0319.json rename to crates/fhir/tests/data/json/R4/medicationrequest0319.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0320.json b/crates/fhir/tests/data/json/R4/medicationrequest0320.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0320.json rename to crates/fhir/tests/data/json/R4/medicationrequest0320.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0321.json b/crates/fhir/tests/data/json/R4/medicationrequest0321.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0321.json rename to crates/fhir/tests/data/json/R4/medicationrequest0321.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0322.json b/crates/fhir/tests/data/json/R4/medicationrequest0322.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0322.json rename to crates/fhir/tests/data/json/R4/medicationrequest0322.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0323.json b/crates/fhir/tests/data/json/R4/medicationrequest0323.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0323.json rename to crates/fhir/tests/data/json/R4/medicationrequest0323.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0324.json b/crates/fhir/tests/data/json/R4/medicationrequest0324.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0324.json rename to crates/fhir/tests/data/json/R4/medicationrequest0324.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0325.json b/crates/fhir/tests/data/json/R4/medicationrequest0325.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0325.json rename to crates/fhir/tests/data/json/R4/medicationrequest0325.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0326.json b/crates/fhir/tests/data/json/R4/medicationrequest0326.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0326.json rename to crates/fhir/tests/data/json/R4/medicationrequest0326.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0327.json b/crates/fhir/tests/data/json/R4/medicationrequest0327.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0327.json rename to crates/fhir/tests/data/json/R4/medicationrequest0327.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0328.json b/crates/fhir/tests/data/json/R4/medicationrequest0328.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0328.json rename to crates/fhir/tests/data/json/R4/medicationrequest0328.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0329.json b/crates/fhir/tests/data/json/R4/medicationrequest0329.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0329.json rename to crates/fhir/tests/data/json/R4/medicationrequest0329.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0330.json b/crates/fhir/tests/data/json/R4/medicationrequest0330.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0330.json rename to crates/fhir/tests/data/json/R4/medicationrequest0330.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0331.json b/crates/fhir/tests/data/json/R4/medicationrequest0331.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0331.json rename to crates/fhir/tests/data/json/R4/medicationrequest0331.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0332.json b/crates/fhir/tests/data/json/R4/medicationrequest0332.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0332.json rename to crates/fhir/tests/data/json/R4/medicationrequest0332.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0333.json b/crates/fhir/tests/data/json/R4/medicationrequest0333.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0333.json rename to crates/fhir/tests/data/json/R4/medicationrequest0333.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0334.json b/crates/fhir/tests/data/json/R4/medicationrequest0334.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0334.json rename to crates/fhir/tests/data/json/R4/medicationrequest0334.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0335.json b/crates/fhir/tests/data/json/R4/medicationrequest0335.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0335.json rename to crates/fhir/tests/data/json/R4/medicationrequest0335.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0336.json b/crates/fhir/tests/data/json/R4/medicationrequest0336.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0336.json rename to crates/fhir/tests/data/json/R4/medicationrequest0336.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0337.json b/crates/fhir/tests/data/json/R4/medicationrequest0337.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0337.json rename to crates/fhir/tests/data/json/R4/medicationrequest0337.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0338.json b/crates/fhir/tests/data/json/R4/medicationrequest0338.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0338.json rename to crates/fhir/tests/data/json/R4/medicationrequest0338.json diff --git a/crates/fhir/tests/data/R4/medicationrequest0339.json b/crates/fhir/tests/data/json/R4/medicationrequest0339.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequest0339.json rename to crates/fhir/tests/data/json/R4/medicationrequest0339.json diff --git a/crates/fhir/tests/data/R4/medicationrequestexample1.json b/crates/fhir/tests/data/json/R4/medicationrequestexample1.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequestexample1.json rename to crates/fhir/tests/data/json/R4/medicationrequestexample1.json diff --git a/crates/fhir/tests/data/R4/medicationrequestexample2.json b/crates/fhir/tests/data/json/R4/medicationrequestexample2.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationrequestexample2.json rename to crates/fhir/tests/data/json/R4/medicationrequestexample2.json diff --git a/crates/fhir/tests/data/R4/medicationstatement-questionnaire.json b/crates/fhir/tests/data/json/R4/medicationstatement-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationstatement-questionnaire.json rename to crates/fhir/tests/data/json/R4/medicationstatement-questionnaire.json diff --git a/crates/fhir/tests/data/R4/medicationstatement.profile.json b/crates/fhir/tests/data/json/R4/medicationstatement.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationstatement.profile.json rename to crates/fhir/tests/data/json/R4/medicationstatement.profile.json diff --git a/crates/fhir/tests/data/R4/medicationstatementexample1.json b/crates/fhir/tests/data/json/R4/medicationstatementexample1.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationstatementexample1.json rename to crates/fhir/tests/data/json/R4/medicationstatementexample1.json diff --git a/crates/fhir/tests/data/R4/medicationstatementexample2.json b/crates/fhir/tests/data/json/R4/medicationstatementexample2.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationstatementexample2.json rename to crates/fhir/tests/data/json/R4/medicationstatementexample2.json diff --git a/crates/fhir/tests/data/R4/medicationstatementexample3.json b/crates/fhir/tests/data/json/R4/medicationstatementexample3.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationstatementexample3.json rename to crates/fhir/tests/data/json/R4/medicationstatementexample3.json diff --git a/crates/fhir/tests/data/R4/medicationstatementexample4.json b/crates/fhir/tests/data/json/R4/medicationstatementexample4.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationstatementexample4.json rename to crates/fhir/tests/data/json/R4/medicationstatementexample4.json diff --git a/crates/fhir/tests/data/R4/medicationstatementexample5.json b/crates/fhir/tests/data/json/R4/medicationstatementexample5.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationstatementexample5.json rename to crates/fhir/tests/data/json/R4/medicationstatementexample5.json diff --git a/crates/fhir/tests/data/R4/medicationstatementexample6.json b/crates/fhir/tests/data/json/R4/medicationstatementexample6.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationstatementexample6.json rename to crates/fhir/tests/data/json/R4/medicationstatementexample6.json diff --git a/crates/fhir/tests/data/R4/medicationstatementexample7.json b/crates/fhir/tests/data/json/R4/medicationstatementexample7.json similarity index 100% rename from crates/fhir/tests/data/R4/medicationstatementexample7.json rename to crates/fhir/tests/data/json/R4/medicationstatementexample7.json diff --git a/crates/fhir/tests/data/R4/medicinalproduct-example.json b/crates/fhir/tests/data/json/R4/medicinalproduct-example.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproduct-example.json rename to crates/fhir/tests/data/json/R4/medicinalproduct-example.json diff --git a/crates/fhir/tests/data/R4/medicinalproduct-questionnaire.json b/crates/fhir/tests/data/json/R4/medicinalproduct-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproduct-questionnaire.json rename to crates/fhir/tests/data/json/R4/medicinalproduct-questionnaire.json diff --git a/crates/fhir/tests/data/R4/medicinalproduct.profile.json b/crates/fhir/tests/data/json/R4/medicinalproduct.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproduct.profile.json rename to crates/fhir/tests/data/json/R4/medicinalproduct.profile.json diff --git a/crates/fhir/tests/data/R4/medicinalproductauthorization-example.json b/crates/fhir/tests/data/json/R4/medicinalproductauthorization-example.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductauthorization-example.json rename to crates/fhir/tests/data/json/R4/medicinalproductauthorization-example.json diff --git a/crates/fhir/tests/data/R4/medicinalproductauthorization-questionnaire.json b/crates/fhir/tests/data/json/R4/medicinalproductauthorization-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductauthorization-questionnaire.json rename to crates/fhir/tests/data/json/R4/medicinalproductauthorization-questionnaire.json diff --git a/crates/fhir/tests/data/R4/medicinalproductauthorization.profile.json b/crates/fhir/tests/data/json/R4/medicinalproductauthorization.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductauthorization.profile.json rename to crates/fhir/tests/data/json/R4/medicinalproductauthorization.profile.json diff --git a/crates/fhir/tests/data/R4/medicinalproductcontraindication-example.json b/crates/fhir/tests/data/json/R4/medicinalproductcontraindication-example.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductcontraindication-example.json rename to crates/fhir/tests/data/json/R4/medicinalproductcontraindication-example.json diff --git a/crates/fhir/tests/data/R4/medicinalproductcontraindication-questionnaire.json b/crates/fhir/tests/data/json/R4/medicinalproductcontraindication-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductcontraindication-questionnaire.json rename to crates/fhir/tests/data/json/R4/medicinalproductcontraindication-questionnaire.json diff --git a/crates/fhir/tests/data/R4/medicinalproductcontraindication.profile.json b/crates/fhir/tests/data/json/R4/medicinalproductcontraindication.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductcontraindication.profile.json rename to crates/fhir/tests/data/json/R4/medicinalproductcontraindication.profile.json diff --git a/crates/fhir/tests/data/R4/medicinalproductindication-example.json b/crates/fhir/tests/data/json/R4/medicinalproductindication-example.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductindication-example.json rename to crates/fhir/tests/data/json/R4/medicinalproductindication-example.json diff --git a/crates/fhir/tests/data/R4/medicinalproductindication-questionnaire.json b/crates/fhir/tests/data/json/R4/medicinalproductindication-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductindication-questionnaire.json rename to crates/fhir/tests/data/json/R4/medicinalproductindication-questionnaire.json diff --git a/crates/fhir/tests/data/R4/medicinalproductindication.profile.json b/crates/fhir/tests/data/json/R4/medicinalproductindication.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductindication.profile.json rename to crates/fhir/tests/data/json/R4/medicinalproductindication.profile.json diff --git a/crates/fhir/tests/data/R4/medicinalproductingredient-example.json b/crates/fhir/tests/data/json/R4/medicinalproductingredient-example.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductingredient-example.json rename to crates/fhir/tests/data/json/R4/medicinalproductingredient-example.json diff --git a/crates/fhir/tests/data/R4/medicinalproductingredient-questionnaire.json b/crates/fhir/tests/data/json/R4/medicinalproductingredient-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductingredient-questionnaire.json rename to crates/fhir/tests/data/json/R4/medicinalproductingredient-questionnaire.json diff --git a/crates/fhir/tests/data/R4/medicinalproductingredient.profile.json b/crates/fhir/tests/data/json/R4/medicinalproductingredient.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductingredient.profile.json rename to crates/fhir/tests/data/json/R4/medicinalproductingredient.profile.json diff --git a/crates/fhir/tests/data/R4/medicinalproductinteraction-example.json b/crates/fhir/tests/data/json/R4/medicinalproductinteraction-example.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductinteraction-example.json rename to crates/fhir/tests/data/json/R4/medicinalproductinteraction-example.json diff --git a/crates/fhir/tests/data/R4/medicinalproductinteraction-questionnaire.json b/crates/fhir/tests/data/json/R4/medicinalproductinteraction-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductinteraction-questionnaire.json rename to crates/fhir/tests/data/json/R4/medicinalproductinteraction-questionnaire.json diff --git a/crates/fhir/tests/data/R4/medicinalproductinteraction.profile.json b/crates/fhir/tests/data/json/R4/medicinalproductinteraction.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductinteraction.profile.json rename to crates/fhir/tests/data/json/R4/medicinalproductinteraction.profile.json diff --git a/crates/fhir/tests/data/R4/medicinalproductmanufactured-example.json b/crates/fhir/tests/data/json/R4/medicinalproductmanufactured-example.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductmanufactured-example.json rename to crates/fhir/tests/data/json/R4/medicinalproductmanufactured-example.json diff --git a/crates/fhir/tests/data/R4/medicinalproductmanufactured-questionnaire.json b/crates/fhir/tests/data/json/R4/medicinalproductmanufactured-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductmanufactured-questionnaire.json rename to crates/fhir/tests/data/json/R4/medicinalproductmanufactured-questionnaire.json diff --git a/crates/fhir/tests/data/R4/medicinalproductmanufactured.profile.json b/crates/fhir/tests/data/json/R4/medicinalproductmanufactured.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductmanufactured.profile.json rename to crates/fhir/tests/data/json/R4/medicinalproductmanufactured.profile.json diff --git a/crates/fhir/tests/data/R4/medicinalproductpackaged-example.json b/crates/fhir/tests/data/json/R4/medicinalproductpackaged-example.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductpackaged-example.json rename to crates/fhir/tests/data/json/R4/medicinalproductpackaged-example.json diff --git a/crates/fhir/tests/data/R4/medicinalproductpackaged-questionnaire.json b/crates/fhir/tests/data/json/R4/medicinalproductpackaged-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductpackaged-questionnaire.json rename to crates/fhir/tests/data/json/R4/medicinalproductpackaged-questionnaire.json diff --git a/crates/fhir/tests/data/R4/medicinalproductpackaged.profile.json b/crates/fhir/tests/data/json/R4/medicinalproductpackaged.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductpackaged.profile.json rename to crates/fhir/tests/data/json/R4/medicinalproductpackaged.profile.json diff --git a/crates/fhir/tests/data/R4/medicinalproductpharmaceutical-example.json b/crates/fhir/tests/data/json/R4/medicinalproductpharmaceutical-example.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductpharmaceutical-example.json rename to crates/fhir/tests/data/json/R4/medicinalproductpharmaceutical-example.json diff --git a/crates/fhir/tests/data/R4/medicinalproductpharmaceutical-questionnaire.json b/crates/fhir/tests/data/json/R4/medicinalproductpharmaceutical-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductpharmaceutical-questionnaire.json rename to crates/fhir/tests/data/json/R4/medicinalproductpharmaceutical-questionnaire.json diff --git a/crates/fhir/tests/data/R4/medicinalproductpharmaceutical.profile.json b/crates/fhir/tests/data/json/R4/medicinalproductpharmaceutical.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductpharmaceutical.profile.json rename to crates/fhir/tests/data/json/R4/medicinalproductpharmaceutical.profile.json diff --git a/crates/fhir/tests/data/R4/medicinalproductundesirableeffect-example.json b/crates/fhir/tests/data/json/R4/medicinalproductundesirableeffect-example.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductundesirableeffect-example.json rename to crates/fhir/tests/data/json/R4/medicinalproductundesirableeffect-example.json diff --git a/crates/fhir/tests/data/R4/medicinalproductundesirableeffect-questionnaire.json b/crates/fhir/tests/data/json/R4/medicinalproductundesirableeffect-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductundesirableeffect-questionnaire.json rename to crates/fhir/tests/data/json/R4/medicinalproductundesirableeffect-questionnaire.json diff --git a/crates/fhir/tests/data/R4/medicinalproductundesirableeffect.profile.json b/crates/fhir/tests/data/json/R4/medicinalproductundesirableeffect.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/medicinalproductundesirableeffect.profile.json rename to crates/fhir/tests/data/json/R4/medicinalproductundesirableeffect.profile.json diff --git a/crates/fhir/tests/data/R4/message-request-link.json b/crates/fhir/tests/data/json/R4/message-request-link.json similarity index 100% rename from crates/fhir/tests/data/R4/message-request-link.json rename to crates/fhir/tests/data/json/R4/message-request-link.json diff --git a/crates/fhir/tests/data/R4/message-response-link.json b/crates/fhir/tests/data/json/R4/message-response-link.json similarity index 100% rename from crates/fhir/tests/data/R4/message-response-link.json rename to crates/fhir/tests/data/json/R4/message-response-link.json diff --git a/crates/fhir/tests/data/R4/messagedefinition-example.json b/crates/fhir/tests/data/json/R4/messagedefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4/messagedefinition-example.json rename to crates/fhir/tests/data/json/R4/messagedefinition-example.json diff --git a/crates/fhir/tests/data/R4/messagedefinition-patient-link-notification.json b/crates/fhir/tests/data/json/R4/messagedefinition-patient-link-notification.json similarity index 100% rename from crates/fhir/tests/data/R4/messagedefinition-patient-link-notification.json rename to crates/fhir/tests/data/json/R4/messagedefinition-patient-link-notification.json diff --git a/crates/fhir/tests/data/R4/messagedefinition-patient-link-response.json b/crates/fhir/tests/data/json/R4/messagedefinition-patient-link-response.json similarity index 100% rename from crates/fhir/tests/data/R4/messagedefinition-patient-link-response.json rename to crates/fhir/tests/data/json/R4/messagedefinition-patient-link-response.json diff --git a/crates/fhir/tests/data/R4/messagedefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/messagedefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/messagedefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/messagedefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/messagedefinition.profile.json b/crates/fhir/tests/data/json/R4/messagedefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/messagedefinition.profile.json rename to crates/fhir/tests/data/json/R4/messagedefinition.profile.json diff --git a/crates/fhir/tests/data/R4/messageheader-example.json b/crates/fhir/tests/data/json/R4/messageheader-example.json similarity index 100% rename from crates/fhir/tests/data/R4/messageheader-example.json rename to crates/fhir/tests/data/json/R4/messageheader-example.json diff --git a/crates/fhir/tests/data/R4/messageheader-questionnaire.json b/crates/fhir/tests/data/json/R4/messageheader-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/messageheader-questionnaire.json rename to crates/fhir/tests/data/json/R4/messageheader-questionnaire.json diff --git a/crates/fhir/tests/data/R4/messageheader.profile.json b/crates/fhir/tests/data/json/R4/messageheader.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/messageheader.profile.json rename to crates/fhir/tests/data/json/R4/messageheader.profile.json diff --git a/crates/fhir/tests/data/R4/meta.profile.json b/crates/fhir/tests/data/json/R4/meta.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/meta.profile.json rename to crates/fhir/tests/data/json/R4/meta.profile.json diff --git a/crates/fhir/tests/data/R4/metadataresource.profile.json b/crates/fhir/tests/data/json/R4/metadataresource.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/metadataresource.profile.json rename to crates/fhir/tests/data/json/R4/metadataresource.profile.json diff --git a/crates/fhir/tests/data/R4/molecularsequence-example.json b/crates/fhir/tests/data/json/R4/molecularsequence-example.json similarity index 100% rename from crates/fhir/tests/data/R4/molecularsequence-example.json rename to crates/fhir/tests/data/json/R4/molecularsequence-example.json diff --git a/crates/fhir/tests/data/R4/molecularsequence-questionnaire.json b/crates/fhir/tests/data/json/R4/molecularsequence-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/molecularsequence-questionnaire.json rename to crates/fhir/tests/data/json/R4/molecularsequence-questionnaire.json diff --git a/crates/fhir/tests/data/R4/molecularsequence.profile.json b/crates/fhir/tests/data/json/R4/molecularsequence.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/molecularsequence.profile.json rename to crates/fhir/tests/data/json/R4/molecularsequence.profile.json diff --git a/crates/fhir/tests/data/R4/money.profile.json b/crates/fhir/tests/data/json/R4/money.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/money.profile.json rename to crates/fhir/tests/data/json/R4/money.profile.json diff --git a/crates/fhir/tests/data/R4/moneyquantity.profile.json b/crates/fhir/tests/data/json/R4/moneyquantity.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/moneyquantity.profile.json rename to crates/fhir/tests/data/json/R4/moneyquantity.profile.json diff --git a/crates/fhir/tests/data/R4/namingsystem-example-id.json b/crates/fhir/tests/data/json/R4/namingsystem-example-id.json similarity index 100% rename from crates/fhir/tests/data/R4/namingsystem-example-id.json rename to crates/fhir/tests/data/json/R4/namingsystem-example-id.json diff --git a/crates/fhir/tests/data/R4/namingsystem-example.json b/crates/fhir/tests/data/json/R4/namingsystem-example.json similarity index 100% rename from crates/fhir/tests/data/R4/namingsystem-example.json rename to crates/fhir/tests/data/json/R4/namingsystem-example.json diff --git a/crates/fhir/tests/data/R4/namingsystem-questionnaire.json b/crates/fhir/tests/data/json/R4/namingsystem-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/namingsystem-questionnaire.json rename to crates/fhir/tests/data/json/R4/namingsystem-questionnaire.json diff --git a/crates/fhir/tests/data/R4/namingsystem-registry.json b/crates/fhir/tests/data/json/R4/namingsystem-registry.json similarity index 100% rename from crates/fhir/tests/data/R4/namingsystem-registry.json rename to crates/fhir/tests/data/json/R4/namingsystem-registry.json diff --git a/crates/fhir/tests/data/R4/namingsystem-terminologies.json b/crates/fhir/tests/data/json/R4/namingsystem-terminologies.json similarity index 100% rename from crates/fhir/tests/data/R4/namingsystem-terminologies.json rename to crates/fhir/tests/data/json/R4/namingsystem-terminologies.json diff --git a/crates/fhir/tests/data/R4/namingsystem.profile.json b/crates/fhir/tests/data/json/R4/namingsystem.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/namingsystem.profile.json rename to crates/fhir/tests/data/json/R4/namingsystem.profile.json diff --git a/crates/fhir/tests/data/R4/narrative.profile.json b/crates/fhir/tests/data/json/R4/narrative.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/narrative.profile.json rename to crates/fhir/tests/data/json/R4/narrative.profile.json diff --git a/crates/fhir/tests/data/R4/nutritionorder-example-cardiacdiet.json b/crates/fhir/tests/data/json/R4/nutritionorder-example-cardiacdiet.json similarity index 100% rename from crates/fhir/tests/data/R4/nutritionorder-example-cardiacdiet.json rename to crates/fhir/tests/data/json/R4/nutritionorder-example-cardiacdiet.json diff --git a/crates/fhir/tests/data/R4/nutritionorder-example-diabeticdiet.json b/crates/fhir/tests/data/json/R4/nutritionorder-example-diabeticdiet.json similarity index 100% rename from crates/fhir/tests/data/R4/nutritionorder-example-diabeticdiet.json rename to crates/fhir/tests/data/json/R4/nutritionorder-example-diabeticdiet.json diff --git a/crates/fhir/tests/data/R4/nutritionorder-example-diabeticsupplement.json b/crates/fhir/tests/data/json/R4/nutritionorder-example-diabeticsupplement.json similarity index 100% rename from crates/fhir/tests/data/R4/nutritionorder-example-diabeticsupplement.json rename to crates/fhir/tests/data/json/R4/nutritionorder-example-diabeticsupplement.json diff --git a/crates/fhir/tests/data/R4/nutritionorder-example-energysupplement.json b/crates/fhir/tests/data/json/R4/nutritionorder-example-energysupplement.json similarity index 100% rename from crates/fhir/tests/data/R4/nutritionorder-example-energysupplement.json rename to crates/fhir/tests/data/json/R4/nutritionorder-example-energysupplement.json diff --git a/crates/fhir/tests/data/R4/nutritionorder-example-enteralbolus.json b/crates/fhir/tests/data/json/R4/nutritionorder-example-enteralbolus.json similarity index 100% rename from crates/fhir/tests/data/R4/nutritionorder-example-enteralbolus.json rename to crates/fhir/tests/data/json/R4/nutritionorder-example-enteralbolus.json diff --git a/crates/fhir/tests/data/R4/nutritionorder-example-enteralcontinuous.json b/crates/fhir/tests/data/json/R4/nutritionorder-example-enteralcontinuous.json similarity index 100% rename from crates/fhir/tests/data/R4/nutritionorder-example-enteralcontinuous.json rename to crates/fhir/tests/data/json/R4/nutritionorder-example-enteralcontinuous.json diff --git a/crates/fhir/tests/data/R4/nutritionorder-example-fiberrestricteddiet.json b/crates/fhir/tests/data/json/R4/nutritionorder-example-fiberrestricteddiet.json similarity index 100% rename from crates/fhir/tests/data/R4/nutritionorder-example-fiberrestricteddiet.json rename to crates/fhir/tests/data/json/R4/nutritionorder-example-fiberrestricteddiet.json diff --git a/crates/fhir/tests/data/R4/nutritionorder-example-infantenteral.json b/crates/fhir/tests/data/json/R4/nutritionorder-example-infantenteral.json similarity index 100% rename from crates/fhir/tests/data/R4/nutritionorder-example-infantenteral.json rename to crates/fhir/tests/data/json/R4/nutritionorder-example-infantenteral.json diff --git a/crates/fhir/tests/data/R4/nutritionorder-example-proteinsupplement.json b/crates/fhir/tests/data/json/R4/nutritionorder-example-proteinsupplement.json similarity index 100% rename from crates/fhir/tests/data/R4/nutritionorder-example-proteinsupplement.json rename to crates/fhir/tests/data/json/R4/nutritionorder-example-proteinsupplement.json diff --git a/crates/fhir/tests/data/R4/nutritionorder-example-pureeddiet-simple.json b/crates/fhir/tests/data/json/R4/nutritionorder-example-pureeddiet-simple.json similarity index 100% rename from crates/fhir/tests/data/R4/nutritionorder-example-pureeddiet-simple.json rename to crates/fhir/tests/data/json/R4/nutritionorder-example-pureeddiet-simple.json diff --git a/crates/fhir/tests/data/R4/nutritionorder-example-pureeddiet.json b/crates/fhir/tests/data/json/R4/nutritionorder-example-pureeddiet.json similarity index 100% rename from crates/fhir/tests/data/R4/nutritionorder-example-pureeddiet.json rename to crates/fhir/tests/data/json/R4/nutritionorder-example-pureeddiet.json diff --git a/crates/fhir/tests/data/R4/nutritionorder-example-renaldiet.json b/crates/fhir/tests/data/json/R4/nutritionorder-example-renaldiet.json similarity index 100% rename from crates/fhir/tests/data/R4/nutritionorder-example-renaldiet.json rename to crates/fhir/tests/data/json/R4/nutritionorder-example-renaldiet.json diff --git a/crates/fhir/tests/data/R4/nutritionorder-example-texture-modified.json b/crates/fhir/tests/data/json/R4/nutritionorder-example-texture-modified.json similarity index 100% rename from crates/fhir/tests/data/R4/nutritionorder-example-texture-modified.json rename to crates/fhir/tests/data/json/R4/nutritionorder-example-texture-modified.json diff --git a/crates/fhir/tests/data/R4/nutritionorder-questionnaire.json b/crates/fhir/tests/data/json/R4/nutritionorder-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/nutritionorder-questionnaire.json rename to crates/fhir/tests/data/json/R4/nutritionorder-questionnaire.json diff --git a/crates/fhir/tests/data/R4/nutritionorder.profile.json b/crates/fhir/tests/data/json/R4/nutritionorder.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/nutritionorder.profile.json rename to crates/fhir/tests/data/json/R4/nutritionorder.profile.json diff --git a/crates/fhir/tests/data/R4/observation-decimal.json b/crates/fhir/tests/data/json/R4/observation-decimal.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-decimal.json rename to crates/fhir/tests/data/json/R4/observation-decimal.json diff --git a/crates/fhir/tests/data/R4/observation-example-10minute-apgar-score.json b/crates/fhir/tests/data/json/R4/observation-example-10minute-apgar-score.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-10minute-apgar-score.json rename to crates/fhir/tests/data/json/R4/observation-example-10minute-apgar-score.json diff --git a/crates/fhir/tests/data/R4/observation-example-1minute-apgar-score.json b/crates/fhir/tests/data/json/R4/observation-example-1minute-apgar-score.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-1minute-apgar-score.json rename to crates/fhir/tests/data/json/R4/observation-example-1minute-apgar-score.json diff --git a/crates/fhir/tests/data/R4/observation-example-20minute-apgar-score.json b/crates/fhir/tests/data/json/R4/observation-example-20minute-apgar-score.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-20minute-apgar-score.json rename to crates/fhir/tests/data/json/R4/observation-example-20minute-apgar-score.json diff --git a/crates/fhir/tests/data/R4/observation-example-2minute-apgar-score.json b/crates/fhir/tests/data/json/R4/observation-example-2minute-apgar-score.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-2minute-apgar-score.json rename to crates/fhir/tests/data/json/R4/observation-example-2minute-apgar-score.json diff --git a/crates/fhir/tests/data/R4/observation-example-5minute-apgar-score.json b/crates/fhir/tests/data/json/R4/observation-example-5minute-apgar-score.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-5minute-apgar-score.json rename to crates/fhir/tests/data/json/R4/observation-example-5minute-apgar-score.json diff --git a/crates/fhir/tests/data/R4/observation-example-TPMT-diplotype.json b/crates/fhir/tests/data/json/R4/observation-example-TPMT-diplotype.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-TPMT-diplotype.json rename to crates/fhir/tests/data/json/R4/observation-example-TPMT-diplotype.json diff --git a/crates/fhir/tests/data/R4/observation-example-TPMT-haplotype-one.json b/crates/fhir/tests/data/json/R4/observation-example-TPMT-haplotype-one.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-TPMT-haplotype-one.json rename to crates/fhir/tests/data/json/R4/observation-example-TPMT-haplotype-one.json diff --git a/crates/fhir/tests/data/R4/observation-example-TPMT-haplotype-two.json b/crates/fhir/tests/data/json/R4/observation-example-TPMT-haplotype-two.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-TPMT-haplotype-two.json rename to crates/fhir/tests/data/json/R4/observation-example-TPMT-haplotype-two.json diff --git a/crates/fhir/tests/data/R4/observation-example-abdo-tender.json b/crates/fhir/tests/data/json/R4/observation-example-abdo-tender.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-abdo-tender.json rename to crates/fhir/tests/data/json/R4/observation-example-abdo-tender.json diff --git a/crates/fhir/tests/data/R4/observation-example-alcohol-type.json b/crates/fhir/tests/data/json/R4/observation-example-alcohol-type.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-alcohol-type.json rename to crates/fhir/tests/data/json/R4/observation-example-alcohol-type.json diff --git a/crates/fhir/tests/data/R4/observation-example-bgpanel.json b/crates/fhir/tests/data/json/R4/observation-example-bgpanel.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-bgpanel.json rename to crates/fhir/tests/data/json/R4/observation-example-bgpanel.json diff --git a/crates/fhir/tests/data/R4/observation-example-bloodgroup.json b/crates/fhir/tests/data/json/R4/observation-example-bloodgroup.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-bloodgroup.json rename to crates/fhir/tests/data/json/R4/observation-example-bloodgroup.json diff --git a/crates/fhir/tests/data/R4/observation-example-bloodpressure-cancel.json b/crates/fhir/tests/data/json/R4/observation-example-bloodpressure-cancel.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-bloodpressure-cancel.json rename to crates/fhir/tests/data/json/R4/observation-example-bloodpressure-cancel.json diff --git a/crates/fhir/tests/data/R4/observation-example-bloodpressure-dar.json b/crates/fhir/tests/data/json/R4/observation-example-bloodpressure-dar.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-bloodpressure-dar.json rename to crates/fhir/tests/data/json/R4/observation-example-bloodpressure-dar.json diff --git a/crates/fhir/tests/data/R4/observation-example-bloodpressure.json b/crates/fhir/tests/data/json/R4/observation-example-bloodpressure.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-bloodpressure.json rename to crates/fhir/tests/data/json/R4/observation-example-bloodpressure.json diff --git a/crates/fhir/tests/data/R4/observation-example-bmd.json b/crates/fhir/tests/data/json/R4/observation-example-bmd.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-bmd.json rename to crates/fhir/tests/data/json/R4/observation-example-bmd.json diff --git a/crates/fhir/tests/data/R4/observation-example-bmi-using-related.json b/crates/fhir/tests/data/json/R4/observation-example-bmi-using-related.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-bmi-using-related.json rename to crates/fhir/tests/data/json/R4/observation-example-bmi-using-related.json diff --git a/crates/fhir/tests/data/R4/observation-example-bmi.json b/crates/fhir/tests/data/json/R4/observation-example-bmi.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-bmi.json rename to crates/fhir/tests/data/json/R4/observation-example-bmi.json diff --git a/crates/fhir/tests/data/R4/observation-example-body-height.json b/crates/fhir/tests/data/json/R4/observation-example-body-height.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-body-height.json rename to crates/fhir/tests/data/json/R4/observation-example-body-height.json diff --git a/crates/fhir/tests/data/R4/observation-example-body-length.json b/crates/fhir/tests/data/json/R4/observation-example-body-length.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-body-length.json rename to crates/fhir/tests/data/json/R4/observation-example-body-length.json diff --git a/crates/fhir/tests/data/R4/observation-example-body-temperature.json b/crates/fhir/tests/data/json/R4/observation-example-body-temperature.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-body-temperature.json rename to crates/fhir/tests/data/json/R4/observation-example-body-temperature.json diff --git a/crates/fhir/tests/data/R4/observation-example-clinical-gender.json b/crates/fhir/tests/data/json/R4/observation-example-clinical-gender.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-clinical-gender.json rename to crates/fhir/tests/data/json/R4/observation-example-clinical-gender.json diff --git a/crates/fhir/tests/data/R4/observation-example-date-lastmp.json b/crates/fhir/tests/data/json/R4/observation-example-date-lastmp.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-date-lastmp.json rename to crates/fhir/tests/data/json/R4/observation-example-date-lastmp.json diff --git a/crates/fhir/tests/data/R4/observation-example-diplotype1.json b/crates/fhir/tests/data/json/R4/observation-example-diplotype1.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-diplotype1.json rename to crates/fhir/tests/data/json/R4/observation-example-diplotype1.json diff --git a/crates/fhir/tests/data/R4/observation-example-eye-color.json b/crates/fhir/tests/data/json/R4/observation-example-eye-color.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-eye-color.json rename to crates/fhir/tests/data/json/R4/observation-example-eye-color.json diff --git a/crates/fhir/tests/data/R4/observation-example-f001-glucose.json b/crates/fhir/tests/data/json/R4/observation-example-f001-glucose.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-f001-glucose.json rename to crates/fhir/tests/data/json/R4/observation-example-f001-glucose.json diff --git a/crates/fhir/tests/data/R4/observation-example-f002-excess.json b/crates/fhir/tests/data/json/R4/observation-example-f002-excess.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-f002-excess.json rename to crates/fhir/tests/data/json/R4/observation-example-f002-excess.json diff --git a/crates/fhir/tests/data/R4/observation-example-f003-co2.json b/crates/fhir/tests/data/json/R4/observation-example-f003-co2.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-f003-co2.json rename to crates/fhir/tests/data/json/R4/observation-example-f003-co2.json diff --git a/crates/fhir/tests/data/R4/observation-example-f004-erythrocyte.json b/crates/fhir/tests/data/json/R4/observation-example-f004-erythrocyte.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-f004-erythrocyte.json rename to crates/fhir/tests/data/json/R4/observation-example-f004-erythrocyte.json diff --git a/crates/fhir/tests/data/R4/observation-example-f005-hemoglobin.json b/crates/fhir/tests/data/json/R4/observation-example-f005-hemoglobin.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-f005-hemoglobin.json rename to crates/fhir/tests/data/json/R4/observation-example-f005-hemoglobin.json diff --git a/crates/fhir/tests/data/R4/observation-example-f202-temperature.json b/crates/fhir/tests/data/json/R4/observation-example-f202-temperature.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-f202-temperature.json rename to crates/fhir/tests/data/json/R4/observation-example-f202-temperature.json diff --git a/crates/fhir/tests/data/R4/observation-example-f203-bicarbonate.json b/crates/fhir/tests/data/json/R4/observation-example-f203-bicarbonate.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-f203-bicarbonate.json rename to crates/fhir/tests/data/json/R4/observation-example-f203-bicarbonate.json diff --git a/crates/fhir/tests/data/R4/observation-example-f204-creatinine.json b/crates/fhir/tests/data/json/R4/observation-example-f204-creatinine.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-f204-creatinine.json rename to crates/fhir/tests/data/json/R4/observation-example-f204-creatinine.json diff --git a/crates/fhir/tests/data/R4/observation-example-f205-egfr.json b/crates/fhir/tests/data/json/R4/observation-example-f205-egfr.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-f205-egfr.json rename to crates/fhir/tests/data/json/R4/observation-example-f205-egfr.json diff --git a/crates/fhir/tests/data/R4/observation-example-f206-staphylococcus.json b/crates/fhir/tests/data/json/R4/observation-example-f206-staphylococcus.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-f206-staphylococcus.json rename to crates/fhir/tests/data/json/R4/observation-example-f206-staphylococcus.json diff --git a/crates/fhir/tests/data/R4/observation-example-genetics-1.json b/crates/fhir/tests/data/json/R4/observation-example-genetics-1.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-genetics-1.json rename to crates/fhir/tests/data/json/R4/observation-example-genetics-1.json diff --git a/crates/fhir/tests/data/R4/observation-example-genetics-2.json b/crates/fhir/tests/data/json/R4/observation-example-genetics-2.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-genetics-2.json rename to crates/fhir/tests/data/json/R4/observation-example-genetics-2.json diff --git a/crates/fhir/tests/data/R4/observation-example-genetics-3.json b/crates/fhir/tests/data/json/R4/observation-example-genetics-3.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-genetics-3.json rename to crates/fhir/tests/data/json/R4/observation-example-genetics-3.json diff --git a/crates/fhir/tests/data/R4/observation-example-genetics-4.json b/crates/fhir/tests/data/json/R4/observation-example-genetics-4.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-genetics-4.json rename to crates/fhir/tests/data/json/R4/observation-example-genetics-4.json diff --git a/crates/fhir/tests/data/R4/observation-example-genetics-5.json b/crates/fhir/tests/data/json/R4/observation-example-genetics-5.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-genetics-5.json rename to crates/fhir/tests/data/json/R4/observation-example-genetics-5.json diff --git a/crates/fhir/tests/data/R4/observation-example-genetics-brcapat.json b/crates/fhir/tests/data/json/R4/observation-example-genetics-brcapat.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-genetics-brcapat.json rename to crates/fhir/tests/data/json/R4/observation-example-genetics-brcapat.json diff --git a/crates/fhir/tests/data/R4/observation-example-glasgow-qa.json b/crates/fhir/tests/data/json/R4/observation-example-glasgow-qa.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-glasgow-qa.json rename to crates/fhir/tests/data/json/R4/observation-example-glasgow-qa.json diff --git a/crates/fhir/tests/data/R4/observation-example-glasgow.json b/crates/fhir/tests/data/json/R4/observation-example-glasgow.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-glasgow.json rename to crates/fhir/tests/data/json/R4/observation-example-glasgow.json diff --git a/crates/fhir/tests/data/R4/observation-example-haplotype1.json b/crates/fhir/tests/data/json/R4/observation-example-haplotype1.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-haplotype1.json rename to crates/fhir/tests/data/json/R4/observation-example-haplotype1.json diff --git a/crates/fhir/tests/data/R4/observation-example-haplotype2.json b/crates/fhir/tests/data/json/R4/observation-example-haplotype2.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-haplotype2.json rename to crates/fhir/tests/data/json/R4/observation-example-haplotype2.json diff --git a/crates/fhir/tests/data/R4/observation-example-head-circumference.json b/crates/fhir/tests/data/json/R4/observation-example-head-circumference.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-head-circumference.json rename to crates/fhir/tests/data/json/R4/observation-example-head-circumference.json diff --git a/crates/fhir/tests/data/R4/observation-example-heart-rate.json b/crates/fhir/tests/data/json/R4/observation-example-heart-rate.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-heart-rate.json rename to crates/fhir/tests/data/json/R4/observation-example-heart-rate.json diff --git a/crates/fhir/tests/data/R4/observation-example-herd1.json b/crates/fhir/tests/data/json/R4/observation-example-herd1.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-herd1.json rename to crates/fhir/tests/data/json/R4/observation-example-herd1.json diff --git a/crates/fhir/tests/data/R4/observation-example-map-sitting.json b/crates/fhir/tests/data/json/R4/observation-example-map-sitting.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-map-sitting.json rename to crates/fhir/tests/data/json/R4/observation-example-map-sitting.json diff --git a/crates/fhir/tests/data/R4/observation-example-mbp.json b/crates/fhir/tests/data/json/R4/observation-example-mbp.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-mbp.json rename to crates/fhir/tests/data/json/R4/observation-example-mbp.json diff --git a/crates/fhir/tests/data/R4/observation-example-phenotype.json b/crates/fhir/tests/data/json/R4/observation-example-phenotype.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-phenotype.json rename to crates/fhir/tests/data/json/R4/observation-example-phenotype.json diff --git a/crates/fhir/tests/data/R4/observation-example-respiratory-rate.json b/crates/fhir/tests/data/json/R4/observation-example-respiratory-rate.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-respiratory-rate.json rename to crates/fhir/tests/data/json/R4/observation-example-respiratory-rate.json diff --git a/crates/fhir/tests/data/R4/observation-example-rhstatus.json b/crates/fhir/tests/data/json/R4/observation-example-rhstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-rhstatus.json rename to crates/fhir/tests/data/json/R4/observation-example-rhstatus.json diff --git a/crates/fhir/tests/data/R4/observation-example-sample-data.json b/crates/fhir/tests/data/json/R4/observation-example-sample-data.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-sample-data.json rename to crates/fhir/tests/data/json/R4/observation-example-sample-data.json diff --git a/crates/fhir/tests/data/R4/observation-example-satO2.json b/crates/fhir/tests/data/json/R4/observation-example-satO2.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-satO2.json rename to crates/fhir/tests/data/json/R4/observation-example-satO2.json diff --git a/crates/fhir/tests/data/R4/observation-example-secondsmoke.json b/crates/fhir/tests/data/json/R4/observation-example-secondsmoke.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-secondsmoke.json rename to crates/fhir/tests/data/json/R4/observation-example-secondsmoke.json diff --git a/crates/fhir/tests/data/R4/observation-example-spirometry.json b/crates/fhir/tests/data/json/R4/observation-example-spirometry.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-spirometry.json rename to crates/fhir/tests/data/json/R4/observation-example-spirometry.json diff --git a/crates/fhir/tests/data/R4/observation-example-trachcare.json b/crates/fhir/tests/data/json/R4/observation-example-trachcare.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-trachcare.json rename to crates/fhir/tests/data/json/R4/observation-example-trachcare.json diff --git a/crates/fhir/tests/data/R4/observation-example-unsat.json b/crates/fhir/tests/data/json/R4/observation-example-unsat.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-unsat.json rename to crates/fhir/tests/data/json/R4/observation-example-unsat.json diff --git a/crates/fhir/tests/data/R4/observation-example-vitals-panel.json b/crates/fhir/tests/data/json/R4/observation-example-vitals-panel.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-vitals-panel.json rename to crates/fhir/tests/data/json/R4/observation-example-vitals-panel.json diff --git a/crates/fhir/tests/data/R4/observation-example-vomiting.json b/crates/fhir/tests/data/json/R4/observation-example-vomiting.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-vomiting.json rename to crates/fhir/tests/data/json/R4/observation-example-vomiting.json diff --git a/crates/fhir/tests/data/R4/observation-example-vp-oyster.json b/crates/fhir/tests/data/json/R4/observation-example-vp-oyster.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example-vp-oyster.json rename to crates/fhir/tests/data/json/R4/observation-example-vp-oyster.json diff --git a/crates/fhir/tests/data/R4/observation-example.json b/crates/fhir/tests/data/json/R4/observation-example.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-example.json rename to crates/fhir/tests/data/json/R4/observation-example.json diff --git a/crates/fhir/tests/data/R4/observation-genetic-Observation-amino-acid-change.json b/crates/fhir/tests/data/json/R4/observation-genetic-Observation-amino-acid-change.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-genetic-Observation-amino-acid-change.json rename to crates/fhir/tests/data/json/R4/observation-genetic-Observation-amino-acid-change.json diff --git a/crates/fhir/tests/data/R4/observation-genetic-Observation-dna-variant.json b/crates/fhir/tests/data/json/R4/observation-genetic-Observation-dna-variant.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-genetic-Observation-dna-variant.json rename to crates/fhir/tests/data/json/R4/observation-genetic-Observation-dna-variant.json diff --git a/crates/fhir/tests/data/R4/observation-genetic-Observation-gene-amino-acid-change.json b/crates/fhir/tests/data/json/R4/observation-genetic-Observation-gene-amino-acid-change.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-genetic-Observation-gene-amino-acid-change.json rename to crates/fhir/tests/data/json/R4/observation-genetic-Observation-gene-amino-acid-change.json diff --git a/crates/fhir/tests/data/R4/observation-genetic-Observation-gene-dnavariant.json b/crates/fhir/tests/data/json/R4/observation-genetic-Observation-gene-dnavariant.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-genetic-Observation-gene-dnavariant.json rename to crates/fhir/tests/data/json/R4/observation-genetic-Observation-gene-dnavariant.json diff --git a/crates/fhir/tests/data/R4/observation-genetic-Observation-gene-identifier.json b/crates/fhir/tests/data/json/R4/observation-genetic-Observation-gene-identifier.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-genetic-Observation-gene-identifier.json rename to crates/fhir/tests/data/json/R4/observation-genetic-Observation-gene-identifier.json diff --git a/crates/fhir/tests/data/R4/observation-genetics-questionnaire.json b/crates/fhir/tests/data/json/R4/observation-genetics-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-genetics-questionnaire.json rename to crates/fhir/tests/data/json/R4/observation-genetics-questionnaire.json diff --git a/crates/fhir/tests/data/R4/observation-genetics.profile.json b/crates/fhir/tests/data/json/R4/observation-genetics.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-genetics.profile.json rename to crates/fhir/tests/data/json/R4/observation-genetics.profile.json diff --git a/crates/fhir/tests/data/R4/observation-questionnaire.json b/crates/fhir/tests/data/json/R4/observation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/observation-questionnaire.json rename to crates/fhir/tests/data/json/R4/observation-questionnaire.json diff --git a/crates/fhir/tests/data/R4/observation.profile.json b/crates/fhir/tests/data/json/R4/observation.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/observation.profile.json rename to crates/fhir/tests/data/json/R4/observation.profile.json diff --git a/crates/fhir/tests/data/R4/observationdefinition-example.json b/crates/fhir/tests/data/json/R4/observationdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4/observationdefinition-example.json rename to crates/fhir/tests/data/json/R4/observationdefinition-example.json diff --git a/crates/fhir/tests/data/R4/observationdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/observationdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/observationdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/observationdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/observationdefinition.profile.json b/crates/fhir/tests/data/json/R4/observationdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/observationdefinition.profile.json rename to crates/fhir/tests/data/json/R4/observationdefinition.profile.json diff --git a/crates/fhir/tests/data/R4/oid.profile.json b/crates/fhir/tests/data/json/R4/oid.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/oid.profile.json rename to crates/fhir/tests/data/json/R4/oid.profile.json diff --git a/crates/fhir/tests/data/R4/operation-activitydefinition-apply.json b/crates/fhir/tests/data/json/R4/operation-activitydefinition-apply.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-activitydefinition-apply.json rename to crates/fhir/tests/data/json/R4/operation-activitydefinition-apply.json diff --git a/crates/fhir/tests/data/R4/operation-activitydefinition-data-requirements.json b/crates/fhir/tests/data/json/R4/operation-activitydefinition-data-requirements.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-activitydefinition-data-requirements.json rename to crates/fhir/tests/data/json/R4/operation-activitydefinition-data-requirements.json diff --git a/crates/fhir/tests/data/R4/operation-capabilitystatement-conforms.json b/crates/fhir/tests/data/json/R4/operation-capabilitystatement-conforms.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-capabilitystatement-conforms.json rename to crates/fhir/tests/data/json/R4/operation-capabilitystatement-conforms.json diff --git a/crates/fhir/tests/data/R4/operation-capabilitystatement-implements.json b/crates/fhir/tests/data/json/R4/operation-capabilitystatement-implements.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-capabilitystatement-implements.json rename to crates/fhir/tests/data/json/R4/operation-capabilitystatement-implements.json diff --git a/crates/fhir/tests/data/R4/operation-capabilitystatement-subset.json b/crates/fhir/tests/data/json/R4/operation-capabilitystatement-subset.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-capabilitystatement-subset.json rename to crates/fhir/tests/data/json/R4/operation-capabilitystatement-subset.json diff --git a/crates/fhir/tests/data/R4/operation-capabilitystatement-versions.json b/crates/fhir/tests/data/json/R4/operation-capabilitystatement-versions.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-capabilitystatement-versions.json rename to crates/fhir/tests/data/json/R4/operation-capabilitystatement-versions.json diff --git a/crates/fhir/tests/data/R4/operation-chargeitemdefinition-apply.json b/crates/fhir/tests/data/json/R4/operation-chargeitemdefinition-apply.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-chargeitemdefinition-apply.json rename to crates/fhir/tests/data/json/R4/operation-chargeitemdefinition-apply.json diff --git a/crates/fhir/tests/data/R4/operation-claim-submit.json b/crates/fhir/tests/data/json/R4/operation-claim-submit.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-claim-submit.json rename to crates/fhir/tests/data/json/R4/operation-claim-submit.json diff --git a/crates/fhir/tests/data/R4/operation-codesystem-find-matches.json b/crates/fhir/tests/data/json/R4/operation-codesystem-find-matches.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-codesystem-find-matches.json rename to crates/fhir/tests/data/json/R4/operation-codesystem-find-matches.json diff --git a/crates/fhir/tests/data/R4/operation-codesystem-lookup.json b/crates/fhir/tests/data/json/R4/operation-codesystem-lookup.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-codesystem-lookup.json rename to crates/fhir/tests/data/json/R4/operation-codesystem-lookup.json diff --git a/crates/fhir/tests/data/R4/operation-codesystem-subsumes.json b/crates/fhir/tests/data/json/R4/operation-codesystem-subsumes.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-codesystem-subsumes.json rename to crates/fhir/tests/data/json/R4/operation-codesystem-subsumes.json diff --git a/crates/fhir/tests/data/R4/operation-codesystem-validate-code.json b/crates/fhir/tests/data/json/R4/operation-codesystem-validate-code.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-codesystem-validate-code.json rename to crates/fhir/tests/data/json/R4/operation-codesystem-validate-code.json diff --git a/crates/fhir/tests/data/R4/operation-composition-document.json b/crates/fhir/tests/data/json/R4/operation-composition-document.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-composition-document.json rename to crates/fhir/tests/data/json/R4/operation-composition-document.json diff --git a/crates/fhir/tests/data/R4/operation-conceptmap-closure.json b/crates/fhir/tests/data/json/R4/operation-conceptmap-closure.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-conceptmap-closure.json rename to crates/fhir/tests/data/json/R4/operation-conceptmap-closure.json diff --git a/crates/fhir/tests/data/R4/operation-conceptmap-translate.json b/crates/fhir/tests/data/json/R4/operation-conceptmap-translate.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-conceptmap-translate.json rename to crates/fhir/tests/data/json/R4/operation-conceptmap-translate.json diff --git a/crates/fhir/tests/data/R4/operation-coverageeligibilityrequest-submit.json b/crates/fhir/tests/data/json/R4/operation-coverageeligibilityrequest-submit.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-coverageeligibilityrequest-submit.json rename to crates/fhir/tests/data/json/R4/operation-coverageeligibilityrequest-submit.json diff --git a/crates/fhir/tests/data/R4/operation-encounter-everything.json b/crates/fhir/tests/data/json/R4/operation-encounter-everything.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-encounter-everything.json rename to crates/fhir/tests/data/json/R4/operation-encounter-everything.json diff --git a/crates/fhir/tests/data/R4/operation-group-everything.json b/crates/fhir/tests/data/json/R4/operation-group-everything.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-group-everything.json rename to crates/fhir/tests/data/json/R4/operation-group-everything.json diff --git a/crates/fhir/tests/data/R4/operation-library-data-requirements.json b/crates/fhir/tests/data/json/R4/operation-library-data-requirements.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-library-data-requirements.json rename to crates/fhir/tests/data/json/R4/operation-library-data-requirements.json diff --git a/crates/fhir/tests/data/R4/operation-list-find.json b/crates/fhir/tests/data/json/R4/operation-list-find.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-list-find.json rename to crates/fhir/tests/data/json/R4/operation-list-find.json diff --git a/crates/fhir/tests/data/R4/operation-measure-care-gaps.json b/crates/fhir/tests/data/json/R4/operation-measure-care-gaps.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-measure-care-gaps.json rename to crates/fhir/tests/data/json/R4/operation-measure-care-gaps.json diff --git a/crates/fhir/tests/data/R4/operation-measure-collect-data.json b/crates/fhir/tests/data/json/R4/operation-measure-collect-data.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-measure-collect-data.json rename to crates/fhir/tests/data/json/R4/operation-measure-collect-data.json diff --git a/crates/fhir/tests/data/R4/operation-measure-data-requirements.json b/crates/fhir/tests/data/json/R4/operation-measure-data-requirements.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-measure-data-requirements.json rename to crates/fhir/tests/data/json/R4/operation-measure-data-requirements.json diff --git a/crates/fhir/tests/data/R4/operation-measure-evaluate-measure.json b/crates/fhir/tests/data/json/R4/operation-measure-evaluate-measure.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-measure-evaluate-measure.json rename to crates/fhir/tests/data/json/R4/operation-measure-evaluate-measure.json diff --git a/crates/fhir/tests/data/R4/operation-measure-submit-data.json b/crates/fhir/tests/data/json/R4/operation-measure-submit-data.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-measure-submit-data.json rename to crates/fhir/tests/data/json/R4/operation-measure-submit-data.json diff --git a/crates/fhir/tests/data/R4/operation-medicinalproduct-everything.json b/crates/fhir/tests/data/json/R4/operation-medicinalproduct-everything.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-medicinalproduct-everything.json rename to crates/fhir/tests/data/json/R4/operation-medicinalproduct-everything.json diff --git a/crates/fhir/tests/data/R4/operation-messageheader-process-message.json b/crates/fhir/tests/data/json/R4/operation-messageheader-process-message.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-messageheader-process-message.json rename to crates/fhir/tests/data/json/R4/operation-messageheader-process-message.json diff --git a/crates/fhir/tests/data/R4/operation-namingsystem-preferred-id.json b/crates/fhir/tests/data/json/R4/operation-namingsystem-preferred-id.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-namingsystem-preferred-id.json rename to crates/fhir/tests/data/json/R4/operation-namingsystem-preferred-id.json diff --git a/crates/fhir/tests/data/R4/operation-observation-lastn.json b/crates/fhir/tests/data/json/R4/operation-observation-lastn.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-observation-lastn.json rename to crates/fhir/tests/data/json/R4/operation-observation-lastn.json diff --git a/crates/fhir/tests/data/R4/operation-observation-stats.json b/crates/fhir/tests/data/json/R4/operation-observation-stats.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-observation-stats.json rename to crates/fhir/tests/data/json/R4/operation-observation-stats.json diff --git a/crates/fhir/tests/data/R4/operation-patient-everything.json b/crates/fhir/tests/data/json/R4/operation-patient-everything.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-patient-everything.json rename to crates/fhir/tests/data/json/R4/operation-patient-everything.json diff --git a/crates/fhir/tests/data/R4/operation-patient-match.json b/crates/fhir/tests/data/json/R4/operation-patient-match.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-patient-match.json rename to crates/fhir/tests/data/json/R4/operation-patient-match.json diff --git a/crates/fhir/tests/data/R4/operation-plandefinition-apply.json b/crates/fhir/tests/data/json/R4/operation-plandefinition-apply.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-plandefinition-apply.json rename to crates/fhir/tests/data/json/R4/operation-plandefinition-apply.json diff --git a/crates/fhir/tests/data/R4/operation-plandefinition-data-requirements.json b/crates/fhir/tests/data/json/R4/operation-plandefinition-data-requirements.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-plandefinition-data-requirements.json rename to crates/fhir/tests/data/json/R4/operation-plandefinition-data-requirements.json diff --git a/crates/fhir/tests/data/R4/operation-resource-convert.json b/crates/fhir/tests/data/json/R4/operation-resource-convert.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-resource-convert.json rename to crates/fhir/tests/data/json/R4/operation-resource-convert.json diff --git a/crates/fhir/tests/data/R4/operation-resource-graph.json b/crates/fhir/tests/data/json/R4/operation-resource-graph.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-resource-graph.json rename to crates/fhir/tests/data/json/R4/operation-resource-graph.json diff --git a/crates/fhir/tests/data/R4/operation-resource-graphql.json b/crates/fhir/tests/data/json/R4/operation-resource-graphql.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-resource-graphql.json rename to crates/fhir/tests/data/json/R4/operation-resource-graphql.json diff --git a/crates/fhir/tests/data/R4/operation-resource-meta-add.json b/crates/fhir/tests/data/json/R4/operation-resource-meta-add.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-resource-meta-add.json rename to crates/fhir/tests/data/json/R4/operation-resource-meta-add.json diff --git a/crates/fhir/tests/data/R4/operation-resource-meta-delete.json b/crates/fhir/tests/data/json/R4/operation-resource-meta-delete.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-resource-meta-delete.json rename to crates/fhir/tests/data/json/R4/operation-resource-meta-delete.json diff --git a/crates/fhir/tests/data/R4/operation-resource-meta.json b/crates/fhir/tests/data/json/R4/operation-resource-meta.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-resource-meta.json rename to crates/fhir/tests/data/json/R4/operation-resource-meta.json diff --git a/crates/fhir/tests/data/R4/operation-resource-validate.json b/crates/fhir/tests/data/json/R4/operation-resource-validate.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-resource-validate.json rename to crates/fhir/tests/data/json/R4/operation-resource-validate.json diff --git a/crates/fhir/tests/data/R4/operation-structuredefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/operation-structuredefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-structuredefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/operation-structuredefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/operation-structuredefinition-snapshot.json b/crates/fhir/tests/data/json/R4/operation-structuredefinition-snapshot.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-structuredefinition-snapshot.json rename to crates/fhir/tests/data/json/R4/operation-structuredefinition-snapshot.json diff --git a/crates/fhir/tests/data/R4/operation-structuremap-transform.json b/crates/fhir/tests/data/json/R4/operation-structuremap-transform.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-structuremap-transform.json rename to crates/fhir/tests/data/json/R4/operation-structuremap-transform.json diff --git a/crates/fhir/tests/data/R4/operation-valueset-expand.json b/crates/fhir/tests/data/json/R4/operation-valueset-expand.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-valueset-expand.json rename to crates/fhir/tests/data/json/R4/operation-valueset-expand.json diff --git a/crates/fhir/tests/data/R4/operation-valueset-validate-code.json b/crates/fhir/tests/data/json/R4/operation-valueset-validate-code.json similarity index 100% rename from crates/fhir/tests/data/R4/operation-valueset-validate-code.json rename to crates/fhir/tests/data/json/R4/operation-valueset-validate-code.json diff --git a/crates/fhir/tests/data/R4/operationdefinition-example.json b/crates/fhir/tests/data/json/R4/operationdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4/operationdefinition-example.json rename to crates/fhir/tests/data/json/R4/operationdefinition-example.json diff --git a/crates/fhir/tests/data/R4/operationdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/operationdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/operationdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/operationdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/operationdefinition.profile.json b/crates/fhir/tests/data/json/R4/operationdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/operationdefinition.profile.json rename to crates/fhir/tests/data/json/R4/operationdefinition.profile.json diff --git a/crates/fhir/tests/data/R4/operationoutcome-example-allok.json b/crates/fhir/tests/data/json/R4/operationoutcome-example-allok.json similarity index 100% rename from crates/fhir/tests/data/R4/operationoutcome-example-allok.json rename to crates/fhir/tests/data/json/R4/operationoutcome-example-allok.json diff --git a/crates/fhir/tests/data/R4/operationoutcome-example-break-the-glass.json b/crates/fhir/tests/data/json/R4/operationoutcome-example-break-the-glass.json similarity index 100% rename from crates/fhir/tests/data/R4/operationoutcome-example-break-the-glass.json rename to crates/fhir/tests/data/json/R4/operationoutcome-example-break-the-glass.json diff --git a/crates/fhir/tests/data/R4/operationoutcome-example-exception.json b/crates/fhir/tests/data/json/R4/operationoutcome-example-exception.json similarity index 100% rename from crates/fhir/tests/data/R4/operationoutcome-example-exception.json rename to crates/fhir/tests/data/json/R4/operationoutcome-example-exception.json diff --git a/crates/fhir/tests/data/R4/operationoutcome-example-searchfail.json b/crates/fhir/tests/data/json/R4/operationoutcome-example-searchfail.json similarity index 100% rename from crates/fhir/tests/data/R4/operationoutcome-example-searchfail.json rename to crates/fhir/tests/data/json/R4/operationoutcome-example-searchfail.json diff --git a/crates/fhir/tests/data/R4/operationoutcome-example-validationfail.json b/crates/fhir/tests/data/json/R4/operationoutcome-example-validationfail.json similarity index 100% rename from crates/fhir/tests/data/R4/operationoutcome-example-validationfail.json rename to crates/fhir/tests/data/json/R4/operationoutcome-example-validationfail.json diff --git a/crates/fhir/tests/data/R4/operationoutcome-example.json b/crates/fhir/tests/data/json/R4/operationoutcome-example.json similarity index 100% rename from crates/fhir/tests/data/R4/operationoutcome-example.json rename to crates/fhir/tests/data/json/R4/operationoutcome-example.json diff --git a/crates/fhir/tests/data/R4/operationoutcome-questionnaire.json b/crates/fhir/tests/data/json/R4/operationoutcome-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/operationoutcome-questionnaire.json rename to crates/fhir/tests/data/json/R4/operationoutcome-questionnaire.json diff --git a/crates/fhir/tests/data/R4/operationoutcome.profile.json b/crates/fhir/tests/data/json/R4/operationoutcome.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/operationoutcome.profile.json rename to crates/fhir/tests/data/json/R4/operationoutcome.profile.json diff --git a/crates/fhir/tests/data/R4/organization-example-f001-burgers.json b/crates/fhir/tests/data/json/R4/organization-example-f001-burgers.json similarity index 100% rename from crates/fhir/tests/data/R4/organization-example-f001-burgers.json rename to crates/fhir/tests/data/json/R4/organization-example-f001-burgers.json diff --git a/crates/fhir/tests/data/R4/organization-example-f002-burgers-card.json b/crates/fhir/tests/data/json/R4/organization-example-f002-burgers-card.json similarity index 100% rename from crates/fhir/tests/data/R4/organization-example-f002-burgers-card.json rename to crates/fhir/tests/data/json/R4/organization-example-f002-burgers-card.json diff --git a/crates/fhir/tests/data/R4/organization-example-f003-burgers-ENT.json b/crates/fhir/tests/data/json/R4/organization-example-f003-burgers-ENT.json similarity index 100% rename from crates/fhir/tests/data/R4/organization-example-f003-burgers-ENT.json rename to crates/fhir/tests/data/json/R4/organization-example-f003-burgers-ENT.json diff --git a/crates/fhir/tests/data/R4/organization-example-f201-aumc.json b/crates/fhir/tests/data/json/R4/organization-example-f201-aumc.json similarity index 100% rename from crates/fhir/tests/data/R4/organization-example-f201-aumc.json rename to crates/fhir/tests/data/json/R4/organization-example-f201-aumc.json diff --git a/crates/fhir/tests/data/R4/organization-example-f203-bumc.json b/crates/fhir/tests/data/json/R4/organization-example-f203-bumc.json similarity index 100% rename from crates/fhir/tests/data/R4/organization-example-f203-bumc.json rename to crates/fhir/tests/data/json/R4/organization-example-f203-bumc.json diff --git a/crates/fhir/tests/data/R4/organization-example-gastro.json b/crates/fhir/tests/data/json/R4/organization-example-gastro.json similarity index 100% rename from crates/fhir/tests/data/R4/organization-example-gastro.json rename to crates/fhir/tests/data/json/R4/organization-example-gastro.json diff --git a/crates/fhir/tests/data/R4/organization-example-good-health-care.json b/crates/fhir/tests/data/json/R4/organization-example-good-health-care.json similarity index 100% rename from crates/fhir/tests/data/R4/organization-example-good-health-care.json rename to crates/fhir/tests/data/json/R4/organization-example-good-health-care.json diff --git a/crates/fhir/tests/data/R4/organization-example-hl7pay.json b/crates/fhir/tests/data/json/R4/organization-example-hl7pay.json similarity index 100% rename from crates/fhir/tests/data/R4/organization-example-hl7pay.json rename to crates/fhir/tests/data/json/R4/organization-example-hl7pay.json diff --git a/crates/fhir/tests/data/R4/organization-example-insurer.json b/crates/fhir/tests/data/json/R4/organization-example-insurer.json similarity index 100% rename from crates/fhir/tests/data/R4/organization-example-insurer.json rename to crates/fhir/tests/data/json/R4/organization-example-insurer.json diff --git a/crates/fhir/tests/data/R4/organization-example-lab.json b/crates/fhir/tests/data/json/R4/organization-example-lab.json similarity index 100% rename from crates/fhir/tests/data/R4/organization-example-lab.json rename to crates/fhir/tests/data/json/R4/organization-example-lab.json diff --git a/crates/fhir/tests/data/R4/organization-example-mihealth.json b/crates/fhir/tests/data/json/R4/organization-example-mihealth.json similarity index 100% rename from crates/fhir/tests/data/R4/organization-example-mihealth.json rename to crates/fhir/tests/data/json/R4/organization-example-mihealth.json diff --git a/crates/fhir/tests/data/R4/organization-example-mmanu.json b/crates/fhir/tests/data/json/R4/organization-example-mmanu.json similarity index 100% rename from crates/fhir/tests/data/R4/organization-example-mmanu.json rename to crates/fhir/tests/data/json/R4/organization-example-mmanu.json diff --git a/crates/fhir/tests/data/R4/organization-example.json b/crates/fhir/tests/data/json/R4/organization-example.json similarity index 100% rename from crates/fhir/tests/data/R4/organization-example.json rename to crates/fhir/tests/data/json/R4/organization-example.json diff --git a/crates/fhir/tests/data/R4/organization-questionnaire.json b/crates/fhir/tests/data/json/R4/organization-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/organization-questionnaire.json rename to crates/fhir/tests/data/json/R4/organization-questionnaire.json diff --git a/crates/fhir/tests/data/R4/organization.profile.json b/crates/fhir/tests/data/json/R4/organization.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/organization.profile.json rename to crates/fhir/tests/data/json/R4/organization.profile.json diff --git a/crates/fhir/tests/data/R4/organizationaffiliation-example.json b/crates/fhir/tests/data/json/R4/organizationaffiliation-example.json similarity index 100% rename from crates/fhir/tests/data/R4/organizationaffiliation-example.json rename to crates/fhir/tests/data/json/R4/organizationaffiliation-example.json diff --git a/crates/fhir/tests/data/R4/organizationaffiliation-questionnaire.json b/crates/fhir/tests/data/json/R4/organizationaffiliation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/organizationaffiliation-questionnaire.json rename to crates/fhir/tests/data/json/R4/organizationaffiliation-questionnaire.json diff --git a/crates/fhir/tests/data/R4/organizationaffiliation.profile.json b/crates/fhir/tests/data/json/R4/organizationaffiliation.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/organizationaffiliation.profile.json rename to crates/fhir/tests/data/json/R4/organizationaffiliation.profile.json diff --git a/crates/fhir/tests/data/R4/orgrole-example-hie.json b/crates/fhir/tests/data/json/R4/orgrole-example-hie.json similarity index 100% rename from crates/fhir/tests/data/R4/orgrole-example-hie.json rename to crates/fhir/tests/data/json/R4/orgrole-example-hie.json diff --git a/crates/fhir/tests/data/R4/orgrole-example-services.json b/crates/fhir/tests/data/json/R4/orgrole-example-services.json similarity index 100% rename from crates/fhir/tests/data/R4/orgrole-example-services.json rename to crates/fhir/tests/data/json/R4/orgrole-example-services.json diff --git a/crates/fhir/tests/data/R4/oxygensat-questionnaire.json b/crates/fhir/tests/data/json/R4/oxygensat-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/oxygensat-questionnaire.json rename to crates/fhir/tests/data/json/R4/oxygensat-questionnaire.json diff --git a/crates/fhir/tests/data/R4/oxygensat.profile.json b/crates/fhir/tests/data/json/R4/oxygensat.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/oxygensat.profile.json rename to crates/fhir/tests/data/json/R4/oxygensat.profile.json diff --git a/crates/fhir/tests/data/R4/package-min-ver.json b/crates/fhir/tests/data/json/R4/package-min-ver.json similarity index 100% rename from crates/fhir/tests/data/R4/package-min-ver.json rename to crates/fhir/tests/data/json/R4/package-min-ver.json diff --git a/crates/fhir/tests/data/R4/parameterdefinition.profile.json b/crates/fhir/tests/data/json/R4/parameterdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/parameterdefinition.profile.json rename to crates/fhir/tests/data/json/R4/parameterdefinition.profile.json diff --git a/crates/fhir/tests/data/R4/parameters-example.json b/crates/fhir/tests/data/json/R4/parameters-example.json similarity index 100% rename from crates/fhir/tests/data/R4/parameters-example.json rename to crates/fhir/tests/data/json/R4/parameters-example.json diff --git a/crates/fhir/tests/data/R4/parameters-questionnaire.json b/crates/fhir/tests/data/json/R4/parameters-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/parameters-questionnaire.json rename to crates/fhir/tests/data/json/R4/parameters-questionnaire.json diff --git a/crates/fhir/tests/data/R4/parameters.profile.json b/crates/fhir/tests/data/json/R4/parameters.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/parameters.profile.json rename to crates/fhir/tests/data/json/R4/parameters.profile.json diff --git a/crates/fhir/tests/data/R4/patient-example-a.json b/crates/fhir/tests/data/json/R4/patient-example-a.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example-a.json rename to crates/fhir/tests/data/json/R4/patient-example-a.json diff --git a/crates/fhir/tests/data/R4/patient-example-animal.json b/crates/fhir/tests/data/json/R4/patient-example-animal.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example-animal.json rename to crates/fhir/tests/data/json/R4/patient-example-animal.json diff --git a/crates/fhir/tests/data/R4/patient-example-b.json b/crates/fhir/tests/data/json/R4/patient-example-b.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example-b.json rename to crates/fhir/tests/data/json/R4/patient-example-b.json diff --git a/crates/fhir/tests/data/R4/patient-example-c.json b/crates/fhir/tests/data/json/R4/patient-example-c.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example-c.json rename to crates/fhir/tests/data/json/R4/patient-example-c.json diff --git a/crates/fhir/tests/data/R4/patient-example-chinese.json b/crates/fhir/tests/data/json/R4/patient-example-chinese.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example-chinese.json rename to crates/fhir/tests/data/json/R4/patient-example-chinese.json diff --git a/crates/fhir/tests/data/R4/patient-example-d.json b/crates/fhir/tests/data/json/R4/patient-example-d.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example-d.json rename to crates/fhir/tests/data/json/R4/patient-example-d.json diff --git a/crates/fhir/tests/data/R4/patient-example-dicom.json b/crates/fhir/tests/data/json/R4/patient-example-dicom.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example-dicom.json rename to crates/fhir/tests/data/json/R4/patient-example-dicom.json diff --git a/crates/fhir/tests/data/R4/patient-example-f001-pieter.json b/crates/fhir/tests/data/json/R4/patient-example-f001-pieter.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example-f001-pieter.json rename to crates/fhir/tests/data/json/R4/patient-example-f001-pieter.json diff --git a/crates/fhir/tests/data/R4/patient-example-f201-roel.json b/crates/fhir/tests/data/json/R4/patient-example-f201-roel.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example-f201-roel.json rename to crates/fhir/tests/data/json/R4/patient-example-f201-roel.json diff --git a/crates/fhir/tests/data/R4/patient-example-ihe-pcd.json b/crates/fhir/tests/data/json/R4/patient-example-ihe-pcd.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example-ihe-pcd.json rename to crates/fhir/tests/data/json/R4/patient-example-ihe-pcd.json diff --git a/crates/fhir/tests/data/R4/patient-example-infant-fetal.json b/crates/fhir/tests/data/json/R4/patient-example-infant-fetal.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example-infant-fetal.json rename to crates/fhir/tests/data/json/R4/patient-example-infant-fetal.json diff --git a/crates/fhir/tests/data/R4/patient-example-infant-mom.json b/crates/fhir/tests/data/json/R4/patient-example-infant-mom.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example-infant-mom.json rename to crates/fhir/tests/data/json/R4/patient-example-infant-mom.json diff --git a/crates/fhir/tests/data/R4/patient-example-infant-twin-1.json b/crates/fhir/tests/data/json/R4/patient-example-infant-twin-1.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example-infant-twin-1.json rename to crates/fhir/tests/data/json/R4/patient-example-infant-twin-1.json diff --git a/crates/fhir/tests/data/R4/patient-example-infant-twin-2.json b/crates/fhir/tests/data/json/R4/patient-example-infant-twin-2.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example-infant-twin-2.json rename to crates/fhir/tests/data/json/R4/patient-example-infant-twin-2.json diff --git a/crates/fhir/tests/data/R4/patient-example-mom.json b/crates/fhir/tests/data/json/R4/patient-example-mom.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example-mom.json rename to crates/fhir/tests/data/json/R4/patient-example-mom.json diff --git a/crates/fhir/tests/data/R4/patient-example-newborn.json b/crates/fhir/tests/data/json/R4/patient-example-newborn.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example-newborn.json rename to crates/fhir/tests/data/json/R4/patient-example-newborn.json diff --git a/crates/fhir/tests/data/R4/patient-example-proband.json b/crates/fhir/tests/data/json/R4/patient-example-proband.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example-proband.json rename to crates/fhir/tests/data/json/R4/patient-example-proband.json diff --git a/crates/fhir/tests/data/R4/patient-example-xcda.json b/crates/fhir/tests/data/json/R4/patient-example-xcda.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example-xcda.json rename to crates/fhir/tests/data/json/R4/patient-example-xcda.json diff --git a/crates/fhir/tests/data/R4/patient-example-xds.json b/crates/fhir/tests/data/json/R4/patient-example-xds.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example-xds.json rename to crates/fhir/tests/data/json/R4/patient-example-xds.json diff --git a/crates/fhir/tests/data/R4/patient-example.json b/crates/fhir/tests/data/json/R4/patient-example.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-example.json rename to crates/fhir/tests/data/json/R4/patient-example.json diff --git a/crates/fhir/tests/data/R4/patient-examples-cypress-template.json b/crates/fhir/tests/data/json/R4/patient-examples-cypress-template.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-examples-cypress-template.json rename to crates/fhir/tests/data/json/R4/patient-examples-cypress-template.json diff --git a/crates/fhir/tests/data/R4/patient-examples-general.json b/crates/fhir/tests/data/json/R4/patient-examples-general.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-examples-general.json rename to crates/fhir/tests/data/json/R4/patient-examples-general.json diff --git a/crates/fhir/tests/data/R4/patient-extensions-Patient-age.json b/crates/fhir/tests/data/json/R4/patient-extensions-Patient-age.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-extensions-Patient-age.json rename to crates/fhir/tests/data/json/R4/patient-extensions-Patient-age.json diff --git a/crates/fhir/tests/data/R4/patient-extensions-Patient-birthOrderBoolean.json b/crates/fhir/tests/data/json/R4/patient-extensions-Patient-birthOrderBoolean.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-extensions-Patient-birthOrderBoolean.json rename to crates/fhir/tests/data/json/R4/patient-extensions-Patient-birthOrderBoolean.json diff --git a/crates/fhir/tests/data/R4/patient-extensions-Patient-mothersMaidenName.json b/crates/fhir/tests/data/json/R4/patient-extensions-Patient-mothersMaidenName.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-extensions-Patient-mothersMaidenName.json rename to crates/fhir/tests/data/json/R4/patient-extensions-Patient-mothersMaidenName.json diff --git a/crates/fhir/tests/data/R4/patient-genetics-example1.json b/crates/fhir/tests/data/json/R4/patient-genetics-example1.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-genetics-example1.json rename to crates/fhir/tests/data/json/R4/patient-genetics-example1.json diff --git a/crates/fhir/tests/data/R4/patient-glossy-example.json b/crates/fhir/tests/data/json/R4/patient-glossy-example.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-glossy-example.json rename to crates/fhir/tests/data/json/R4/patient-glossy-example.json diff --git a/crates/fhir/tests/data/R4/patient-questionnaire.json b/crates/fhir/tests/data/json/R4/patient-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/patient-questionnaire.json rename to crates/fhir/tests/data/json/R4/patient-questionnaire.json diff --git a/crates/fhir/tests/data/R4/patient.profile.json b/crates/fhir/tests/data/json/R4/patient.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/patient.profile.json rename to crates/fhir/tests/data/json/R4/patient.profile.json diff --git a/crates/fhir/tests/data/R4/paymentnotice-example.json b/crates/fhir/tests/data/json/R4/paymentnotice-example.json similarity index 100% rename from crates/fhir/tests/data/R4/paymentnotice-example.json rename to crates/fhir/tests/data/json/R4/paymentnotice-example.json diff --git a/crates/fhir/tests/data/R4/paymentnotice-questionnaire.json b/crates/fhir/tests/data/json/R4/paymentnotice-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/paymentnotice-questionnaire.json rename to crates/fhir/tests/data/json/R4/paymentnotice-questionnaire.json diff --git a/crates/fhir/tests/data/R4/paymentnotice.profile.json b/crates/fhir/tests/data/json/R4/paymentnotice.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/paymentnotice.profile.json rename to crates/fhir/tests/data/json/R4/paymentnotice.profile.json diff --git a/crates/fhir/tests/data/R4/paymentreconciliation-example.json b/crates/fhir/tests/data/json/R4/paymentreconciliation-example.json similarity index 100% rename from crates/fhir/tests/data/R4/paymentreconciliation-example.json rename to crates/fhir/tests/data/json/R4/paymentreconciliation-example.json diff --git a/crates/fhir/tests/data/R4/paymentreconciliation-questionnaire.json b/crates/fhir/tests/data/json/R4/paymentreconciliation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/paymentreconciliation-questionnaire.json rename to crates/fhir/tests/data/json/R4/paymentreconciliation-questionnaire.json diff --git a/crates/fhir/tests/data/R4/paymentreconciliation.profile.json b/crates/fhir/tests/data/json/R4/paymentreconciliation.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/paymentreconciliation.profile.json rename to crates/fhir/tests/data/json/R4/paymentreconciliation.profile.json diff --git a/crates/fhir/tests/data/R4/pcd-example-notAuthor.json b/crates/fhir/tests/data/json/R4/pcd-example-notAuthor.json similarity index 100% rename from crates/fhir/tests/data/R4/pcd-example-notAuthor.json rename to crates/fhir/tests/data/json/R4/pcd-example-notAuthor.json diff --git a/crates/fhir/tests/data/R4/pcd-example-notLabs.json b/crates/fhir/tests/data/json/R4/pcd-example-notLabs.json similarity index 100% rename from crates/fhir/tests/data/R4/pcd-example-notLabs.json rename to crates/fhir/tests/data/json/R4/pcd-example-notLabs.json diff --git a/crates/fhir/tests/data/R4/pcd-example-notOrg.json b/crates/fhir/tests/data/json/R4/pcd-example-notOrg.json similarity index 100% rename from crates/fhir/tests/data/R4/pcd-example-notOrg.json rename to crates/fhir/tests/data/json/R4/pcd-example-notOrg.json diff --git a/crates/fhir/tests/data/R4/pcd-example-notThem.json b/crates/fhir/tests/data/json/R4/pcd-example-notThem.json similarity index 100% rename from crates/fhir/tests/data/R4/pcd-example-notThem.json rename to crates/fhir/tests/data/json/R4/pcd-example-notThem.json diff --git a/crates/fhir/tests/data/R4/pcd-example-notThis.json b/crates/fhir/tests/data/json/R4/pcd-example-notThis.json similarity index 100% rename from crates/fhir/tests/data/R4/pcd-example-notThis.json rename to crates/fhir/tests/data/json/R4/pcd-example-notThis.json diff --git a/crates/fhir/tests/data/R4/period.profile.json b/crates/fhir/tests/data/json/R4/period.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/period.profile.json rename to crates/fhir/tests/data/json/R4/period.profile.json diff --git a/crates/fhir/tests/data/R4/person-example-f002-ariadne.json b/crates/fhir/tests/data/json/R4/person-example-f002-ariadne.json similarity index 100% rename from crates/fhir/tests/data/R4/person-example-f002-ariadne.json rename to crates/fhir/tests/data/json/R4/person-example-f002-ariadne.json diff --git a/crates/fhir/tests/data/R4/person-example.json b/crates/fhir/tests/data/json/R4/person-example.json similarity index 100% rename from crates/fhir/tests/data/R4/person-example.json rename to crates/fhir/tests/data/json/R4/person-example.json diff --git a/crates/fhir/tests/data/R4/person-grahame.json b/crates/fhir/tests/data/json/R4/person-grahame.json similarity index 100% rename from crates/fhir/tests/data/R4/person-grahame.json rename to crates/fhir/tests/data/json/R4/person-grahame.json diff --git a/crates/fhir/tests/data/R4/person-patient-portal.json b/crates/fhir/tests/data/json/R4/person-patient-portal.json similarity index 100% rename from crates/fhir/tests/data/R4/person-patient-portal.json rename to crates/fhir/tests/data/json/R4/person-patient-portal.json diff --git a/crates/fhir/tests/data/R4/person-provider-directory.json b/crates/fhir/tests/data/json/R4/person-provider-directory.json similarity index 100% rename from crates/fhir/tests/data/R4/person-provider-directory.json rename to crates/fhir/tests/data/json/R4/person-provider-directory.json diff --git a/crates/fhir/tests/data/R4/person-questionnaire.json b/crates/fhir/tests/data/json/R4/person-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/person-questionnaire.json rename to crates/fhir/tests/data/json/R4/person-questionnaire.json diff --git a/crates/fhir/tests/data/R4/person.profile.json b/crates/fhir/tests/data/json/R4/person.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/person.profile.json rename to crates/fhir/tests/data/json/R4/person.profile.json diff --git a/crates/fhir/tests/data/R4/picoelement-questionnaire.json b/crates/fhir/tests/data/json/R4/picoelement-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/picoelement-questionnaire.json rename to crates/fhir/tests/data/json/R4/picoelement-questionnaire.json diff --git a/crates/fhir/tests/data/R4/picoelement.profile.json b/crates/fhir/tests/data/json/R4/picoelement.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/picoelement.profile.json rename to crates/fhir/tests/data/json/R4/picoelement.profile.json diff --git a/crates/fhir/tests/data/R4/plandefinition-chlamydia-screening-intervention.json b/crates/fhir/tests/data/json/R4/plandefinition-chlamydia-screening-intervention.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition-chlamydia-screening-intervention.json rename to crates/fhir/tests/data/json/R4/plandefinition-chlamydia-screening-intervention.json diff --git a/crates/fhir/tests/data/R4/plandefinition-example-cardiology-os.json b/crates/fhir/tests/data/json/R4/plandefinition-example-cardiology-os.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition-example-cardiology-os.json rename to crates/fhir/tests/data/json/R4/plandefinition-example-cardiology-os.json diff --git a/crates/fhir/tests/data/R4/plandefinition-example-kdn5-simplified.json b/crates/fhir/tests/data/json/R4/plandefinition-example-kdn5-simplified.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition-example-kdn5-simplified.json rename to crates/fhir/tests/data/json/R4/plandefinition-example-kdn5-simplified.json diff --git a/crates/fhir/tests/data/R4/plandefinition-example.json b/crates/fhir/tests/data/json/R4/plandefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition-example.json rename to crates/fhir/tests/data/json/R4/plandefinition-example.json diff --git a/crates/fhir/tests/data/R4/plandefinition-exclusive-breastfeeding-intervention-01.json b/crates/fhir/tests/data/json/R4/plandefinition-exclusive-breastfeeding-intervention-01.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition-exclusive-breastfeeding-intervention-01.json rename to crates/fhir/tests/data/json/R4/plandefinition-exclusive-breastfeeding-intervention-01.json diff --git a/crates/fhir/tests/data/R4/plandefinition-exclusive-breastfeeding-intervention-02.json b/crates/fhir/tests/data/json/R4/plandefinition-exclusive-breastfeeding-intervention-02.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition-exclusive-breastfeeding-intervention-02.json rename to crates/fhir/tests/data/json/R4/plandefinition-exclusive-breastfeeding-intervention-02.json diff --git a/crates/fhir/tests/data/R4/plandefinition-exclusive-breastfeeding-intervention-03.json b/crates/fhir/tests/data/json/R4/plandefinition-exclusive-breastfeeding-intervention-03.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition-exclusive-breastfeeding-intervention-03.json rename to crates/fhir/tests/data/json/R4/plandefinition-exclusive-breastfeeding-intervention-03.json diff --git a/crates/fhir/tests/data/R4/plandefinition-exclusive-breastfeeding-intervention-04.json b/crates/fhir/tests/data/json/R4/plandefinition-exclusive-breastfeeding-intervention-04.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition-exclusive-breastfeeding-intervention-04.json rename to crates/fhir/tests/data/json/R4/plandefinition-exclusive-breastfeeding-intervention-04.json diff --git a/crates/fhir/tests/data/R4/plandefinition-opioidcds-04.json b/crates/fhir/tests/data/json/R4/plandefinition-opioidcds-04.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition-opioidcds-04.json rename to crates/fhir/tests/data/json/R4/plandefinition-opioidcds-04.json diff --git a/crates/fhir/tests/data/R4/plandefinition-opioidcds-05.json b/crates/fhir/tests/data/json/R4/plandefinition-opioidcds-05.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition-opioidcds-05.json rename to crates/fhir/tests/data/json/R4/plandefinition-opioidcds-05.json diff --git a/crates/fhir/tests/data/R4/plandefinition-opioidcds-07.json b/crates/fhir/tests/data/json/R4/plandefinition-opioidcds-07.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition-opioidcds-07.json rename to crates/fhir/tests/data/json/R4/plandefinition-opioidcds-07.json diff --git a/crates/fhir/tests/data/R4/plandefinition-opioidcds-08.json b/crates/fhir/tests/data/json/R4/plandefinition-opioidcds-08.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition-opioidcds-08.json rename to crates/fhir/tests/data/json/R4/plandefinition-opioidcds-08.json diff --git a/crates/fhir/tests/data/R4/plandefinition-opioidcds-10.json b/crates/fhir/tests/data/json/R4/plandefinition-opioidcds-10.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition-opioidcds-10.json rename to crates/fhir/tests/data/json/R4/plandefinition-opioidcds-10.json diff --git a/crates/fhir/tests/data/R4/plandefinition-opioidcds-11.json b/crates/fhir/tests/data/json/R4/plandefinition-opioidcds-11.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition-opioidcds-11.json rename to crates/fhir/tests/data/json/R4/plandefinition-opioidcds-11.json diff --git a/crates/fhir/tests/data/R4/plandefinition-options-example.json b/crates/fhir/tests/data/json/R4/plandefinition-options-example.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition-options-example.json rename to crates/fhir/tests/data/json/R4/plandefinition-options-example.json diff --git a/crates/fhir/tests/data/R4/plandefinition-predecessor-example.json b/crates/fhir/tests/data/json/R4/plandefinition-predecessor-example.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition-predecessor-example.json rename to crates/fhir/tests/data/json/R4/plandefinition-predecessor-example.json diff --git a/crates/fhir/tests/data/R4/plandefinition-protocol-example.json b/crates/fhir/tests/data/json/R4/plandefinition-protocol-example.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition-protocol-example.json rename to crates/fhir/tests/data/json/R4/plandefinition-protocol-example.json diff --git a/crates/fhir/tests/data/R4/plandefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/plandefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/plandefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/plandefinition-zika-virus-intervention.json b/crates/fhir/tests/data/json/R4/plandefinition-zika-virus-intervention.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition-zika-virus-intervention.json rename to crates/fhir/tests/data/json/R4/plandefinition-zika-virus-intervention.json diff --git a/crates/fhir/tests/data/R4/plandefinition.profile.json b/crates/fhir/tests/data/json/R4/plandefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/plandefinition.profile.json rename to crates/fhir/tests/data/json/R4/plandefinition.profile.json diff --git a/crates/fhir/tests/data/R4/population.profile.json b/crates/fhir/tests/data/json/R4/population.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/population.profile.json rename to crates/fhir/tests/data/json/R4/population.profile.json diff --git a/crates/fhir/tests/data/R4/positiveint.profile.json b/crates/fhir/tests/data/json/R4/positiveint.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/positiveint.profile.json rename to crates/fhir/tests/data/json/R4/positiveint.profile.json diff --git a/crates/fhir/tests/data/R4/practitioner-example-f001-evdb.json b/crates/fhir/tests/data/json/R4/practitioner-example-f001-evdb.json similarity index 100% rename from crates/fhir/tests/data/R4/practitioner-example-f001-evdb.json rename to crates/fhir/tests/data/json/R4/practitioner-example-f001-evdb.json diff --git a/crates/fhir/tests/data/R4/practitioner-example-f002-pv.json b/crates/fhir/tests/data/json/R4/practitioner-example-f002-pv.json similarity index 100% rename from crates/fhir/tests/data/R4/practitioner-example-f002-pv.json rename to crates/fhir/tests/data/json/R4/practitioner-example-f002-pv.json diff --git a/crates/fhir/tests/data/R4/practitioner-example-f003-mv.json b/crates/fhir/tests/data/json/R4/practitioner-example-f003-mv.json similarity index 100% rename from crates/fhir/tests/data/R4/practitioner-example-f003-mv.json rename to crates/fhir/tests/data/json/R4/practitioner-example-f003-mv.json diff --git a/crates/fhir/tests/data/R4/practitioner-example-f004-rb.json b/crates/fhir/tests/data/json/R4/practitioner-example-f004-rb.json similarity index 100% rename from crates/fhir/tests/data/R4/practitioner-example-f004-rb.json rename to crates/fhir/tests/data/json/R4/practitioner-example-f004-rb.json diff --git a/crates/fhir/tests/data/R4/practitioner-example-f005-al.json b/crates/fhir/tests/data/json/R4/practitioner-example-f005-al.json similarity index 100% rename from crates/fhir/tests/data/R4/practitioner-example-f005-al.json rename to crates/fhir/tests/data/json/R4/practitioner-example-f005-al.json diff --git a/crates/fhir/tests/data/R4/practitioner-example-f006-rvdb.json b/crates/fhir/tests/data/json/R4/practitioner-example-f006-rvdb.json similarity index 100% rename from crates/fhir/tests/data/R4/practitioner-example-f006-rvdb.json rename to crates/fhir/tests/data/json/R4/practitioner-example-f006-rvdb.json diff --git a/crates/fhir/tests/data/R4/practitioner-example-f007-sh.json b/crates/fhir/tests/data/json/R4/practitioner-example-f007-sh.json similarity index 100% rename from crates/fhir/tests/data/R4/practitioner-example-f007-sh.json rename to crates/fhir/tests/data/json/R4/practitioner-example-f007-sh.json diff --git a/crates/fhir/tests/data/R4/practitioner-example-f201-ab.json b/crates/fhir/tests/data/json/R4/practitioner-example-f201-ab.json similarity index 100% rename from crates/fhir/tests/data/R4/practitioner-example-f201-ab.json rename to crates/fhir/tests/data/json/R4/practitioner-example-f201-ab.json diff --git a/crates/fhir/tests/data/R4/practitioner-example-f202-lm.json b/crates/fhir/tests/data/json/R4/practitioner-example-f202-lm.json similarity index 100% rename from crates/fhir/tests/data/R4/practitioner-example-f202-lm.json rename to crates/fhir/tests/data/json/R4/practitioner-example-f202-lm.json diff --git a/crates/fhir/tests/data/R4/practitioner-example-f203-jvg.json b/crates/fhir/tests/data/json/R4/practitioner-example-f203-jvg.json similarity index 100% rename from crates/fhir/tests/data/R4/practitioner-example-f203-jvg.json rename to crates/fhir/tests/data/json/R4/practitioner-example-f203-jvg.json diff --git a/crates/fhir/tests/data/R4/practitioner-example-f204-ce.json b/crates/fhir/tests/data/json/R4/practitioner-example-f204-ce.json similarity index 100% rename from crates/fhir/tests/data/R4/practitioner-example-f204-ce.json rename to crates/fhir/tests/data/json/R4/practitioner-example-f204-ce.json diff --git a/crates/fhir/tests/data/R4/practitioner-example-xcda-author.json b/crates/fhir/tests/data/json/R4/practitioner-example-xcda-author.json similarity index 100% rename from crates/fhir/tests/data/R4/practitioner-example-xcda-author.json rename to crates/fhir/tests/data/json/R4/practitioner-example-xcda-author.json diff --git a/crates/fhir/tests/data/R4/practitioner-example-xcda1.json b/crates/fhir/tests/data/json/R4/practitioner-example-xcda1.json similarity index 100% rename from crates/fhir/tests/data/R4/practitioner-example-xcda1.json rename to crates/fhir/tests/data/json/R4/practitioner-example-xcda1.json diff --git a/crates/fhir/tests/data/R4/practitioner-example.json b/crates/fhir/tests/data/json/R4/practitioner-example.json similarity index 100% rename from crates/fhir/tests/data/R4/practitioner-example.json rename to crates/fhir/tests/data/json/R4/practitioner-example.json diff --git a/crates/fhir/tests/data/R4/practitioner-examples-general.json b/crates/fhir/tests/data/json/R4/practitioner-examples-general.json similarity index 100% rename from crates/fhir/tests/data/R4/practitioner-examples-general.json rename to crates/fhir/tests/data/json/R4/practitioner-examples-general.json diff --git a/crates/fhir/tests/data/R4/practitioner-questionnaire.json b/crates/fhir/tests/data/json/R4/practitioner-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/practitioner-questionnaire.json rename to crates/fhir/tests/data/json/R4/practitioner-questionnaire.json diff --git a/crates/fhir/tests/data/R4/practitioner.profile.json b/crates/fhir/tests/data/json/R4/practitioner.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/practitioner.profile.json rename to crates/fhir/tests/data/json/R4/practitioner.profile.json diff --git a/crates/fhir/tests/data/R4/practitionerrole-example.json b/crates/fhir/tests/data/json/R4/practitionerrole-example.json similarity index 100% rename from crates/fhir/tests/data/R4/practitionerrole-example.json rename to crates/fhir/tests/data/json/R4/practitionerrole-example.json diff --git a/crates/fhir/tests/data/R4/practitionerrole-examples-general.json b/crates/fhir/tests/data/json/R4/practitionerrole-examples-general.json similarity index 100% rename from crates/fhir/tests/data/R4/practitionerrole-examples-general.json rename to crates/fhir/tests/data/json/R4/practitionerrole-examples-general.json diff --git a/crates/fhir/tests/data/R4/practitionerrole-questionnaire.json b/crates/fhir/tests/data/json/R4/practitionerrole-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/practitionerrole-questionnaire.json rename to crates/fhir/tests/data/json/R4/practitionerrole-questionnaire.json diff --git a/crates/fhir/tests/data/R4/practitionerrole.profile.json b/crates/fhir/tests/data/json/R4/practitionerrole.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/practitionerrole.profile.json rename to crates/fhir/tests/data/json/R4/practitionerrole.profile.json diff --git a/crates/fhir/tests/data/R4/procedure-example-HCBS.json b/crates/fhir/tests/data/json/R4/procedure-example-HCBS.json similarity index 100% rename from crates/fhir/tests/data/R4/procedure-example-HCBS.json rename to crates/fhir/tests/data/json/R4/procedure-example-HCBS.json diff --git a/crates/fhir/tests/data/R4/procedure-example-ambulation.json b/crates/fhir/tests/data/json/R4/procedure-example-ambulation.json similarity index 100% rename from crates/fhir/tests/data/R4/procedure-example-ambulation.json rename to crates/fhir/tests/data/json/R4/procedure-example-ambulation.json diff --git a/crates/fhir/tests/data/R4/procedure-example-appendectomy-narrative.json b/crates/fhir/tests/data/json/R4/procedure-example-appendectomy-narrative.json similarity index 100% rename from crates/fhir/tests/data/R4/procedure-example-appendectomy-narrative.json rename to crates/fhir/tests/data/json/R4/procedure-example-appendectomy-narrative.json diff --git a/crates/fhir/tests/data/R4/procedure-example-biopsy.json b/crates/fhir/tests/data/json/R4/procedure-example-biopsy.json similarity index 100% rename from crates/fhir/tests/data/R4/procedure-example-biopsy.json rename to crates/fhir/tests/data/json/R4/procedure-example-biopsy.json diff --git a/crates/fhir/tests/data/R4/procedure-example-colon-biopsy.json b/crates/fhir/tests/data/json/R4/procedure-example-colon-biopsy.json similarity index 100% rename from crates/fhir/tests/data/R4/procedure-example-colon-biopsy.json rename to crates/fhir/tests/data/json/R4/procedure-example-colon-biopsy.json diff --git a/crates/fhir/tests/data/R4/procedure-example-colonoscopy.json b/crates/fhir/tests/data/json/R4/procedure-example-colonoscopy.json similarity index 100% rename from crates/fhir/tests/data/R4/procedure-example-colonoscopy.json rename to crates/fhir/tests/data/json/R4/procedure-example-colonoscopy.json diff --git a/crates/fhir/tests/data/R4/procedure-example-education.json b/crates/fhir/tests/data/json/R4/procedure-example-education.json similarity index 100% rename from crates/fhir/tests/data/R4/procedure-example-education.json rename to crates/fhir/tests/data/json/R4/procedure-example-education.json diff --git a/crates/fhir/tests/data/R4/procedure-example-f001-heart.json b/crates/fhir/tests/data/json/R4/procedure-example-f001-heart.json similarity index 100% rename from crates/fhir/tests/data/R4/procedure-example-f001-heart.json rename to crates/fhir/tests/data/json/R4/procedure-example-f001-heart.json diff --git a/crates/fhir/tests/data/R4/procedure-example-f002-lung.json b/crates/fhir/tests/data/json/R4/procedure-example-f002-lung.json similarity index 100% rename from crates/fhir/tests/data/R4/procedure-example-f002-lung.json rename to crates/fhir/tests/data/json/R4/procedure-example-f002-lung.json diff --git a/crates/fhir/tests/data/R4/procedure-example-f003-abscess.json b/crates/fhir/tests/data/json/R4/procedure-example-f003-abscess.json similarity index 100% rename from crates/fhir/tests/data/R4/procedure-example-f003-abscess.json rename to crates/fhir/tests/data/json/R4/procedure-example-f003-abscess.json diff --git a/crates/fhir/tests/data/R4/procedure-example-f004-tracheotomy.json b/crates/fhir/tests/data/json/R4/procedure-example-f004-tracheotomy.json similarity index 100% rename from crates/fhir/tests/data/R4/procedure-example-f004-tracheotomy.json rename to crates/fhir/tests/data/json/R4/procedure-example-f004-tracheotomy.json diff --git a/crates/fhir/tests/data/R4/procedure-example-f201-tpf.json b/crates/fhir/tests/data/json/R4/procedure-example-f201-tpf.json similarity index 100% rename from crates/fhir/tests/data/R4/procedure-example-f201-tpf.json rename to crates/fhir/tests/data/json/R4/procedure-example-f201-tpf.json diff --git a/crates/fhir/tests/data/R4/procedure-example-implant.json b/crates/fhir/tests/data/json/R4/procedure-example-implant.json similarity index 100% rename from crates/fhir/tests/data/R4/procedure-example-implant.json rename to crates/fhir/tests/data/json/R4/procedure-example-implant.json diff --git a/crates/fhir/tests/data/R4/procedure-example-ob.json b/crates/fhir/tests/data/json/R4/procedure-example-ob.json similarity index 100% rename from crates/fhir/tests/data/R4/procedure-example-ob.json rename to crates/fhir/tests/data/json/R4/procedure-example-ob.json diff --git a/crates/fhir/tests/data/R4/procedure-example-physical-therapy.json b/crates/fhir/tests/data/json/R4/procedure-example-physical-therapy.json similarity index 100% rename from crates/fhir/tests/data/R4/procedure-example-physical-therapy.json rename to crates/fhir/tests/data/json/R4/procedure-example-physical-therapy.json diff --git a/crates/fhir/tests/data/R4/procedure-example.json b/crates/fhir/tests/data/json/R4/procedure-example.json similarity index 100% rename from crates/fhir/tests/data/R4/procedure-example.json rename to crates/fhir/tests/data/json/R4/procedure-example.json diff --git a/crates/fhir/tests/data/R4/procedure-questionnaire.json b/crates/fhir/tests/data/json/R4/procedure-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/procedure-questionnaire.json rename to crates/fhir/tests/data/json/R4/procedure-questionnaire.json diff --git a/crates/fhir/tests/data/R4/procedure.profile.json b/crates/fhir/tests/data/json/R4/procedure.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/procedure.profile.json rename to crates/fhir/tests/data/json/R4/procedure.profile.json diff --git a/crates/fhir/tests/data/R4/prodcharacteristic.profile.json b/crates/fhir/tests/data/json/R4/prodcharacteristic.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/prodcharacteristic.profile.json rename to crates/fhir/tests/data/json/R4/prodcharacteristic.profile.json diff --git a/crates/fhir/tests/data/R4/productshelflife.profile.json b/crates/fhir/tests/data/json/R4/productshelflife.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/productshelflife.profile.json rename to crates/fhir/tests/data/json/R4/productshelflife.profile.json diff --git a/crates/fhir/tests/data/R4/profiles-others.json b/crates/fhir/tests/data/json/R4/profiles-others.json similarity index 100% rename from crates/fhir/tests/data/R4/profiles-others.json rename to crates/fhir/tests/data/json/R4/profiles-others.json diff --git a/crates/fhir/tests/data/R4/profiles-resources.json b/crates/fhir/tests/data/json/R4/profiles-resources.json similarity index 100% rename from crates/fhir/tests/data/R4/profiles-resources.json rename to crates/fhir/tests/data/json/R4/profiles-resources.json diff --git a/crates/fhir/tests/data/R4/profiles-types.json b/crates/fhir/tests/data/json/R4/profiles-types.json similarity index 100% rename from crates/fhir/tests/data/R4/profiles-types.json rename to crates/fhir/tests/data/json/R4/profiles-types.json diff --git a/crates/fhir/tests/data/R4/provenance-consent-signature.json b/crates/fhir/tests/data/json/R4/provenance-consent-signature.json similarity index 100% rename from crates/fhir/tests/data/R4/provenance-consent-signature.json rename to crates/fhir/tests/data/json/R4/provenance-consent-signature.json diff --git a/crates/fhir/tests/data/R4/provenance-example-biocompute-object.json b/crates/fhir/tests/data/json/R4/provenance-example-biocompute-object.json similarity index 100% rename from crates/fhir/tests/data/R4/provenance-example-biocompute-object.json rename to crates/fhir/tests/data/json/R4/provenance-example-biocompute-object.json diff --git a/crates/fhir/tests/data/R4/provenance-example-cwl.json b/crates/fhir/tests/data/json/R4/provenance-example-cwl.json similarity index 100% rename from crates/fhir/tests/data/R4/provenance-example-cwl.json rename to crates/fhir/tests/data/json/R4/provenance-example-cwl.json diff --git a/crates/fhir/tests/data/R4/provenance-example-sig.json b/crates/fhir/tests/data/json/R4/provenance-example-sig.json similarity index 100% rename from crates/fhir/tests/data/R4/provenance-example-sig.json rename to crates/fhir/tests/data/json/R4/provenance-example-sig.json diff --git a/crates/fhir/tests/data/R4/provenance-example.json b/crates/fhir/tests/data/json/R4/provenance-example.json similarity index 100% rename from crates/fhir/tests/data/R4/provenance-example.json rename to crates/fhir/tests/data/json/R4/provenance-example.json diff --git a/crates/fhir/tests/data/R4/provenance-questionnaire.json b/crates/fhir/tests/data/json/R4/provenance-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/provenance-questionnaire.json rename to crates/fhir/tests/data/json/R4/provenance-questionnaire.json diff --git a/crates/fhir/tests/data/R4/provenance-relevant-history-questionnaire.json b/crates/fhir/tests/data/json/R4/provenance-relevant-history-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/provenance-relevant-history-questionnaire.json rename to crates/fhir/tests/data/json/R4/provenance-relevant-history-questionnaire.json diff --git a/crates/fhir/tests/data/R4/provenance-relevant-history.profile.json b/crates/fhir/tests/data/json/R4/provenance-relevant-history.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/provenance-relevant-history.profile.json rename to crates/fhir/tests/data/json/R4/provenance-relevant-history.profile.json diff --git a/crates/fhir/tests/data/R4/provenance.profile.json b/crates/fhir/tests/data/json/R4/provenance.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/provenance.profile.json rename to crates/fhir/tests/data/json/R4/provenance.profile.json diff --git a/crates/fhir/tests/data/R4/quantity.profile.json b/crates/fhir/tests/data/json/R4/quantity.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/quantity.profile.json rename to crates/fhir/tests/data/json/R4/quantity.profile.json diff --git a/crates/fhir/tests/data/R4/questionnaire-cqf-example.json b/crates/fhir/tests/data/json/R4/questionnaire-cqf-example.json similarity index 100% rename from crates/fhir/tests/data/R4/questionnaire-cqf-example.json rename to crates/fhir/tests/data/json/R4/questionnaire-cqf-example.json diff --git a/crates/fhir/tests/data/R4/questionnaire-example-bluebook.json b/crates/fhir/tests/data/json/R4/questionnaire-example-bluebook.json similarity index 100% rename from crates/fhir/tests/data/R4/questionnaire-example-bluebook.json rename to crates/fhir/tests/data/json/R4/questionnaire-example-bluebook.json diff --git a/crates/fhir/tests/data/R4/questionnaire-example-f201-lifelines.json b/crates/fhir/tests/data/json/R4/questionnaire-example-f201-lifelines.json similarity index 100% rename from crates/fhir/tests/data/R4/questionnaire-example-f201-lifelines.json rename to crates/fhir/tests/data/json/R4/questionnaire-example-f201-lifelines.json diff --git a/crates/fhir/tests/data/R4/questionnaire-example-gcs.json b/crates/fhir/tests/data/json/R4/questionnaire-example-gcs.json similarity index 100% rename from crates/fhir/tests/data/R4/questionnaire-example-gcs.json rename to crates/fhir/tests/data/json/R4/questionnaire-example-gcs.json diff --git a/crates/fhir/tests/data/R4/questionnaire-example.json b/crates/fhir/tests/data/json/R4/questionnaire-example.json similarity index 100% rename from crates/fhir/tests/data/R4/questionnaire-example.json rename to crates/fhir/tests/data/json/R4/questionnaire-example.json diff --git a/crates/fhir/tests/data/R4/questionnaire-profile-example-ussg-fht.json b/crates/fhir/tests/data/json/R4/questionnaire-profile-example-ussg-fht.json similarity index 100% rename from crates/fhir/tests/data/R4/questionnaire-profile-example-ussg-fht.json rename to crates/fhir/tests/data/json/R4/questionnaire-profile-example-ussg-fht.json diff --git a/crates/fhir/tests/data/R4/questionnaire-questionnaire.json b/crates/fhir/tests/data/json/R4/questionnaire-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/questionnaire-questionnaire.json rename to crates/fhir/tests/data/json/R4/questionnaire-questionnaire.json diff --git a/crates/fhir/tests/data/R4/questionnaire-zika-virus-exposure-assessment.json b/crates/fhir/tests/data/json/R4/questionnaire-zika-virus-exposure-assessment.json similarity index 100% rename from crates/fhir/tests/data/R4/questionnaire-zika-virus-exposure-assessment.json rename to crates/fhir/tests/data/json/R4/questionnaire-zika-virus-exposure-assessment.json diff --git a/crates/fhir/tests/data/R4/questionnaire.profile.json b/crates/fhir/tests/data/json/R4/questionnaire.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/questionnaire.profile.json rename to crates/fhir/tests/data/json/R4/questionnaire.profile.json diff --git a/crates/fhir/tests/data/R4/questionnaireresponse-example-bluebook.json b/crates/fhir/tests/data/json/R4/questionnaireresponse-example-bluebook.json similarity index 100% rename from crates/fhir/tests/data/R4/questionnaireresponse-example-bluebook.json rename to crates/fhir/tests/data/json/R4/questionnaireresponse-example-bluebook.json diff --git a/crates/fhir/tests/data/R4/questionnaireresponse-example-f201-lifelines.json b/crates/fhir/tests/data/json/R4/questionnaireresponse-example-f201-lifelines.json similarity index 100% rename from crates/fhir/tests/data/R4/questionnaireresponse-example-f201-lifelines.json rename to crates/fhir/tests/data/json/R4/questionnaireresponse-example-f201-lifelines.json diff --git a/crates/fhir/tests/data/R4/questionnaireresponse-example-gcs.json b/crates/fhir/tests/data/json/R4/questionnaireresponse-example-gcs.json similarity index 100% rename from crates/fhir/tests/data/R4/questionnaireresponse-example-gcs.json rename to crates/fhir/tests/data/json/R4/questionnaireresponse-example-gcs.json diff --git a/crates/fhir/tests/data/R4/questionnaireresponse-example-ussg-fht-answers.json b/crates/fhir/tests/data/json/R4/questionnaireresponse-example-ussg-fht-answers.json similarity index 100% rename from crates/fhir/tests/data/R4/questionnaireresponse-example-ussg-fht-answers.json rename to crates/fhir/tests/data/json/R4/questionnaireresponse-example-ussg-fht-answers.json diff --git a/crates/fhir/tests/data/R4/questionnaireresponse-example.json b/crates/fhir/tests/data/json/R4/questionnaireresponse-example.json similarity index 100% rename from crates/fhir/tests/data/R4/questionnaireresponse-example.json rename to crates/fhir/tests/data/json/R4/questionnaireresponse-example.json diff --git a/crates/fhir/tests/data/R4/questionnaireresponse-extensions-QuestionnaireResponse-item-subject.json b/crates/fhir/tests/data/json/R4/questionnaireresponse-extensions-QuestionnaireResponse-item-subject.json similarity index 100% rename from crates/fhir/tests/data/R4/questionnaireresponse-extensions-QuestionnaireResponse-item-subject.json rename to crates/fhir/tests/data/json/R4/questionnaireresponse-extensions-QuestionnaireResponse-item-subject.json diff --git a/crates/fhir/tests/data/R4/questionnaireresponse-questionnaire.json b/crates/fhir/tests/data/json/R4/questionnaireresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/questionnaireresponse-questionnaire.json rename to crates/fhir/tests/data/json/R4/questionnaireresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R4/questionnaireresponse.profile.json b/crates/fhir/tests/data/json/R4/questionnaireresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/questionnaireresponse.profile.json rename to crates/fhir/tests/data/json/R4/questionnaireresponse.profile.json diff --git a/crates/fhir/tests/data/R4/range.profile.json b/crates/fhir/tests/data/json/R4/range.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/range.profile.json rename to crates/fhir/tests/data/json/R4/range.profile.json diff --git a/crates/fhir/tests/data/R4/ratio.profile.json b/crates/fhir/tests/data/json/R4/ratio.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/ratio.profile.json rename to crates/fhir/tests/data/json/R4/ratio.profile.json diff --git a/crates/fhir/tests/data/R4/reference.profile.json b/crates/fhir/tests/data/json/R4/reference.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/reference.profile.json rename to crates/fhir/tests/data/json/R4/reference.profile.json diff --git a/crates/fhir/tests/data/R4/relatedartifact.profile.json b/crates/fhir/tests/data/json/R4/relatedartifact.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/relatedartifact.profile.json rename to crates/fhir/tests/data/json/R4/relatedartifact.profile.json diff --git a/crates/fhir/tests/data/R4/relatedperson-example-f001-sarah.json b/crates/fhir/tests/data/json/R4/relatedperson-example-f001-sarah.json similarity index 100% rename from crates/fhir/tests/data/R4/relatedperson-example-f001-sarah.json rename to crates/fhir/tests/data/json/R4/relatedperson-example-f001-sarah.json diff --git a/crates/fhir/tests/data/R4/relatedperson-example-f002-ariadne.json b/crates/fhir/tests/data/json/R4/relatedperson-example-f002-ariadne.json similarity index 100% rename from crates/fhir/tests/data/R4/relatedperson-example-f002-ariadne.json rename to crates/fhir/tests/data/json/R4/relatedperson-example-f002-ariadne.json diff --git a/crates/fhir/tests/data/R4/relatedperson-example-newborn-mom.json b/crates/fhir/tests/data/json/R4/relatedperson-example-newborn-mom.json similarity index 100% rename from crates/fhir/tests/data/R4/relatedperson-example-newborn-mom.json rename to crates/fhir/tests/data/json/R4/relatedperson-example-newborn-mom.json diff --git a/crates/fhir/tests/data/R4/relatedperson-example-peter.json b/crates/fhir/tests/data/json/R4/relatedperson-example-peter.json similarity index 100% rename from crates/fhir/tests/data/R4/relatedperson-example-peter.json rename to crates/fhir/tests/data/json/R4/relatedperson-example-peter.json diff --git a/crates/fhir/tests/data/R4/relatedperson-example.json b/crates/fhir/tests/data/json/R4/relatedperson-example.json similarity index 100% rename from crates/fhir/tests/data/R4/relatedperson-example.json rename to crates/fhir/tests/data/json/R4/relatedperson-example.json diff --git a/crates/fhir/tests/data/R4/relatedperson-questionnaire.json b/crates/fhir/tests/data/json/R4/relatedperson-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/relatedperson-questionnaire.json rename to crates/fhir/tests/data/json/R4/relatedperson-questionnaire.json diff --git a/crates/fhir/tests/data/R4/relatedperson.profile.json b/crates/fhir/tests/data/json/R4/relatedperson.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/relatedperson.profile.json rename to crates/fhir/tests/data/json/R4/relatedperson.profile.json diff --git a/crates/fhir/tests/data/R4/request.json b/crates/fhir/tests/data/json/R4/request.json similarity index 100% rename from crates/fhir/tests/data/R4/request.json rename to crates/fhir/tests/data/json/R4/request.json diff --git a/crates/fhir/tests/data/R4/requestgroup-example.json b/crates/fhir/tests/data/json/R4/requestgroup-example.json similarity index 100% rename from crates/fhir/tests/data/R4/requestgroup-example.json rename to crates/fhir/tests/data/json/R4/requestgroup-example.json diff --git a/crates/fhir/tests/data/R4/requestgroup-kdn5-example.json b/crates/fhir/tests/data/json/R4/requestgroup-kdn5-example.json similarity index 100% rename from crates/fhir/tests/data/R4/requestgroup-kdn5-example.json rename to crates/fhir/tests/data/json/R4/requestgroup-kdn5-example.json diff --git a/crates/fhir/tests/data/R4/requestgroup-questionnaire.json b/crates/fhir/tests/data/json/R4/requestgroup-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/requestgroup-questionnaire.json rename to crates/fhir/tests/data/json/R4/requestgroup-questionnaire.json diff --git a/crates/fhir/tests/data/R4/requestgroup.profile.json b/crates/fhir/tests/data/json/R4/requestgroup.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/requestgroup.profile.json rename to crates/fhir/tests/data/json/R4/requestgroup.profile.json diff --git a/crates/fhir/tests/data/R4/researchdefinition-example.json b/crates/fhir/tests/data/json/R4/researchdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4/researchdefinition-example.json rename to crates/fhir/tests/data/json/R4/researchdefinition-example.json diff --git a/crates/fhir/tests/data/R4/researchdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/researchdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/researchdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/researchdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/researchdefinition.profile.json b/crates/fhir/tests/data/json/R4/researchdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/researchdefinition.profile.json rename to crates/fhir/tests/data/json/R4/researchdefinition.profile.json diff --git a/crates/fhir/tests/data/R4/researchelementdefinition-example.json b/crates/fhir/tests/data/json/R4/researchelementdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4/researchelementdefinition-example.json rename to crates/fhir/tests/data/json/R4/researchelementdefinition-example.json diff --git a/crates/fhir/tests/data/R4/researchelementdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/researchelementdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/researchelementdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/researchelementdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/researchelementdefinition.profile.json b/crates/fhir/tests/data/json/R4/researchelementdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/researchelementdefinition.profile.json rename to crates/fhir/tests/data/json/R4/researchelementdefinition.profile.json diff --git a/crates/fhir/tests/data/R4/researchstudy-example.json b/crates/fhir/tests/data/json/R4/researchstudy-example.json similarity index 100% rename from crates/fhir/tests/data/R4/researchstudy-example.json rename to crates/fhir/tests/data/json/R4/researchstudy-example.json diff --git a/crates/fhir/tests/data/R4/researchstudy-questionnaire.json b/crates/fhir/tests/data/json/R4/researchstudy-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/researchstudy-questionnaire.json rename to crates/fhir/tests/data/json/R4/researchstudy-questionnaire.json diff --git a/crates/fhir/tests/data/R4/researchstudy.profile.json b/crates/fhir/tests/data/json/R4/researchstudy.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/researchstudy.profile.json rename to crates/fhir/tests/data/json/R4/researchstudy.profile.json diff --git a/crates/fhir/tests/data/R4/researchsubject-example.json b/crates/fhir/tests/data/json/R4/researchsubject-example.json similarity index 100% rename from crates/fhir/tests/data/R4/researchsubject-example.json rename to crates/fhir/tests/data/json/R4/researchsubject-example.json diff --git a/crates/fhir/tests/data/R4/researchsubject-questionnaire.json b/crates/fhir/tests/data/json/R4/researchsubject-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/researchsubject-questionnaire.json rename to crates/fhir/tests/data/json/R4/researchsubject-questionnaire.json diff --git a/crates/fhir/tests/data/R4/researchsubject.profile.json b/crates/fhir/tests/data/json/R4/researchsubject.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/researchsubject.profile.json rename to crates/fhir/tests/data/json/R4/researchsubject.profile.json diff --git a/crates/fhir/tests/data/R4/resource.profile.json b/crates/fhir/tests/data/json/R4/resource.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/resource.profile.json rename to crates/fhir/tests/data/json/R4/resource.profile.json diff --git a/crates/fhir/tests/data/R4/resprate-questionnaire.json b/crates/fhir/tests/data/json/R4/resprate-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/resprate-questionnaire.json rename to crates/fhir/tests/data/json/R4/resprate-questionnaire.json diff --git a/crates/fhir/tests/data/R4/resprate.profile.json b/crates/fhir/tests/data/json/R4/resprate.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/resprate.profile.json rename to crates/fhir/tests/data/json/R4/resprate.profile.json diff --git a/crates/fhir/tests/data/R4/riskassessment-example-breastcancer.json b/crates/fhir/tests/data/json/R4/riskassessment-example-breastcancer.json similarity index 100% rename from crates/fhir/tests/data/R4/riskassessment-example-breastcancer.json rename to crates/fhir/tests/data/json/R4/riskassessment-example-breastcancer.json diff --git a/crates/fhir/tests/data/R4/riskassessment-example-cardiac.json b/crates/fhir/tests/data/json/R4/riskassessment-example-cardiac.json similarity index 100% rename from crates/fhir/tests/data/R4/riskassessment-example-cardiac.json rename to crates/fhir/tests/data/json/R4/riskassessment-example-cardiac.json diff --git a/crates/fhir/tests/data/R4/riskassessment-example-population.json b/crates/fhir/tests/data/json/R4/riskassessment-example-population.json similarity index 100% rename from crates/fhir/tests/data/R4/riskassessment-example-population.json rename to crates/fhir/tests/data/json/R4/riskassessment-example-population.json diff --git a/crates/fhir/tests/data/R4/riskassessment-example-prognosis.json b/crates/fhir/tests/data/json/R4/riskassessment-example-prognosis.json similarity index 100% rename from crates/fhir/tests/data/R4/riskassessment-example-prognosis.json rename to crates/fhir/tests/data/json/R4/riskassessment-example-prognosis.json diff --git a/crates/fhir/tests/data/R4/riskassessment-example.json b/crates/fhir/tests/data/json/R4/riskassessment-example.json similarity index 100% rename from crates/fhir/tests/data/R4/riskassessment-example.json rename to crates/fhir/tests/data/json/R4/riskassessment-example.json diff --git a/crates/fhir/tests/data/R4/riskassessment-questionnaire.json b/crates/fhir/tests/data/json/R4/riskassessment-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/riskassessment-questionnaire.json rename to crates/fhir/tests/data/json/R4/riskassessment-questionnaire.json diff --git a/crates/fhir/tests/data/R4/riskassessment-riskexample.json b/crates/fhir/tests/data/json/R4/riskassessment-riskexample.json similarity index 100% rename from crates/fhir/tests/data/R4/riskassessment-riskexample.json rename to crates/fhir/tests/data/json/R4/riskassessment-riskexample.json diff --git a/crates/fhir/tests/data/R4/riskassessment.profile.json b/crates/fhir/tests/data/json/R4/riskassessment.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/riskassessment.profile.json rename to crates/fhir/tests/data/json/R4/riskassessment.profile.json diff --git a/crates/fhir/tests/data/R4/riskevidencesynthesis-example.json b/crates/fhir/tests/data/json/R4/riskevidencesynthesis-example.json similarity index 100% rename from crates/fhir/tests/data/R4/riskevidencesynthesis-example.json rename to crates/fhir/tests/data/json/R4/riskevidencesynthesis-example.json diff --git a/crates/fhir/tests/data/R4/riskevidencesynthesis-questionnaire.json b/crates/fhir/tests/data/json/R4/riskevidencesynthesis-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/riskevidencesynthesis-questionnaire.json rename to crates/fhir/tests/data/json/R4/riskevidencesynthesis-questionnaire.json diff --git a/crates/fhir/tests/data/R4/riskevidencesynthesis.profile.json b/crates/fhir/tests/data/json/R4/riskevidencesynthesis.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/riskevidencesynthesis.profile.json rename to crates/fhir/tests/data/json/R4/riskevidencesynthesis.profile.json diff --git a/crates/fhir/tests/data/R4/sampleddata.profile.json b/crates/fhir/tests/data/json/R4/sampleddata.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/sampleddata.profile.json rename to crates/fhir/tests/data/json/R4/sampleddata.profile.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-account-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-account-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-account-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-account-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-allergyintolerance-clinical.json b/crates/fhir/tests/data/json/R4/sc-valueset-allergyintolerance-clinical.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-allergyintolerance-clinical.json rename to crates/fhir/tests/data/json/R4/sc-valueset-allergyintolerance-clinical.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-allergyintolerance-verification.json b/crates/fhir/tests/data/json/R4/sc-valueset-allergyintolerance-verification.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-allergyintolerance-verification.json rename to crates/fhir/tests/data/json/R4/sc-valueset-allergyintolerance-verification.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-appointmentstatus.json b/crates/fhir/tests/data/json/R4/sc-valueset-appointmentstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-appointmentstatus.json rename to crates/fhir/tests/data/json/R4/sc-valueset-appointmentstatus.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-care-plan-activity-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-care-plan-activity-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-care-plan-activity-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-care-plan-activity-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-care-team-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-care-team-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-care-team-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-care-team-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-chargeitem-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-chargeitem-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-chargeitem-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-chargeitem-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-clinicalimpression-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-clinicalimpression-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-clinicalimpression-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-clinicalimpression-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-composition-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-composition-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-composition-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-composition-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-condition-ver-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-condition-ver-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-condition-ver-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-condition-ver-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-consent-state-codes.json b/crates/fhir/tests/data/json/R4/sc-valueset-consent-state-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-consent-state-codes.json rename to crates/fhir/tests/data/json/R4/sc-valueset-consent-state-codes.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-contract-publicationstatus.json b/crates/fhir/tests/data/json/R4/sc-valueset-contract-publicationstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-contract-publicationstatus.json rename to crates/fhir/tests/data/json/R4/sc-valueset-contract-publicationstatus.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-contract-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-contract-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-contract-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-contract-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-device-statement-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-device-statement-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-device-statement-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-device-statement-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-device-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-device-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-device-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-device-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-diagnostic-report-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-diagnostic-report-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-diagnostic-report-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-diagnostic-report-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-document-reference-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-document-reference-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-document-reference-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-document-reference-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-encounter-location-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-encounter-location-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-encounter-location-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-encounter-location-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-encounter-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-encounter-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-encounter-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-encounter-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-endpoint-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-endpoint-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-endpoint-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-endpoint-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-episode-of-care-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-episode-of-care-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-episode-of-care-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-episode-of-care-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-event-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-event-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-event-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-event-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-explanationofbenefit-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-explanationofbenefit-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-explanationofbenefit-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-explanationofbenefit-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-flag-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-flag-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-flag-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-flag-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-fm-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-fm-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-fm-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-fm-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-goal-achievement.json b/crates/fhir/tests/data/json/R4/sc-valueset-goal-achievement.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-goal-achievement.json rename to crates/fhir/tests/data/json/R4/sc-valueset-goal-achievement.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-goal-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-goal-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-goal-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-goal-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-guidance-response-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-guidance-response-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-guidance-response-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-guidance-response-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-history-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-history-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-history-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-history-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-imagingstudy-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-imagingstudy-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-imagingstudy-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-imagingstudy-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-immunization-evaluation-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-immunization-evaluation-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-immunization-evaluation-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-immunization-evaluation-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-immunization-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-immunization-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-immunization-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-immunization-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-invoice-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-invoice-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-invoice-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-invoice-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-list-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-list-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-list-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-list-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-location-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-location-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-location-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-location-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-measure-report-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-measure-report-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-measure-report-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-measure-report-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-medication-admin-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-medication-admin-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-medication-admin-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-medication-admin-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-medication-statement-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-medication-statement-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-medication-statement-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-medication-statement-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-medication-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-medication-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-medication-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-medication-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-medicationdispense-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-medicationdispense-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-medicationdispense-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-medicationdispense-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-medicationknowledge-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-medicationknowledge-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-medicationknowledge-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-medicationknowledge-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-medicationrequest-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-medicationrequest-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-medicationrequest-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-medicationrequest-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-metric-operational-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-metric-operational-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-metric-operational-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-metric-operational-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-observation-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-observation-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-observation-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-observation-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-participationstatus.json b/crates/fhir/tests/data/json/R4/sc-valueset-participationstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-participationstatus.json rename to crates/fhir/tests/data/json/R4/sc-valueset-participationstatus.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-product-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-product-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-product-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-product-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-publication-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-publication-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-publication-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-publication-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-questionnaire-answers-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-questionnaire-answers-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-questionnaire-answers-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-questionnaire-answers-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-report-status-codes.json b/crates/fhir/tests/data/json/R4/sc-valueset-report-status-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-report-status-codes.json rename to crates/fhir/tests/data/json/R4/sc-valueset-report-status-codes.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-request-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-request-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-request-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-request-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-research-study-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-research-study-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-research-study-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-research-study-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-research-subject-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-research-subject-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-research-subject-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-research-subject-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-slotstatus.json b/crates/fhir/tests/data/json/R4/sc-valueset-slotstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-slotstatus.json rename to crates/fhir/tests/data/json/R4/sc-valueset-slotstatus.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-specimen-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-specimen-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-specimen-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-specimen-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-subscription-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-subscription-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-subscription-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-subscription-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-substance-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-substance-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-substance-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-substance-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-supplydelivery-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-supplydelivery-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-supplydelivery-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-supplydelivery-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-supplyrequest-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-supplyrequest-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-supplyrequest-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-supplyrequest-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-task-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-task-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-task-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-task-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-verificationresult-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-verificationresult-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-verificationresult-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-verificationresult-status.json diff --git a/crates/fhir/tests/data/R4/sc-valueset-verificationresult-validation-status.json b/crates/fhir/tests/data/json/R4/sc-valueset-verificationresult-validation-status.json similarity index 100% rename from crates/fhir/tests/data/R4/sc-valueset-verificationresult-validation-status.json rename to crates/fhir/tests/data/json/R4/sc-valueset-verificationresult-validation-status.json diff --git a/crates/fhir/tests/data/R4/schedule-example.json b/crates/fhir/tests/data/json/R4/schedule-example.json similarity index 100% rename from crates/fhir/tests/data/R4/schedule-example.json rename to crates/fhir/tests/data/json/R4/schedule-example.json diff --git a/crates/fhir/tests/data/R4/schedule-provider-location1-example.json b/crates/fhir/tests/data/json/R4/schedule-provider-location1-example.json similarity index 100% rename from crates/fhir/tests/data/R4/schedule-provider-location1-example.json rename to crates/fhir/tests/data/json/R4/schedule-provider-location1-example.json diff --git a/crates/fhir/tests/data/R4/schedule-provider-location2-example.json b/crates/fhir/tests/data/json/R4/schedule-provider-location2-example.json similarity index 100% rename from crates/fhir/tests/data/R4/schedule-provider-location2-example.json rename to crates/fhir/tests/data/json/R4/schedule-provider-location2-example.json diff --git a/crates/fhir/tests/data/R4/schedule-questionnaire.json b/crates/fhir/tests/data/json/R4/schedule-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/schedule-questionnaire.json rename to crates/fhir/tests/data/json/R4/schedule-questionnaire.json diff --git a/crates/fhir/tests/data/R4/schedule.profile.json b/crates/fhir/tests/data/json/R4/schedule.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/schedule.profile.json rename to crates/fhir/tests/data/json/R4/schedule.profile.json diff --git a/crates/fhir/tests/data/R4/search-parameters.json b/crates/fhir/tests/data/json/R4/search-parameters.json similarity index 100% rename from crates/fhir/tests/data/R4/search-parameters.json rename to crates/fhir/tests/data/json/R4/search-parameters.json diff --git a/crates/fhir/tests/data/R4/searchparameter-example-extension.json b/crates/fhir/tests/data/json/R4/searchparameter-example-extension.json similarity index 100% rename from crates/fhir/tests/data/R4/searchparameter-example-extension.json rename to crates/fhir/tests/data/json/R4/searchparameter-example-extension.json diff --git a/crates/fhir/tests/data/R4/searchparameter-example-reference.json b/crates/fhir/tests/data/json/R4/searchparameter-example-reference.json similarity index 100% rename from crates/fhir/tests/data/R4/searchparameter-example-reference.json rename to crates/fhir/tests/data/json/R4/searchparameter-example-reference.json diff --git a/crates/fhir/tests/data/R4/searchparameter-example.json b/crates/fhir/tests/data/json/R4/searchparameter-example.json similarity index 100% rename from crates/fhir/tests/data/R4/searchparameter-example.json rename to crates/fhir/tests/data/json/R4/searchparameter-example.json diff --git a/crates/fhir/tests/data/R4/searchparameter-filter.json b/crates/fhir/tests/data/json/R4/searchparameter-filter.json similarity index 100% rename from crates/fhir/tests/data/R4/searchparameter-filter.json rename to crates/fhir/tests/data/json/R4/searchparameter-filter.json diff --git a/crates/fhir/tests/data/R4/searchparameter-questionnaire.json b/crates/fhir/tests/data/json/R4/searchparameter-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/searchparameter-questionnaire.json rename to crates/fhir/tests/data/json/R4/searchparameter-questionnaire.json diff --git a/crates/fhir/tests/data/R4/searchparameter.profile.json b/crates/fhir/tests/data/json/R4/searchparameter.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/searchparameter.profile.json rename to crates/fhir/tests/data/json/R4/searchparameter.profile.json diff --git a/crates/fhir/tests/data/R4/sequence-complex-variant.json b/crates/fhir/tests/data/json/R4/sequence-complex-variant.json similarity index 100% rename from crates/fhir/tests/data/R4/sequence-complex-variant.json rename to crates/fhir/tests/data/json/R4/sequence-complex-variant.json diff --git a/crates/fhir/tests/data/R4/sequence-example-TPMT-one.json b/crates/fhir/tests/data/json/R4/sequence-example-TPMT-one.json similarity index 100% rename from crates/fhir/tests/data/R4/sequence-example-TPMT-one.json rename to crates/fhir/tests/data/json/R4/sequence-example-TPMT-one.json diff --git a/crates/fhir/tests/data/R4/sequence-example-TPMT-two.json b/crates/fhir/tests/data/json/R4/sequence-example-TPMT-two.json similarity index 100% rename from crates/fhir/tests/data/R4/sequence-example-TPMT-two.json rename to crates/fhir/tests/data/json/R4/sequence-example-TPMT-two.json diff --git a/crates/fhir/tests/data/R4/sequence-example-fda-comparisons.json b/crates/fhir/tests/data/json/R4/sequence-example-fda-comparisons.json similarity index 100% rename from crates/fhir/tests/data/R4/sequence-example-fda-comparisons.json rename to crates/fhir/tests/data/json/R4/sequence-example-fda-comparisons.json diff --git a/crates/fhir/tests/data/R4/sequence-example-fda-vcfeval.json b/crates/fhir/tests/data/json/R4/sequence-example-fda-vcfeval.json similarity index 100% rename from crates/fhir/tests/data/R4/sequence-example-fda-vcfeval.json rename to crates/fhir/tests/data/json/R4/sequence-example-fda-vcfeval.json diff --git a/crates/fhir/tests/data/R4/sequence-example-fda.json b/crates/fhir/tests/data/json/R4/sequence-example-fda.json similarity index 100% rename from crates/fhir/tests/data/R4/sequence-example-fda.json rename to crates/fhir/tests/data/json/R4/sequence-example-fda.json diff --git a/crates/fhir/tests/data/R4/sequence-example-pgx-1.json b/crates/fhir/tests/data/json/R4/sequence-example-pgx-1.json similarity index 100% rename from crates/fhir/tests/data/R4/sequence-example-pgx-1.json rename to crates/fhir/tests/data/json/R4/sequence-example-pgx-1.json diff --git a/crates/fhir/tests/data/R4/sequence-example-pgx-2.json b/crates/fhir/tests/data/json/R4/sequence-example-pgx-2.json similarity index 100% rename from crates/fhir/tests/data/R4/sequence-example-pgx-2.json rename to crates/fhir/tests/data/json/R4/sequence-example-pgx-2.json diff --git a/crates/fhir/tests/data/R4/sequence-genetics-example-breastcancer.json b/crates/fhir/tests/data/json/R4/sequence-genetics-example-breastcancer.json similarity index 100% rename from crates/fhir/tests/data/R4/sequence-genetics-example-breastcancer.json rename to crates/fhir/tests/data/json/R4/sequence-genetics-example-breastcancer.json diff --git a/crates/fhir/tests/data/R4/sequence-graphic-example-1.json b/crates/fhir/tests/data/json/R4/sequence-graphic-example-1.json similarity index 100% rename from crates/fhir/tests/data/R4/sequence-graphic-example-1.json rename to crates/fhir/tests/data/json/R4/sequence-graphic-example-1.json diff --git a/crates/fhir/tests/data/R4/sequence-graphic-example-2.json b/crates/fhir/tests/data/json/R4/sequence-graphic-example-2.json similarity index 100% rename from crates/fhir/tests/data/R4/sequence-graphic-example-2.json rename to crates/fhir/tests/data/json/R4/sequence-graphic-example-2.json diff --git a/crates/fhir/tests/data/R4/sequence-graphic-example-3.json b/crates/fhir/tests/data/json/R4/sequence-graphic-example-3.json similarity index 100% rename from crates/fhir/tests/data/R4/sequence-graphic-example-3.json rename to crates/fhir/tests/data/json/R4/sequence-graphic-example-3.json diff --git a/crates/fhir/tests/data/R4/sequence-graphic-example-4.json b/crates/fhir/tests/data/json/R4/sequence-graphic-example-4.json similarity index 100% rename from crates/fhir/tests/data/R4/sequence-graphic-example-4.json rename to crates/fhir/tests/data/json/R4/sequence-graphic-example-4.json diff --git a/crates/fhir/tests/data/R4/sequence-graphic-example-5.json b/crates/fhir/tests/data/json/R4/sequence-graphic-example-5.json similarity index 100% rename from crates/fhir/tests/data/R4/sequence-graphic-example-5.json rename to crates/fhir/tests/data/json/R4/sequence-graphic-example-5.json diff --git a/crates/fhir/tests/data/R4/servicerequest-example-ambulation.json b/crates/fhir/tests/data/json/R4/servicerequest-example-ambulation.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-example-ambulation.json rename to crates/fhir/tests/data/json/R4/servicerequest-example-ambulation.json diff --git a/crates/fhir/tests/data/R4/servicerequest-example-appendectomy.json b/crates/fhir/tests/data/json/R4/servicerequest-example-appendectomy.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-example-appendectomy.json rename to crates/fhir/tests/data/json/R4/servicerequest-example-appendectomy.json diff --git a/crates/fhir/tests/data/R4/servicerequest-example-colonoscopy-bx.json b/crates/fhir/tests/data/json/R4/servicerequest-example-colonoscopy-bx.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-example-colonoscopy-bx.json rename to crates/fhir/tests/data/json/R4/servicerequest-example-colonoscopy-bx.json diff --git a/crates/fhir/tests/data/R4/servicerequest-example-colonoscopy.json b/crates/fhir/tests/data/json/R4/servicerequest-example-colonoscopy.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-example-colonoscopy.json rename to crates/fhir/tests/data/json/R4/servicerequest-example-colonoscopy.json diff --git a/crates/fhir/tests/data/R4/servicerequest-example-di.json b/crates/fhir/tests/data/json/R4/servicerequest-example-di.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-example-di.json rename to crates/fhir/tests/data/json/R4/servicerequest-example-di.json diff --git a/crates/fhir/tests/data/R4/servicerequest-example-edu.json b/crates/fhir/tests/data/json/R4/servicerequest-example-edu.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-example-edu.json rename to crates/fhir/tests/data/json/R4/servicerequest-example-edu.json diff --git a/crates/fhir/tests/data/R4/servicerequest-example-ft4.json b/crates/fhir/tests/data/json/R4/servicerequest-example-ft4.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-example-ft4.json rename to crates/fhir/tests/data/json/R4/servicerequest-example-ft4.json diff --git a/crates/fhir/tests/data/R4/servicerequest-example-implant.json b/crates/fhir/tests/data/json/R4/servicerequest-example-implant.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-example-implant.json rename to crates/fhir/tests/data/json/R4/servicerequest-example-implant.json diff --git a/crates/fhir/tests/data/R4/servicerequest-example-lipid.json b/crates/fhir/tests/data/json/R4/servicerequest-example-lipid.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-example-lipid.json rename to crates/fhir/tests/data/json/R4/servicerequest-example-lipid.json diff --git a/crates/fhir/tests/data/R4/servicerequest-example-myringotomy.json b/crates/fhir/tests/data/json/R4/servicerequest-example-myringotomy.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-example-myringotomy.json rename to crates/fhir/tests/data/json/R4/servicerequest-example-myringotomy.json diff --git a/crates/fhir/tests/data/R4/servicerequest-example-ob.json b/crates/fhir/tests/data/json/R4/servicerequest-example-ob.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-example-ob.json rename to crates/fhir/tests/data/json/R4/servicerequest-example-ob.json diff --git a/crates/fhir/tests/data/R4/servicerequest-example-pgx.json b/crates/fhir/tests/data/json/R4/servicerequest-example-pgx.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-example-pgx.json rename to crates/fhir/tests/data/json/R4/servicerequest-example-pgx.json diff --git a/crates/fhir/tests/data/R4/servicerequest-example-pt.json b/crates/fhir/tests/data/json/R4/servicerequest-example-pt.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-example-pt.json rename to crates/fhir/tests/data/json/R4/servicerequest-example-pt.json diff --git a/crates/fhir/tests/data/R4/servicerequest-example-subrequest.json b/crates/fhir/tests/data/json/R4/servicerequest-example-subrequest.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-example-subrequest.json rename to crates/fhir/tests/data/json/R4/servicerequest-example-subrequest.json diff --git a/crates/fhir/tests/data/R4/servicerequest-example-ventilation.json b/crates/fhir/tests/data/json/R4/servicerequest-example-ventilation.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-example-ventilation.json rename to crates/fhir/tests/data/json/R4/servicerequest-example-ventilation.json diff --git a/crates/fhir/tests/data/R4/servicerequest-example.json b/crates/fhir/tests/data/json/R4/servicerequest-example.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-example.json rename to crates/fhir/tests/data/json/R4/servicerequest-example.json diff --git a/crates/fhir/tests/data/R4/servicerequest-example2.json b/crates/fhir/tests/data/json/R4/servicerequest-example2.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-example2.json rename to crates/fhir/tests/data/json/R4/servicerequest-example2.json diff --git a/crates/fhir/tests/data/R4/servicerequest-example3.json b/crates/fhir/tests/data/json/R4/servicerequest-example3.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-example3.json rename to crates/fhir/tests/data/json/R4/servicerequest-example3.json diff --git a/crates/fhir/tests/data/R4/servicerequest-example4.json b/crates/fhir/tests/data/json/R4/servicerequest-example4.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-example4.json rename to crates/fhir/tests/data/json/R4/servicerequest-example4.json diff --git a/crates/fhir/tests/data/R4/servicerequest-genetics-example-1.json b/crates/fhir/tests/data/json/R4/servicerequest-genetics-example-1.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-genetics-example-1.json rename to crates/fhir/tests/data/json/R4/servicerequest-genetics-example-1.json diff --git a/crates/fhir/tests/data/R4/servicerequest-genetics-questionnaire.json b/crates/fhir/tests/data/json/R4/servicerequest-genetics-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-genetics-questionnaire.json rename to crates/fhir/tests/data/json/R4/servicerequest-genetics-questionnaire.json diff --git a/crates/fhir/tests/data/R4/servicerequest-genetics.profile.json b/crates/fhir/tests/data/json/R4/servicerequest-genetics.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-genetics.profile.json rename to crates/fhir/tests/data/json/R4/servicerequest-genetics.profile.json diff --git a/crates/fhir/tests/data/R4/servicerequest-questionnaire.json b/crates/fhir/tests/data/json/R4/servicerequest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest-questionnaire.json rename to crates/fhir/tests/data/json/R4/servicerequest-questionnaire.json diff --git a/crates/fhir/tests/data/R4/servicerequest.profile.json b/crates/fhir/tests/data/json/R4/servicerequest.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/servicerequest.profile.json rename to crates/fhir/tests/data/json/R4/servicerequest.profile.json diff --git a/crates/fhir/tests/data/R4/shareableactivitydefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/shareableactivitydefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/shareableactivitydefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/shareableactivitydefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/shareableactivitydefinition.profile.json b/crates/fhir/tests/data/json/R4/shareableactivitydefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/shareableactivitydefinition.profile.json rename to crates/fhir/tests/data/json/R4/shareableactivitydefinition.profile.json diff --git a/crates/fhir/tests/data/R4/shareablecodesystem-questionnaire.json b/crates/fhir/tests/data/json/R4/shareablecodesystem-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/shareablecodesystem-questionnaire.json rename to crates/fhir/tests/data/json/R4/shareablecodesystem-questionnaire.json diff --git a/crates/fhir/tests/data/R4/shareablecodesystem.profile.json b/crates/fhir/tests/data/json/R4/shareablecodesystem.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/shareablecodesystem.profile.json rename to crates/fhir/tests/data/json/R4/shareablecodesystem.profile.json diff --git a/crates/fhir/tests/data/R4/shareablelibrary-questionnaire.json b/crates/fhir/tests/data/json/R4/shareablelibrary-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/shareablelibrary-questionnaire.json rename to crates/fhir/tests/data/json/R4/shareablelibrary-questionnaire.json diff --git a/crates/fhir/tests/data/R4/shareablelibrary.profile.json b/crates/fhir/tests/data/json/R4/shareablelibrary.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/shareablelibrary.profile.json rename to crates/fhir/tests/data/json/R4/shareablelibrary.profile.json diff --git a/crates/fhir/tests/data/R4/shareablemeasure-questionnaire.json b/crates/fhir/tests/data/json/R4/shareablemeasure-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/shareablemeasure-questionnaire.json rename to crates/fhir/tests/data/json/R4/shareablemeasure-questionnaire.json diff --git a/crates/fhir/tests/data/R4/shareablemeasure.profile.json b/crates/fhir/tests/data/json/R4/shareablemeasure.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/shareablemeasure.profile.json rename to crates/fhir/tests/data/json/R4/shareablemeasure.profile.json diff --git a/crates/fhir/tests/data/R4/shareableplandefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/shareableplandefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/shareableplandefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/shareableplandefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/shareableplandefinition.profile.json b/crates/fhir/tests/data/json/R4/shareableplandefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/shareableplandefinition.profile.json rename to crates/fhir/tests/data/json/R4/shareableplandefinition.profile.json diff --git a/crates/fhir/tests/data/R4/shareablevalueset-questionnaire.json b/crates/fhir/tests/data/json/R4/shareablevalueset-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/shareablevalueset-questionnaire.json rename to crates/fhir/tests/data/json/R4/shareablevalueset-questionnaire.json diff --git a/crates/fhir/tests/data/R4/shareablevalueset.profile.json b/crates/fhir/tests/data/json/R4/shareablevalueset.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/shareablevalueset.profile.json rename to crates/fhir/tests/data/json/R4/shareablevalueset.profile.json diff --git a/crates/fhir/tests/data/R4/signature.profile.json b/crates/fhir/tests/data/json/R4/signature.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/signature.profile.json rename to crates/fhir/tests/data/json/R4/signature.profile.json diff --git a/crates/fhir/tests/data/R4/simplequantity.profile.json b/crates/fhir/tests/data/json/R4/simplequantity.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/simplequantity.profile.json rename to crates/fhir/tests/data/json/R4/simplequantity.profile.json diff --git a/crates/fhir/tests/data/R4/slm-codesystem.json b/crates/fhir/tests/data/json/R4/slm-codesystem.json similarity index 100% rename from crates/fhir/tests/data/R4/slm-codesystem.json rename to crates/fhir/tests/data/json/R4/slm-codesystem.json diff --git a/crates/fhir/tests/data/R4/slot-example-busy.json b/crates/fhir/tests/data/json/R4/slot-example-busy.json similarity index 100% rename from crates/fhir/tests/data/R4/slot-example-busy.json rename to crates/fhir/tests/data/json/R4/slot-example-busy.json diff --git a/crates/fhir/tests/data/R4/slot-example-tentative.json b/crates/fhir/tests/data/json/R4/slot-example-tentative.json similarity index 100% rename from crates/fhir/tests/data/R4/slot-example-tentative.json rename to crates/fhir/tests/data/json/R4/slot-example-tentative.json diff --git a/crates/fhir/tests/data/R4/slot-example-unavailable.json b/crates/fhir/tests/data/json/R4/slot-example-unavailable.json similarity index 100% rename from crates/fhir/tests/data/R4/slot-example-unavailable.json rename to crates/fhir/tests/data/json/R4/slot-example-unavailable.json diff --git a/crates/fhir/tests/data/R4/slot-example.json b/crates/fhir/tests/data/json/R4/slot-example.json similarity index 100% rename from crates/fhir/tests/data/R4/slot-example.json rename to crates/fhir/tests/data/json/R4/slot-example.json diff --git a/crates/fhir/tests/data/R4/slot-questionnaire.json b/crates/fhir/tests/data/json/R4/slot-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/slot-questionnaire.json rename to crates/fhir/tests/data/json/R4/slot-questionnaire.json diff --git a/crates/fhir/tests/data/R4/slot.profile.json b/crates/fhir/tests/data/json/R4/slot.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/slot.profile.json rename to crates/fhir/tests/data/json/R4/slot.profile.json diff --git a/crates/fhir/tests/data/R4/specimen-example-isolate.json b/crates/fhir/tests/data/json/R4/specimen-example-isolate.json similarity index 100% rename from crates/fhir/tests/data/R4/specimen-example-isolate.json rename to crates/fhir/tests/data/json/R4/specimen-example-isolate.json diff --git a/crates/fhir/tests/data/R4/specimen-example-pooled-serum.json b/crates/fhir/tests/data/json/R4/specimen-example-pooled-serum.json similarity index 100% rename from crates/fhir/tests/data/R4/specimen-example-pooled-serum.json rename to crates/fhir/tests/data/json/R4/specimen-example-pooled-serum.json diff --git a/crates/fhir/tests/data/R4/specimen-example-serum.json b/crates/fhir/tests/data/json/R4/specimen-example-serum.json similarity index 100% rename from crates/fhir/tests/data/R4/specimen-example-serum.json rename to crates/fhir/tests/data/json/R4/specimen-example-serum.json diff --git a/crates/fhir/tests/data/R4/specimen-example-urine.json b/crates/fhir/tests/data/json/R4/specimen-example-urine.json similarity index 100% rename from crates/fhir/tests/data/R4/specimen-example-urine.json rename to crates/fhir/tests/data/json/R4/specimen-example-urine.json diff --git a/crates/fhir/tests/data/R4/specimen-example.json b/crates/fhir/tests/data/json/R4/specimen-example.json similarity index 100% rename from crates/fhir/tests/data/R4/specimen-example.json rename to crates/fhir/tests/data/json/R4/specimen-example.json diff --git a/crates/fhir/tests/data/R4/specimen-questionnaire.json b/crates/fhir/tests/data/json/R4/specimen-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/specimen-questionnaire.json rename to crates/fhir/tests/data/json/R4/specimen-questionnaire.json diff --git a/crates/fhir/tests/data/R4/specimen.profile.json b/crates/fhir/tests/data/json/R4/specimen.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/specimen.profile.json rename to crates/fhir/tests/data/json/R4/specimen.profile.json diff --git a/crates/fhir/tests/data/R4/specimendefinition-example-serum-plasma.json b/crates/fhir/tests/data/json/R4/specimendefinition-example-serum-plasma.json similarity index 100% rename from crates/fhir/tests/data/R4/specimendefinition-example-serum-plasma.json rename to crates/fhir/tests/data/json/R4/specimendefinition-example-serum-plasma.json diff --git a/crates/fhir/tests/data/R4/specimendefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/specimendefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/specimendefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/specimendefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/specimendefinition.profile.json b/crates/fhir/tests/data/json/R4/specimendefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/specimendefinition.profile.json rename to crates/fhir/tests/data/json/R4/specimendefinition.profile.json diff --git a/crates/fhir/tests/data/R4/string.profile.json b/crates/fhir/tests/data/json/R4/string.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/string.profile.json rename to crates/fhir/tests/data/json/R4/string.profile.json diff --git a/crates/fhir/tests/data/R4/structuredefinition-example-composition.json b/crates/fhir/tests/data/json/R4/structuredefinition-example-composition.json similarity index 100% rename from crates/fhir/tests/data/R4/structuredefinition-example-composition.json rename to crates/fhir/tests/data/json/R4/structuredefinition-example-composition.json diff --git a/crates/fhir/tests/data/R4/structuredefinition-example-section-library.json b/crates/fhir/tests/data/json/R4/structuredefinition-example-section-library.json similarity index 100% rename from crates/fhir/tests/data/R4/structuredefinition-example-section-library.json rename to crates/fhir/tests/data/json/R4/structuredefinition-example-section-library.json diff --git a/crates/fhir/tests/data/R4/structuredefinition-questionnaire.json b/crates/fhir/tests/data/json/R4/structuredefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/structuredefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4/structuredefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4/structuredefinition.profile.json b/crates/fhir/tests/data/json/R4/structuredefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/structuredefinition.profile.json rename to crates/fhir/tests/data/json/R4/structuredefinition.profile.json diff --git a/crates/fhir/tests/data/R4/structuremap-example.json b/crates/fhir/tests/data/json/R4/structuremap-example.json similarity index 100% rename from crates/fhir/tests/data/R4/structuremap-example.json rename to crates/fhir/tests/data/json/R4/structuremap-example.json diff --git a/crates/fhir/tests/data/R4/structuremap-questionnaire.json b/crates/fhir/tests/data/json/R4/structuremap-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/structuremap-questionnaire.json rename to crates/fhir/tests/data/json/R4/structuremap-questionnaire.json diff --git a/crates/fhir/tests/data/R4/structuremap-supplyrequest-transform.json b/crates/fhir/tests/data/json/R4/structuremap-supplyrequest-transform.json similarity index 100% rename from crates/fhir/tests/data/R4/structuremap-supplyrequest-transform.json rename to crates/fhir/tests/data/json/R4/structuremap-supplyrequest-transform.json diff --git a/crates/fhir/tests/data/R4/structuremap.profile.json b/crates/fhir/tests/data/json/R4/structuremap.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/structuremap.profile.json rename to crates/fhir/tests/data/json/R4/structuremap.profile.json diff --git a/crates/fhir/tests/data/R4/subscription-example-error.json b/crates/fhir/tests/data/json/R4/subscription-example-error.json similarity index 100% rename from crates/fhir/tests/data/R4/subscription-example-error.json rename to crates/fhir/tests/data/json/R4/subscription-example-error.json diff --git a/crates/fhir/tests/data/R4/subscription-example.json b/crates/fhir/tests/data/json/R4/subscription-example.json similarity index 100% rename from crates/fhir/tests/data/R4/subscription-example.json rename to crates/fhir/tests/data/json/R4/subscription-example.json diff --git a/crates/fhir/tests/data/R4/subscription-questionnaire.json b/crates/fhir/tests/data/json/R4/subscription-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/subscription-questionnaire.json rename to crates/fhir/tests/data/json/R4/subscription-questionnaire.json diff --git a/crates/fhir/tests/data/R4/subscription.profile.json b/crates/fhir/tests/data/json/R4/subscription.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/subscription.profile.json rename to crates/fhir/tests/data/json/R4/subscription.profile.json diff --git a/crates/fhir/tests/data/R4/substance-example-amoxicillin-clavulanate.json b/crates/fhir/tests/data/json/R4/substance-example-amoxicillin-clavulanate.json similarity index 100% rename from crates/fhir/tests/data/R4/substance-example-amoxicillin-clavulanate.json rename to crates/fhir/tests/data/json/R4/substance-example-amoxicillin-clavulanate.json diff --git a/crates/fhir/tests/data/R4/substance-example-f201-dust.json b/crates/fhir/tests/data/json/R4/substance-example-f201-dust.json similarity index 100% rename from crates/fhir/tests/data/R4/substance-example-f201-dust.json rename to crates/fhir/tests/data/json/R4/substance-example-f201-dust.json diff --git a/crates/fhir/tests/data/R4/substance-example-f202-staphylococcus.json b/crates/fhir/tests/data/json/R4/substance-example-f202-staphylococcus.json similarity index 100% rename from crates/fhir/tests/data/R4/substance-example-f202-staphylococcus.json rename to crates/fhir/tests/data/json/R4/substance-example-f202-staphylococcus.json diff --git a/crates/fhir/tests/data/R4/substance-example-f203-potassium.json b/crates/fhir/tests/data/json/R4/substance-example-f203-potassium.json similarity index 100% rename from crates/fhir/tests/data/R4/substance-example-f203-potassium.json rename to crates/fhir/tests/data/json/R4/substance-example-f203-potassium.json diff --git a/crates/fhir/tests/data/R4/substance-example-silver-nitrate-product.json b/crates/fhir/tests/data/json/R4/substance-example-silver-nitrate-product.json similarity index 100% rename from crates/fhir/tests/data/R4/substance-example-silver-nitrate-product.json rename to crates/fhir/tests/data/json/R4/substance-example-silver-nitrate-product.json diff --git a/crates/fhir/tests/data/R4/substance-example.json b/crates/fhir/tests/data/json/R4/substance-example.json similarity index 100% rename from crates/fhir/tests/data/R4/substance-example.json rename to crates/fhir/tests/data/json/R4/substance-example.json diff --git a/crates/fhir/tests/data/R4/substance-questionnaire.json b/crates/fhir/tests/data/json/R4/substance-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/substance-questionnaire.json rename to crates/fhir/tests/data/json/R4/substance-questionnaire.json diff --git a/crates/fhir/tests/data/R4/substance.profile.json b/crates/fhir/tests/data/json/R4/substance.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/substance.profile.json rename to crates/fhir/tests/data/json/R4/substance.profile.json diff --git a/crates/fhir/tests/data/R4/substanceamount.profile.json b/crates/fhir/tests/data/json/R4/substanceamount.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/substanceamount.profile.json rename to crates/fhir/tests/data/json/R4/substanceamount.profile.json diff --git a/crates/fhir/tests/data/R4/substancenucleicacid-example.json b/crates/fhir/tests/data/json/R4/substancenucleicacid-example.json similarity index 100% rename from crates/fhir/tests/data/R4/substancenucleicacid-example.json rename to crates/fhir/tests/data/json/R4/substancenucleicacid-example.json diff --git a/crates/fhir/tests/data/R4/substancenucleicacid-questionnaire.json b/crates/fhir/tests/data/json/R4/substancenucleicacid-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/substancenucleicacid-questionnaire.json rename to crates/fhir/tests/data/json/R4/substancenucleicacid-questionnaire.json diff --git a/crates/fhir/tests/data/R4/substancenucleicacid.profile.json b/crates/fhir/tests/data/json/R4/substancenucleicacid.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/substancenucleicacid.profile.json rename to crates/fhir/tests/data/json/R4/substancenucleicacid.profile.json diff --git a/crates/fhir/tests/data/R4/substancepolymer-example.json b/crates/fhir/tests/data/json/R4/substancepolymer-example.json similarity index 100% rename from crates/fhir/tests/data/R4/substancepolymer-example.json rename to crates/fhir/tests/data/json/R4/substancepolymer-example.json diff --git a/crates/fhir/tests/data/R4/substancepolymer-questionnaire.json b/crates/fhir/tests/data/json/R4/substancepolymer-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/substancepolymer-questionnaire.json rename to crates/fhir/tests/data/json/R4/substancepolymer-questionnaire.json diff --git a/crates/fhir/tests/data/R4/substancepolymer.profile.json b/crates/fhir/tests/data/json/R4/substancepolymer.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/substancepolymer.profile.json rename to crates/fhir/tests/data/json/R4/substancepolymer.profile.json diff --git a/crates/fhir/tests/data/R4/substanceprotein-example.json b/crates/fhir/tests/data/json/R4/substanceprotein-example.json similarity index 100% rename from crates/fhir/tests/data/R4/substanceprotein-example.json rename to crates/fhir/tests/data/json/R4/substanceprotein-example.json diff --git a/crates/fhir/tests/data/R4/substanceprotein-questionnaire.json b/crates/fhir/tests/data/json/R4/substanceprotein-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/substanceprotein-questionnaire.json rename to crates/fhir/tests/data/json/R4/substanceprotein-questionnaire.json diff --git a/crates/fhir/tests/data/R4/substanceprotein.profile.json b/crates/fhir/tests/data/json/R4/substanceprotein.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/substanceprotein.profile.json rename to crates/fhir/tests/data/json/R4/substanceprotein.profile.json diff --git a/crates/fhir/tests/data/R4/substancereferenceinformation-example.json b/crates/fhir/tests/data/json/R4/substancereferenceinformation-example.json similarity index 100% rename from crates/fhir/tests/data/R4/substancereferenceinformation-example.json rename to crates/fhir/tests/data/json/R4/substancereferenceinformation-example.json diff --git a/crates/fhir/tests/data/R4/substancereferenceinformation-questionnaire.json b/crates/fhir/tests/data/json/R4/substancereferenceinformation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/substancereferenceinformation-questionnaire.json rename to crates/fhir/tests/data/json/R4/substancereferenceinformation-questionnaire.json diff --git a/crates/fhir/tests/data/R4/substancereferenceinformation.profile.json b/crates/fhir/tests/data/json/R4/substancereferenceinformation.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/substancereferenceinformation.profile.json rename to crates/fhir/tests/data/json/R4/substancereferenceinformation.profile.json diff --git a/crates/fhir/tests/data/R4/substancesourcematerial-example.json b/crates/fhir/tests/data/json/R4/substancesourcematerial-example.json similarity index 100% rename from crates/fhir/tests/data/R4/substancesourcematerial-example.json rename to crates/fhir/tests/data/json/R4/substancesourcematerial-example.json diff --git a/crates/fhir/tests/data/R4/substancesourcematerial-questionnaire.json b/crates/fhir/tests/data/json/R4/substancesourcematerial-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/substancesourcematerial-questionnaire.json rename to crates/fhir/tests/data/json/R4/substancesourcematerial-questionnaire.json diff --git a/crates/fhir/tests/data/R4/substancesourcematerial.profile.json b/crates/fhir/tests/data/json/R4/substancesourcematerial.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/substancesourcematerial.profile.json rename to crates/fhir/tests/data/json/R4/substancesourcematerial.profile.json diff --git a/crates/fhir/tests/data/R4/substancespecification-example.json b/crates/fhir/tests/data/json/R4/substancespecification-example.json similarity index 100% rename from crates/fhir/tests/data/R4/substancespecification-example.json rename to crates/fhir/tests/data/json/R4/substancespecification-example.json diff --git a/crates/fhir/tests/data/R4/substancespecification-questionnaire.json b/crates/fhir/tests/data/json/R4/substancespecification-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/substancespecification-questionnaire.json rename to crates/fhir/tests/data/json/R4/substancespecification-questionnaire.json diff --git a/crates/fhir/tests/data/R4/substancespecification.profile.json b/crates/fhir/tests/data/json/R4/substancespecification.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/substancespecification.profile.json rename to crates/fhir/tests/data/json/R4/substancespecification.profile.json diff --git a/crates/fhir/tests/data/R4/supplydelivery-example-pumpdelivery.json b/crates/fhir/tests/data/json/R4/supplydelivery-example-pumpdelivery.json similarity index 100% rename from crates/fhir/tests/data/R4/supplydelivery-example-pumpdelivery.json rename to crates/fhir/tests/data/json/R4/supplydelivery-example-pumpdelivery.json diff --git a/crates/fhir/tests/data/R4/supplydelivery-example.json b/crates/fhir/tests/data/json/R4/supplydelivery-example.json similarity index 100% rename from crates/fhir/tests/data/R4/supplydelivery-example.json rename to crates/fhir/tests/data/json/R4/supplydelivery-example.json diff --git a/crates/fhir/tests/data/R4/supplydelivery-questionnaire.json b/crates/fhir/tests/data/json/R4/supplydelivery-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/supplydelivery-questionnaire.json rename to crates/fhir/tests/data/json/R4/supplydelivery-questionnaire.json diff --git a/crates/fhir/tests/data/R4/supplydelivery.profile.json b/crates/fhir/tests/data/json/R4/supplydelivery.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/supplydelivery.profile.json rename to crates/fhir/tests/data/json/R4/supplydelivery.profile.json diff --git a/crates/fhir/tests/data/R4/supplyrequest-example-simpleorder.json b/crates/fhir/tests/data/json/R4/supplyrequest-example-simpleorder.json similarity index 100% rename from crates/fhir/tests/data/R4/supplyrequest-example-simpleorder.json rename to crates/fhir/tests/data/json/R4/supplyrequest-example-simpleorder.json diff --git a/crates/fhir/tests/data/R4/supplyrequest-questionnaire.json b/crates/fhir/tests/data/json/R4/supplyrequest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/supplyrequest-questionnaire.json rename to crates/fhir/tests/data/json/R4/supplyrequest-questionnaire.json diff --git a/crates/fhir/tests/data/R4/supplyrequest.profile.json b/crates/fhir/tests/data/json/R4/supplyrequest.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/supplyrequest.profile.json rename to crates/fhir/tests/data/json/R4/supplyrequest.profile.json diff --git a/crates/fhir/tests/data/R4/synthesis-questionnaire.json b/crates/fhir/tests/data/json/R4/synthesis-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/synthesis-questionnaire.json rename to crates/fhir/tests/data/json/R4/synthesis-questionnaire.json diff --git a/crates/fhir/tests/data/R4/synthesis.profile.json b/crates/fhir/tests/data/json/R4/synthesis.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/synthesis.profile.json rename to crates/fhir/tests/data/json/R4/synthesis.profile.json diff --git a/crates/fhir/tests/data/R4/task-example-fm-cancel.json b/crates/fhir/tests/data/json/R4/task-example-fm-cancel.json similarity index 100% rename from crates/fhir/tests/data/R4/task-example-fm-cancel.json rename to crates/fhir/tests/data/json/R4/task-example-fm-cancel.json diff --git a/crates/fhir/tests/data/R4/task-example-fm-poll.json b/crates/fhir/tests/data/json/R4/task-example-fm-poll.json similarity index 100% rename from crates/fhir/tests/data/R4/task-example-fm-poll.json rename to crates/fhir/tests/data/json/R4/task-example-fm-poll.json diff --git a/crates/fhir/tests/data/R4/task-example-fm-release.json b/crates/fhir/tests/data/json/R4/task-example-fm-release.json similarity index 100% rename from crates/fhir/tests/data/R4/task-example-fm-release.json rename to crates/fhir/tests/data/json/R4/task-example-fm-release.json diff --git a/crates/fhir/tests/data/R4/task-example-fm-reprocess.json b/crates/fhir/tests/data/json/R4/task-example-fm-reprocess.json similarity index 100% rename from crates/fhir/tests/data/R4/task-example-fm-reprocess.json rename to crates/fhir/tests/data/json/R4/task-example-fm-reprocess.json diff --git a/crates/fhir/tests/data/R4/task-example-fm-status-resp.json b/crates/fhir/tests/data/json/R4/task-example-fm-status-resp.json similarity index 100% rename from crates/fhir/tests/data/R4/task-example-fm-status-resp.json rename to crates/fhir/tests/data/json/R4/task-example-fm-status-resp.json diff --git a/crates/fhir/tests/data/R4/task-example-fm-status.json b/crates/fhir/tests/data/json/R4/task-example-fm-status.json similarity index 100% rename from crates/fhir/tests/data/R4/task-example-fm-status.json rename to crates/fhir/tests/data/json/R4/task-example-fm-status.json diff --git a/crates/fhir/tests/data/R4/task-example1.json b/crates/fhir/tests/data/json/R4/task-example1.json similarity index 100% rename from crates/fhir/tests/data/R4/task-example1.json rename to crates/fhir/tests/data/json/R4/task-example1.json diff --git a/crates/fhir/tests/data/R4/task-example2.json b/crates/fhir/tests/data/json/R4/task-example2.json similarity index 100% rename from crates/fhir/tests/data/R4/task-example2.json rename to crates/fhir/tests/data/json/R4/task-example2.json diff --git a/crates/fhir/tests/data/R4/task-example3.json b/crates/fhir/tests/data/json/R4/task-example3.json similarity index 100% rename from crates/fhir/tests/data/R4/task-example3.json rename to crates/fhir/tests/data/json/R4/task-example3.json diff --git a/crates/fhir/tests/data/R4/task-example4.json b/crates/fhir/tests/data/json/R4/task-example4.json similarity index 100% rename from crates/fhir/tests/data/R4/task-example4.json rename to crates/fhir/tests/data/json/R4/task-example4.json diff --git a/crates/fhir/tests/data/R4/task-example5.json b/crates/fhir/tests/data/json/R4/task-example5.json similarity index 100% rename from crates/fhir/tests/data/R4/task-example5.json rename to crates/fhir/tests/data/json/R4/task-example5.json diff --git a/crates/fhir/tests/data/R4/task-example6.json b/crates/fhir/tests/data/json/R4/task-example6.json similarity index 100% rename from crates/fhir/tests/data/R4/task-example6.json rename to crates/fhir/tests/data/json/R4/task-example6.json diff --git a/crates/fhir/tests/data/R4/task-questionnaire.json b/crates/fhir/tests/data/json/R4/task-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/task-questionnaire.json rename to crates/fhir/tests/data/json/R4/task-questionnaire.json diff --git a/crates/fhir/tests/data/R4/task.profile.json b/crates/fhir/tests/data/json/R4/task.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/task.profile.json rename to crates/fhir/tests/data/json/R4/task.profile.json diff --git a/crates/fhir/tests/data/R4/terminologycapabilities-example.json b/crates/fhir/tests/data/json/R4/terminologycapabilities-example.json similarity index 100% rename from crates/fhir/tests/data/R4/terminologycapabilities-example.json rename to crates/fhir/tests/data/json/R4/terminologycapabilities-example.json diff --git a/crates/fhir/tests/data/R4/terminologycapabilities-questionnaire.json b/crates/fhir/tests/data/json/R4/terminologycapabilities-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/terminologycapabilities-questionnaire.json rename to crates/fhir/tests/data/json/R4/terminologycapabilities-questionnaire.json diff --git a/crates/fhir/tests/data/R4/terminologycapabilities.profile.json b/crates/fhir/tests/data/json/R4/terminologycapabilities.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/terminologycapabilities.profile.json rename to crates/fhir/tests/data/json/R4/terminologycapabilities.profile.json diff --git a/crates/fhir/tests/data/R4/testreport-example.json b/crates/fhir/tests/data/json/R4/testreport-example.json similarity index 100% rename from crates/fhir/tests/data/R4/testreport-example.json rename to crates/fhir/tests/data/json/R4/testreport-example.json diff --git a/crates/fhir/tests/data/R4/testreport-questionnaire.json b/crates/fhir/tests/data/json/R4/testreport-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/testreport-questionnaire.json rename to crates/fhir/tests/data/json/R4/testreport-questionnaire.json diff --git a/crates/fhir/tests/data/R4/testreport.profile.json b/crates/fhir/tests/data/json/R4/testreport.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/testreport.profile.json rename to crates/fhir/tests/data/json/R4/testreport.profile.json diff --git a/crates/fhir/tests/data/R4/testscript-example-history.json b/crates/fhir/tests/data/json/R4/testscript-example-history.json similarity index 100% rename from crates/fhir/tests/data/R4/testscript-example-history.json rename to crates/fhir/tests/data/json/R4/testscript-example-history.json diff --git a/crates/fhir/tests/data/R4/testscript-example-multisystem.json b/crates/fhir/tests/data/json/R4/testscript-example-multisystem.json similarity index 100% rename from crates/fhir/tests/data/R4/testscript-example-multisystem.json rename to crates/fhir/tests/data/json/R4/testscript-example-multisystem.json diff --git a/crates/fhir/tests/data/R4/testscript-example-readtest.json b/crates/fhir/tests/data/json/R4/testscript-example-readtest.json similarity index 100% rename from crates/fhir/tests/data/R4/testscript-example-readtest.json rename to crates/fhir/tests/data/json/R4/testscript-example-readtest.json diff --git a/crates/fhir/tests/data/R4/testscript-example-search.json b/crates/fhir/tests/data/json/R4/testscript-example-search.json similarity index 100% rename from crates/fhir/tests/data/R4/testscript-example-search.json rename to crates/fhir/tests/data/json/R4/testscript-example-search.json diff --git a/crates/fhir/tests/data/R4/testscript-example-update.json b/crates/fhir/tests/data/json/R4/testscript-example-update.json similarity index 100% rename from crates/fhir/tests/data/R4/testscript-example-update.json rename to crates/fhir/tests/data/json/R4/testscript-example-update.json diff --git a/crates/fhir/tests/data/R4/testscript-example.json b/crates/fhir/tests/data/json/R4/testscript-example.json similarity index 100% rename from crates/fhir/tests/data/R4/testscript-example.json rename to crates/fhir/tests/data/json/R4/testscript-example.json diff --git a/crates/fhir/tests/data/R4/testscript-questionnaire.json b/crates/fhir/tests/data/json/R4/testscript-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/testscript-questionnaire.json rename to crates/fhir/tests/data/json/R4/testscript-questionnaire.json diff --git a/crates/fhir/tests/data/R4/testscript.profile.json b/crates/fhir/tests/data/json/R4/testscript.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/testscript.profile.json rename to crates/fhir/tests/data/json/R4/testscript.profile.json diff --git a/crates/fhir/tests/data/R4/time.profile.json b/crates/fhir/tests/data/json/R4/time.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/time.profile.json rename to crates/fhir/tests/data/json/R4/time.profile.json diff --git a/crates/fhir/tests/data/R4/timing.profile.json b/crates/fhir/tests/data/json/R4/timing.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/timing.profile.json rename to crates/fhir/tests/data/json/R4/timing.profile.json diff --git a/crates/fhir/tests/data/R4/triggerdefinition.profile.json b/crates/fhir/tests/data/json/R4/triggerdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/triggerdefinition.profile.json rename to crates/fhir/tests/data/json/R4/triggerdefinition.profile.json diff --git a/crates/fhir/tests/data/R4/triglyceride-questionnaire.json b/crates/fhir/tests/data/json/R4/triglyceride-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/triglyceride-questionnaire.json rename to crates/fhir/tests/data/json/R4/triglyceride-questionnaire.json diff --git a/crates/fhir/tests/data/R4/triglyceride.profile.json b/crates/fhir/tests/data/json/R4/triglyceride.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/triglyceride.profile.json rename to crates/fhir/tests/data/json/R4/triglyceride.profile.json diff --git a/crates/fhir/tests/data/R4/unsignedint.profile.json b/crates/fhir/tests/data/json/R4/unsignedint.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/unsignedint.profile.json rename to crates/fhir/tests/data/json/R4/unsignedint.profile.json diff --git a/crates/fhir/tests/data/R4/uri.profile.json b/crates/fhir/tests/data/json/R4/uri.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/uri.profile.json rename to crates/fhir/tests/data/json/R4/uri.profile.json diff --git a/crates/fhir/tests/data/R4/url.profile.json b/crates/fhir/tests/data/json/R4/url.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/url.profile.json rename to crates/fhir/tests/data/json/R4/url.profile.json diff --git a/crates/fhir/tests/data/R4/usagecontext.profile.json b/crates/fhir/tests/data/json/R4/usagecontext.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/usagecontext.profile.json rename to crates/fhir/tests/data/json/R4/usagecontext.profile.json diff --git a/crates/fhir/tests/data/R4/uuid.profile.json b/crates/fhir/tests/data/json/R4/uuid.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/uuid.profile.json rename to crates/fhir/tests/data/json/R4/uuid.profile.json diff --git a/crates/fhir/tests/data/R4/v2-tables.json b/crates/fhir/tests/data/json/R4/v2-tables.json similarity index 100% rename from crates/fhir/tests/data/R4/v2-tables.json rename to crates/fhir/tests/data/json/R4/v2-tables.json diff --git a/crates/fhir/tests/data/R4/v3-codesystems.json b/crates/fhir/tests/data/json/R4/v3-codesystems.json similarity index 100% rename from crates/fhir/tests/data/R4/v3-codesystems.json rename to crates/fhir/tests/data/json/R4/v3-codesystems.json diff --git a/crates/fhir/tests/data/R4/valueset-FHIR-version.json b/crates/fhir/tests/data/json/R4/valueset-FHIR-version.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-FHIR-version.json rename to crates/fhir/tests/data/json/R4/valueset-FHIR-version.json diff --git a/crates/fhir/tests/data/R4/valueset-abstract-types.json b/crates/fhir/tests/data/json/R4/valueset-abstract-types.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-abstract-types.json rename to crates/fhir/tests/data/json/R4/valueset-abstract-types.json diff --git a/crates/fhir/tests/data/R4/valueset-account-status.json b/crates/fhir/tests/data/json/R4/valueset-account-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-account-status.json rename to crates/fhir/tests/data/json/R4/valueset-account-status.json diff --git a/crates/fhir/tests/data/R4/valueset-account-type.json b/crates/fhir/tests/data/json/R4/valueset-account-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-account-type.json rename to crates/fhir/tests/data/json/R4/valueset-account-type.json diff --git a/crates/fhir/tests/data/R4/valueset-action-cardinality-behavior.json b/crates/fhir/tests/data/json/R4/valueset-action-cardinality-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-action-cardinality-behavior.json rename to crates/fhir/tests/data/json/R4/valueset-action-cardinality-behavior.json diff --git a/crates/fhir/tests/data/R4/valueset-action-condition-kind.json b/crates/fhir/tests/data/json/R4/valueset-action-condition-kind.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-action-condition-kind.json rename to crates/fhir/tests/data/json/R4/valueset-action-condition-kind.json diff --git a/crates/fhir/tests/data/R4/valueset-action-grouping-behavior.json b/crates/fhir/tests/data/json/R4/valueset-action-grouping-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-action-grouping-behavior.json rename to crates/fhir/tests/data/json/R4/valueset-action-grouping-behavior.json diff --git a/crates/fhir/tests/data/R4/valueset-action-participant-role.json b/crates/fhir/tests/data/json/R4/valueset-action-participant-role.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-action-participant-role.json rename to crates/fhir/tests/data/json/R4/valueset-action-participant-role.json diff --git a/crates/fhir/tests/data/R4/valueset-action-participant-type.json b/crates/fhir/tests/data/json/R4/valueset-action-participant-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-action-participant-type.json rename to crates/fhir/tests/data/json/R4/valueset-action-participant-type.json diff --git a/crates/fhir/tests/data/R4/valueset-action-precheck-behavior.json b/crates/fhir/tests/data/json/R4/valueset-action-precheck-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-action-precheck-behavior.json rename to crates/fhir/tests/data/json/R4/valueset-action-precheck-behavior.json diff --git a/crates/fhir/tests/data/R4/valueset-action-relationship-type.json b/crates/fhir/tests/data/json/R4/valueset-action-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-action-relationship-type.json rename to crates/fhir/tests/data/json/R4/valueset-action-relationship-type.json diff --git a/crates/fhir/tests/data/R4/valueset-action-required-behavior.json b/crates/fhir/tests/data/json/R4/valueset-action-required-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-action-required-behavior.json rename to crates/fhir/tests/data/json/R4/valueset-action-required-behavior.json diff --git a/crates/fhir/tests/data/R4/valueset-action-selection-behavior.json b/crates/fhir/tests/data/json/R4/valueset-action-selection-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-action-selection-behavior.json rename to crates/fhir/tests/data/json/R4/valueset-action-selection-behavior.json diff --git a/crates/fhir/tests/data/R4/valueset-action-type.json b/crates/fhir/tests/data/json/R4/valueset-action-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-action-type.json rename to crates/fhir/tests/data/json/R4/valueset-action-type.json diff --git a/crates/fhir/tests/data/R4/valueset-activity-definition-category.json b/crates/fhir/tests/data/json/R4/valueset-activity-definition-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-activity-definition-category.json rename to crates/fhir/tests/data/json/R4/valueset-activity-definition-category.json diff --git a/crates/fhir/tests/data/R4/valueset-additional-instruction-codes.json b/crates/fhir/tests/data/json/R4/valueset-additional-instruction-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-additional-instruction-codes.json rename to crates/fhir/tests/data/json/R4/valueset-additional-instruction-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-additionalmaterials.json b/crates/fhir/tests/data/json/R4/valueset-additionalmaterials.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-additionalmaterials.json rename to crates/fhir/tests/data/json/R4/valueset-additionalmaterials.json diff --git a/crates/fhir/tests/data/R4/valueset-address-type.json b/crates/fhir/tests/data/json/R4/valueset-address-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-address-type.json rename to crates/fhir/tests/data/json/R4/valueset-address-type.json diff --git a/crates/fhir/tests/data/R4/valueset-address-use.json b/crates/fhir/tests/data/json/R4/valueset-address-use.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-address-use.json rename to crates/fhir/tests/data/json/R4/valueset-address-use.json diff --git a/crates/fhir/tests/data/R4/valueset-adjudication-error.json b/crates/fhir/tests/data/json/R4/valueset-adjudication-error.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-adjudication-error.json rename to crates/fhir/tests/data/json/R4/valueset-adjudication-error.json diff --git a/crates/fhir/tests/data/R4/valueset-adjudication-reason.json b/crates/fhir/tests/data/json/R4/valueset-adjudication-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-adjudication-reason.json rename to crates/fhir/tests/data/json/R4/valueset-adjudication-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-adjudication.json b/crates/fhir/tests/data/json/R4/valueset-adjudication.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-adjudication.json rename to crates/fhir/tests/data/json/R4/valueset-adjudication.json diff --git a/crates/fhir/tests/data/R4/valueset-administration-method-codes.json b/crates/fhir/tests/data/json/R4/valueset-administration-method-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-administration-method-codes.json rename to crates/fhir/tests/data/json/R4/valueset-administration-method-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-administrative-gender.json b/crates/fhir/tests/data/json/R4/valueset-administrative-gender.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-administrative-gender.json rename to crates/fhir/tests/data/json/R4/valueset-administrative-gender.json diff --git a/crates/fhir/tests/data/R4/valueset-adverse-event-actuality.json b/crates/fhir/tests/data/json/R4/valueset-adverse-event-actuality.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-adverse-event-actuality.json rename to crates/fhir/tests/data/json/R4/valueset-adverse-event-actuality.json diff --git a/crates/fhir/tests/data/R4/valueset-adverse-event-category.json b/crates/fhir/tests/data/json/R4/valueset-adverse-event-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-adverse-event-category.json rename to crates/fhir/tests/data/json/R4/valueset-adverse-event-category.json diff --git a/crates/fhir/tests/data/R4/valueset-adverse-event-causality-assess.json b/crates/fhir/tests/data/json/R4/valueset-adverse-event-causality-assess.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-adverse-event-causality-assess.json rename to crates/fhir/tests/data/json/R4/valueset-adverse-event-causality-assess.json diff --git a/crates/fhir/tests/data/R4/valueset-adverse-event-causality-method.json b/crates/fhir/tests/data/json/R4/valueset-adverse-event-causality-method.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-adverse-event-causality-method.json rename to crates/fhir/tests/data/json/R4/valueset-adverse-event-causality-method.json diff --git a/crates/fhir/tests/data/R4/valueset-adverse-event-outcome.json b/crates/fhir/tests/data/json/R4/valueset-adverse-event-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-adverse-event-outcome.json rename to crates/fhir/tests/data/json/R4/valueset-adverse-event-outcome.json diff --git a/crates/fhir/tests/data/R4/valueset-adverse-event-seriousness.json b/crates/fhir/tests/data/json/R4/valueset-adverse-event-seriousness.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-adverse-event-seriousness.json rename to crates/fhir/tests/data/json/R4/valueset-adverse-event-seriousness.json diff --git a/crates/fhir/tests/data/R4/valueset-adverse-event-severity.json b/crates/fhir/tests/data/json/R4/valueset-adverse-event-severity.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-adverse-event-severity.json rename to crates/fhir/tests/data/json/R4/valueset-adverse-event-severity.json diff --git a/crates/fhir/tests/data/R4/valueset-adverse-event-type.json b/crates/fhir/tests/data/json/R4/valueset-adverse-event-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-adverse-event-type.json rename to crates/fhir/tests/data/json/R4/valueset-adverse-event-type.json diff --git a/crates/fhir/tests/data/R4/valueset-age-units.json b/crates/fhir/tests/data/json/R4/valueset-age-units.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-age-units.json rename to crates/fhir/tests/data/json/R4/valueset-age-units.json diff --git a/crates/fhir/tests/data/R4/valueset-all-distance-units.json b/crates/fhir/tests/data/json/R4/valueset-all-distance-units.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-all-distance-units.json rename to crates/fhir/tests/data/json/R4/valueset-all-distance-units.json diff --git a/crates/fhir/tests/data/R4/valueset-all-languages.json b/crates/fhir/tests/data/json/R4/valueset-all-languages.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-all-languages.json rename to crates/fhir/tests/data/json/R4/valueset-all-languages.json diff --git a/crates/fhir/tests/data/R4/valueset-all-time-units.json b/crates/fhir/tests/data/json/R4/valueset-all-time-units.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-all-time-units.json rename to crates/fhir/tests/data/json/R4/valueset-all-time-units.json diff --git a/crates/fhir/tests/data/R4/valueset-all-types.json b/crates/fhir/tests/data/json/R4/valueset-all-types.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-all-types.json rename to crates/fhir/tests/data/json/R4/valueset-all-types.json diff --git a/crates/fhir/tests/data/R4/valueset-allelename.json b/crates/fhir/tests/data/json/R4/valueset-allelename.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-allelename.json rename to crates/fhir/tests/data/json/R4/valueset-allelename.json diff --git a/crates/fhir/tests/data/R4/valueset-allerg-intol-substance-exp-risk.json b/crates/fhir/tests/data/json/R4/valueset-allerg-intol-substance-exp-risk.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-allerg-intol-substance-exp-risk.json rename to crates/fhir/tests/data/json/R4/valueset-allerg-intol-substance-exp-risk.json diff --git a/crates/fhir/tests/data/R4/valueset-allergy-intolerance-category.json b/crates/fhir/tests/data/json/R4/valueset-allergy-intolerance-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-allergy-intolerance-category.json rename to crates/fhir/tests/data/json/R4/valueset-allergy-intolerance-category.json diff --git a/crates/fhir/tests/data/R4/valueset-allergy-intolerance-criticality.json b/crates/fhir/tests/data/json/R4/valueset-allergy-intolerance-criticality.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-allergy-intolerance-criticality.json rename to crates/fhir/tests/data/json/R4/valueset-allergy-intolerance-criticality.json diff --git a/crates/fhir/tests/data/R4/valueset-allergy-intolerance-type.json b/crates/fhir/tests/data/json/R4/valueset-allergy-intolerance-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-allergy-intolerance-type.json rename to crates/fhir/tests/data/json/R4/valueset-allergy-intolerance-type.json diff --git a/crates/fhir/tests/data/R4/valueset-allergyintolerance-clinical.json b/crates/fhir/tests/data/json/R4/valueset-allergyintolerance-clinical.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-allergyintolerance-clinical.json rename to crates/fhir/tests/data/json/R4/valueset-allergyintolerance-clinical.json diff --git a/crates/fhir/tests/data/R4/valueset-allergyintolerance-code.json b/crates/fhir/tests/data/json/R4/valueset-allergyintolerance-code.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-allergyintolerance-code.json rename to crates/fhir/tests/data/json/R4/valueset-allergyintolerance-code.json diff --git a/crates/fhir/tests/data/R4/valueset-allergyintolerance-verification.json b/crates/fhir/tests/data/json/R4/valueset-allergyintolerance-verification.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-allergyintolerance-verification.json rename to crates/fhir/tests/data/json/R4/valueset-allergyintolerance-verification.json diff --git a/crates/fhir/tests/data/R4/valueset-animal-breeds.json b/crates/fhir/tests/data/json/R4/valueset-animal-breeds.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-animal-breeds.json rename to crates/fhir/tests/data/json/R4/valueset-animal-breeds.json diff --git a/crates/fhir/tests/data/R4/valueset-animal-genderstatus.json b/crates/fhir/tests/data/json/R4/valueset-animal-genderstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-animal-genderstatus.json rename to crates/fhir/tests/data/json/R4/valueset-animal-genderstatus.json diff --git a/crates/fhir/tests/data/R4/valueset-animal-species.json b/crates/fhir/tests/data/json/R4/valueset-animal-species.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-animal-species.json rename to crates/fhir/tests/data/json/R4/valueset-animal-species.json diff --git a/crates/fhir/tests/data/R4/valueset-appointment-cancellation-reason.json b/crates/fhir/tests/data/json/R4/valueset-appointment-cancellation-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-appointment-cancellation-reason.json rename to crates/fhir/tests/data/json/R4/valueset-appointment-cancellation-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-appointmentstatus.json b/crates/fhir/tests/data/json/R4/valueset-appointmentstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-appointmentstatus.json rename to crates/fhir/tests/data/json/R4/valueset-appointmentstatus.json diff --git a/crates/fhir/tests/data/R4/valueset-approach-site-codes.json b/crates/fhir/tests/data/json/R4/valueset-approach-site-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-approach-site-codes.json rename to crates/fhir/tests/data/json/R4/valueset-approach-site-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-assert-direction-codes.json b/crates/fhir/tests/data/json/R4/valueset-assert-direction-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-assert-direction-codes.json rename to crates/fhir/tests/data/json/R4/valueset-assert-direction-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-assert-operator-codes.json b/crates/fhir/tests/data/json/R4/valueset-assert-operator-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-assert-operator-codes.json rename to crates/fhir/tests/data/json/R4/valueset-assert-operator-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-assert-response-code-types.json b/crates/fhir/tests/data/json/R4/valueset-assert-response-code-types.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-assert-response-code-types.json rename to crates/fhir/tests/data/json/R4/valueset-assert-response-code-types.json diff --git a/crates/fhir/tests/data/R4/valueset-asset-availability.json b/crates/fhir/tests/data/json/R4/valueset-asset-availability.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-asset-availability.json rename to crates/fhir/tests/data/json/R4/valueset-asset-availability.json diff --git a/crates/fhir/tests/data/R4/valueset-audit-entity-type.json b/crates/fhir/tests/data/json/R4/valueset-audit-entity-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-audit-entity-type.json rename to crates/fhir/tests/data/json/R4/valueset-audit-entity-type.json diff --git a/crates/fhir/tests/data/R4/valueset-audit-event-action.json b/crates/fhir/tests/data/json/R4/valueset-audit-event-action.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-audit-event-action.json rename to crates/fhir/tests/data/json/R4/valueset-audit-event-action.json diff --git a/crates/fhir/tests/data/R4/valueset-audit-event-outcome.json b/crates/fhir/tests/data/json/R4/valueset-audit-event-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-audit-event-outcome.json rename to crates/fhir/tests/data/json/R4/valueset-audit-event-outcome.json diff --git a/crates/fhir/tests/data/R4/valueset-audit-event-sub-type.json b/crates/fhir/tests/data/json/R4/valueset-audit-event-sub-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-audit-event-sub-type.json rename to crates/fhir/tests/data/json/R4/valueset-audit-event-sub-type.json diff --git a/crates/fhir/tests/data/R4/valueset-audit-event-type.json b/crates/fhir/tests/data/json/R4/valueset-audit-event-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-audit-event-type.json rename to crates/fhir/tests/data/json/R4/valueset-audit-event-type.json diff --git a/crates/fhir/tests/data/R4/valueset-audit-source-type.json b/crates/fhir/tests/data/json/R4/valueset-audit-source-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-audit-source-type.json rename to crates/fhir/tests/data/json/R4/valueset-audit-source-type.json diff --git a/crates/fhir/tests/data/R4/valueset-basic-resource-type.json b/crates/fhir/tests/data/json/R4/valueset-basic-resource-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-basic-resource-type.json rename to crates/fhir/tests/data/json/R4/valueset-basic-resource-type.json diff --git a/crates/fhir/tests/data/R4/valueset-benefit-network.json b/crates/fhir/tests/data/json/R4/valueset-benefit-network.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-benefit-network.json rename to crates/fhir/tests/data/json/R4/valueset-benefit-network.json diff --git a/crates/fhir/tests/data/R4/valueset-benefit-term.json b/crates/fhir/tests/data/json/R4/valueset-benefit-term.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-benefit-term.json rename to crates/fhir/tests/data/json/R4/valueset-benefit-term.json diff --git a/crates/fhir/tests/data/R4/valueset-benefit-type.json b/crates/fhir/tests/data/json/R4/valueset-benefit-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-benefit-type.json rename to crates/fhir/tests/data/json/R4/valueset-benefit-type.json diff --git a/crates/fhir/tests/data/R4/valueset-benefit-unit.json b/crates/fhir/tests/data/json/R4/valueset-benefit-unit.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-benefit-unit.json rename to crates/fhir/tests/data/json/R4/valueset-benefit-unit.json diff --git a/crates/fhir/tests/data/R4/valueset-binding-strength.json b/crates/fhir/tests/data/json/R4/valueset-binding-strength.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-binding-strength.json rename to crates/fhir/tests/data/json/R4/valueset-binding-strength.json diff --git a/crates/fhir/tests/data/R4/valueset-body-site.json b/crates/fhir/tests/data/json/R4/valueset-body-site.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-body-site.json rename to crates/fhir/tests/data/json/R4/valueset-body-site.json diff --git a/crates/fhir/tests/data/R4/valueset-bodysite-laterality.json b/crates/fhir/tests/data/json/R4/valueset-bodysite-laterality.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-bodysite-laterality.json rename to crates/fhir/tests/data/json/R4/valueset-bodysite-laterality.json diff --git a/crates/fhir/tests/data/R4/valueset-bodystructure-code.json b/crates/fhir/tests/data/json/R4/valueset-bodystructure-code.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-bodystructure-code.json rename to crates/fhir/tests/data/json/R4/valueset-bodystructure-code.json diff --git a/crates/fhir/tests/data/R4/valueset-bodystructure-relative-location.json b/crates/fhir/tests/data/json/R4/valueset-bodystructure-relative-location.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-bodystructure-relative-location.json rename to crates/fhir/tests/data/json/R4/valueset-bodystructure-relative-location.json diff --git a/crates/fhir/tests/data/R4/valueset-bundle-type.json b/crates/fhir/tests/data/json/R4/valueset-bundle-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-bundle-type.json rename to crates/fhir/tests/data/json/R4/valueset-bundle-type.json diff --git a/crates/fhir/tests/data/R4/valueset-c80-doc-typecodes.json b/crates/fhir/tests/data/json/R4/valueset-c80-doc-typecodes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-c80-doc-typecodes.json rename to crates/fhir/tests/data/json/R4/valueset-c80-doc-typecodes.json diff --git a/crates/fhir/tests/data/R4/valueset-c80-facilitycodes.json b/crates/fhir/tests/data/json/R4/valueset-c80-facilitycodes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-c80-facilitycodes.json rename to crates/fhir/tests/data/json/R4/valueset-c80-facilitycodes.json diff --git a/crates/fhir/tests/data/R4/valueset-c80-practice-codes.json b/crates/fhir/tests/data/json/R4/valueset-c80-practice-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-c80-practice-codes.json rename to crates/fhir/tests/data/json/R4/valueset-c80-practice-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-capability-statement-kind.json b/crates/fhir/tests/data/json/R4/valueset-capability-statement-kind.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-capability-statement-kind.json rename to crates/fhir/tests/data/json/R4/valueset-capability-statement-kind.json diff --git a/crates/fhir/tests/data/R4/valueset-care-plan-activity-kind.json b/crates/fhir/tests/data/json/R4/valueset-care-plan-activity-kind.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-care-plan-activity-kind.json rename to crates/fhir/tests/data/json/R4/valueset-care-plan-activity-kind.json diff --git a/crates/fhir/tests/data/R4/valueset-care-plan-activity-outcome.json b/crates/fhir/tests/data/json/R4/valueset-care-plan-activity-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-care-plan-activity-outcome.json rename to crates/fhir/tests/data/json/R4/valueset-care-plan-activity-outcome.json diff --git a/crates/fhir/tests/data/R4/valueset-care-plan-activity-status.json b/crates/fhir/tests/data/json/R4/valueset-care-plan-activity-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-care-plan-activity-status.json rename to crates/fhir/tests/data/json/R4/valueset-care-plan-activity-status.json diff --git a/crates/fhir/tests/data/R4/valueset-care-plan-category.json b/crates/fhir/tests/data/json/R4/valueset-care-plan-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-care-plan-category.json rename to crates/fhir/tests/data/json/R4/valueset-care-plan-category.json diff --git a/crates/fhir/tests/data/R4/valueset-care-plan-intent.json b/crates/fhir/tests/data/json/R4/valueset-care-plan-intent.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-care-plan-intent.json rename to crates/fhir/tests/data/json/R4/valueset-care-plan-intent.json diff --git a/crates/fhir/tests/data/R4/valueset-care-team-category.json b/crates/fhir/tests/data/json/R4/valueset-care-team-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-care-team-category.json rename to crates/fhir/tests/data/json/R4/valueset-care-team-category.json diff --git a/crates/fhir/tests/data/R4/valueset-care-team-status.json b/crates/fhir/tests/data/json/R4/valueset-care-team-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-care-team-status.json rename to crates/fhir/tests/data/json/R4/valueset-care-team-status.json diff --git a/crates/fhir/tests/data/R4/valueset-catalogType.json b/crates/fhir/tests/data/json/R4/valueset-catalogType.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-catalogType.json rename to crates/fhir/tests/data/json/R4/valueset-catalogType.json diff --git a/crates/fhir/tests/data/R4/valueset-cdshooks-indicator.json b/crates/fhir/tests/data/json/R4/valueset-cdshooks-indicator.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-cdshooks-indicator.json rename to crates/fhir/tests/data/json/R4/valueset-cdshooks-indicator.json diff --git a/crates/fhir/tests/data/R4/valueset-certainty-subcomponent-rating.json b/crates/fhir/tests/data/json/R4/valueset-certainty-subcomponent-rating.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-certainty-subcomponent-rating.json rename to crates/fhir/tests/data/json/R4/valueset-certainty-subcomponent-rating.json diff --git a/crates/fhir/tests/data/R4/valueset-certainty-subcomponent-type.json b/crates/fhir/tests/data/json/R4/valueset-certainty-subcomponent-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-certainty-subcomponent-type.json rename to crates/fhir/tests/data/json/R4/valueset-certainty-subcomponent-type.json diff --git a/crates/fhir/tests/data/R4/valueset-chargeitem-billingcodes.json b/crates/fhir/tests/data/json/R4/valueset-chargeitem-billingcodes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-chargeitem-billingcodes.json rename to crates/fhir/tests/data/json/R4/valueset-chargeitem-billingcodes.json diff --git a/crates/fhir/tests/data/R4/valueset-chargeitem-status.json b/crates/fhir/tests/data/json/R4/valueset-chargeitem-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-chargeitem-status.json rename to crates/fhir/tests/data/json/R4/valueset-chargeitem-status.json diff --git a/crates/fhir/tests/data/R4/valueset-choice-list-orientation.json b/crates/fhir/tests/data/json/R4/valueset-choice-list-orientation.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-choice-list-orientation.json rename to crates/fhir/tests/data/json/R4/valueset-choice-list-orientation.json diff --git a/crates/fhir/tests/data/R4/valueset-chromosome-human.json b/crates/fhir/tests/data/json/R4/valueset-chromosome-human.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-chromosome-human.json rename to crates/fhir/tests/data/json/R4/valueset-chromosome-human.json diff --git a/crates/fhir/tests/data/R4/valueset-claim-careteamrole.json b/crates/fhir/tests/data/json/R4/valueset-claim-careteamrole.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-claim-careteamrole.json rename to crates/fhir/tests/data/json/R4/valueset-claim-careteamrole.json diff --git a/crates/fhir/tests/data/R4/valueset-claim-exception.json b/crates/fhir/tests/data/json/R4/valueset-claim-exception.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-claim-exception.json rename to crates/fhir/tests/data/json/R4/valueset-claim-exception.json diff --git a/crates/fhir/tests/data/R4/valueset-claim-informationcategory.json b/crates/fhir/tests/data/json/R4/valueset-claim-informationcategory.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-claim-informationcategory.json rename to crates/fhir/tests/data/json/R4/valueset-claim-informationcategory.json diff --git a/crates/fhir/tests/data/R4/valueset-claim-modifiers.json b/crates/fhir/tests/data/json/R4/valueset-claim-modifiers.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-claim-modifiers.json rename to crates/fhir/tests/data/json/R4/valueset-claim-modifiers.json diff --git a/crates/fhir/tests/data/R4/valueset-claim-subtype.json b/crates/fhir/tests/data/json/R4/valueset-claim-subtype.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-claim-subtype.json rename to crates/fhir/tests/data/json/R4/valueset-claim-subtype.json diff --git a/crates/fhir/tests/data/R4/valueset-claim-type.json b/crates/fhir/tests/data/json/R4/valueset-claim-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-claim-type.json rename to crates/fhir/tests/data/json/R4/valueset-claim-type.json diff --git a/crates/fhir/tests/data/R4/valueset-claim-use.json b/crates/fhir/tests/data/json/R4/valueset-claim-use.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-claim-use.json rename to crates/fhir/tests/data/json/R4/valueset-claim-use.json diff --git a/crates/fhir/tests/data/R4/valueset-clinical-findings.json b/crates/fhir/tests/data/json/R4/valueset-clinical-findings.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-clinical-findings.json rename to crates/fhir/tests/data/json/R4/valueset-clinical-findings.json diff --git a/crates/fhir/tests/data/R4/valueset-clinicalimpression-prognosis.json b/crates/fhir/tests/data/json/R4/valueset-clinicalimpression-prognosis.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-clinicalimpression-prognosis.json rename to crates/fhir/tests/data/json/R4/valueset-clinicalimpression-prognosis.json diff --git a/crates/fhir/tests/data/R4/valueset-clinicalimpression-status.json b/crates/fhir/tests/data/json/R4/valueset-clinicalimpression-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-clinicalimpression-status.json rename to crates/fhir/tests/data/json/R4/valueset-clinicalimpression-status.json diff --git a/crates/fhir/tests/data/R4/valueset-clinvar.json b/crates/fhir/tests/data/json/R4/valueset-clinvar.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-clinvar.json rename to crates/fhir/tests/data/json/R4/valueset-clinvar.json diff --git a/crates/fhir/tests/data/R4/valueset-code-search-support.json b/crates/fhir/tests/data/json/R4/valueset-code-search-support.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-code-search-support.json rename to crates/fhir/tests/data/json/R4/valueset-code-search-support.json diff --git a/crates/fhir/tests/data/R4/valueset-codesystem-altcode-kind.json b/crates/fhir/tests/data/json/R4/valueset-codesystem-altcode-kind.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-codesystem-altcode-kind.json rename to crates/fhir/tests/data/json/R4/valueset-codesystem-altcode-kind.json diff --git a/crates/fhir/tests/data/R4/valueset-codesystem-content-mode.json b/crates/fhir/tests/data/json/R4/valueset-codesystem-content-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-codesystem-content-mode.json rename to crates/fhir/tests/data/json/R4/valueset-codesystem-content-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-codesystem-hierarchy-meaning.json b/crates/fhir/tests/data/json/R4/valueset-codesystem-hierarchy-meaning.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-codesystem-hierarchy-meaning.json rename to crates/fhir/tests/data/json/R4/valueset-codesystem-hierarchy-meaning.json diff --git a/crates/fhir/tests/data/R4/valueset-common-tags.json b/crates/fhir/tests/data/json/R4/valueset-common-tags.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-common-tags.json rename to crates/fhir/tests/data/json/R4/valueset-common-tags.json diff --git a/crates/fhir/tests/data/R4/valueset-communication-category.json b/crates/fhir/tests/data/json/R4/valueset-communication-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-communication-category.json rename to crates/fhir/tests/data/json/R4/valueset-communication-category.json diff --git a/crates/fhir/tests/data/R4/valueset-communication-not-done-reason.json b/crates/fhir/tests/data/json/R4/valueset-communication-not-done-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-communication-not-done-reason.json rename to crates/fhir/tests/data/json/R4/valueset-communication-not-done-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-communication-topic.json b/crates/fhir/tests/data/json/R4/valueset-communication-topic.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-communication-topic.json rename to crates/fhir/tests/data/json/R4/valueset-communication-topic.json diff --git a/crates/fhir/tests/data/R4/valueset-compartment-type.json b/crates/fhir/tests/data/json/R4/valueset-compartment-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-compartment-type.json rename to crates/fhir/tests/data/json/R4/valueset-compartment-type.json diff --git a/crates/fhir/tests/data/R4/valueset-composite-measure-scoring.json b/crates/fhir/tests/data/json/R4/valueset-composite-measure-scoring.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-composite-measure-scoring.json rename to crates/fhir/tests/data/json/R4/valueset-composite-measure-scoring.json diff --git a/crates/fhir/tests/data/R4/valueset-composition-altcode-kind.json b/crates/fhir/tests/data/json/R4/valueset-composition-altcode-kind.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-composition-altcode-kind.json rename to crates/fhir/tests/data/json/R4/valueset-composition-altcode-kind.json diff --git a/crates/fhir/tests/data/R4/valueset-composition-attestation-mode.json b/crates/fhir/tests/data/json/R4/valueset-composition-attestation-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-composition-attestation-mode.json rename to crates/fhir/tests/data/json/R4/valueset-composition-attestation-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-composition-status.json b/crates/fhir/tests/data/json/R4/valueset-composition-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-composition-status.json rename to crates/fhir/tests/data/json/R4/valueset-composition-status.json diff --git a/crates/fhir/tests/data/R4/valueset-concept-map-equivalence.json b/crates/fhir/tests/data/json/R4/valueset-concept-map-equivalence.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-concept-map-equivalence.json rename to crates/fhir/tests/data/json/R4/valueset-concept-map-equivalence.json diff --git a/crates/fhir/tests/data/R4/valueset-concept-property-type.json b/crates/fhir/tests/data/json/R4/valueset-concept-property-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-concept-property-type.json rename to crates/fhir/tests/data/json/R4/valueset-concept-property-type.json diff --git a/crates/fhir/tests/data/R4/valueset-concept-subsumption-outcome.json b/crates/fhir/tests/data/json/R4/valueset-concept-subsumption-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-concept-subsumption-outcome.json rename to crates/fhir/tests/data/json/R4/valueset-concept-subsumption-outcome.json diff --git a/crates/fhir/tests/data/R4/valueset-conceptmap-unmapped-mode.json b/crates/fhir/tests/data/json/R4/valueset-conceptmap-unmapped-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-conceptmap-unmapped-mode.json rename to crates/fhir/tests/data/json/R4/valueset-conceptmap-unmapped-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-condition-category.json b/crates/fhir/tests/data/json/R4/valueset-condition-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-condition-category.json rename to crates/fhir/tests/data/json/R4/valueset-condition-category.json diff --git a/crates/fhir/tests/data/R4/valueset-condition-cause.json b/crates/fhir/tests/data/json/R4/valueset-condition-cause.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-condition-cause.json rename to crates/fhir/tests/data/json/R4/valueset-condition-cause.json diff --git a/crates/fhir/tests/data/R4/valueset-condition-clinical.json b/crates/fhir/tests/data/json/R4/valueset-condition-clinical.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-condition-clinical.json rename to crates/fhir/tests/data/json/R4/valueset-condition-clinical.json diff --git a/crates/fhir/tests/data/R4/valueset-condition-code.json b/crates/fhir/tests/data/json/R4/valueset-condition-code.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-condition-code.json rename to crates/fhir/tests/data/json/R4/valueset-condition-code.json diff --git a/crates/fhir/tests/data/R4/valueset-condition-outcome.json b/crates/fhir/tests/data/json/R4/valueset-condition-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-condition-outcome.json rename to crates/fhir/tests/data/json/R4/valueset-condition-outcome.json diff --git a/crates/fhir/tests/data/R4/valueset-condition-predecessor.json b/crates/fhir/tests/data/json/R4/valueset-condition-predecessor.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-condition-predecessor.json rename to crates/fhir/tests/data/json/R4/valueset-condition-predecessor.json diff --git a/crates/fhir/tests/data/R4/valueset-condition-severity.json b/crates/fhir/tests/data/json/R4/valueset-condition-severity.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-condition-severity.json rename to crates/fhir/tests/data/json/R4/valueset-condition-severity.json diff --git a/crates/fhir/tests/data/R4/valueset-condition-stage-type.json b/crates/fhir/tests/data/json/R4/valueset-condition-stage-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-condition-stage-type.json rename to crates/fhir/tests/data/json/R4/valueset-condition-stage-type.json diff --git a/crates/fhir/tests/data/R4/valueset-condition-stage.json b/crates/fhir/tests/data/json/R4/valueset-condition-stage.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-condition-stage.json rename to crates/fhir/tests/data/json/R4/valueset-condition-stage.json diff --git a/crates/fhir/tests/data/R4/valueset-condition-state.json b/crates/fhir/tests/data/json/R4/valueset-condition-state.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-condition-state.json rename to crates/fhir/tests/data/json/R4/valueset-condition-state.json diff --git a/crates/fhir/tests/data/R4/valueset-condition-ver-status.json b/crates/fhir/tests/data/json/R4/valueset-condition-ver-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-condition-ver-status.json rename to crates/fhir/tests/data/json/R4/valueset-condition-ver-status.json diff --git a/crates/fhir/tests/data/R4/valueset-conditional-delete-status.json b/crates/fhir/tests/data/json/R4/valueset-conditional-delete-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-conditional-delete-status.json rename to crates/fhir/tests/data/json/R4/valueset-conditional-delete-status.json diff --git a/crates/fhir/tests/data/R4/valueset-conditional-read-status.json b/crates/fhir/tests/data/json/R4/valueset-conditional-read-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-conditional-read-status.json rename to crates/fhir/tests/data/json/R4/valueset-conditional-read-status.json diff --git a/crates/fhir/tests/data/R4/valueset-conformance-expectation.json b/crates/fhir/tests/data/json/R4/valueset-conformance-expectation.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-conformance-expectation.json rename to crates/fhir/tests/data/json/R4/valueset-conformance-expectation.json diff --git a/crates/fhir/tests/data/R4/valueset-consent-action.json b/crates/fhir/tests/data/json/R4/valueset-consent-action.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-consent-action.json rename to crates/fhir/tests/data/json/R4/valueset-consent-action.json diff --git a/crates/fhir/tests/data/R4/valueset-consent-category.json b/crates/fhir/tests/data/json/R4/valueset-consent-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-consent-category.json rename to crates/fhir/tests/data/json/R4/valueset-consent-category.json diff --git a/crates/fhir/tests/data/R4/valueset-consent-content-class.json b/crates/fhir/tests/data/json/R4/valueset-consent-content-class.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-consent-content-class.json rename to crates/fhir/tests/data/json/R4/valueset-consent-content-class.json diff --git a/crates/fhir/tests/data/R4/valueset-consent-content-code.json b/crates/fhir/tests/data/json/R4/valueset-consent-content-code.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-consent-content-code.json rename to crates/fhir/tests/data/json/R4/valueset-consent-content-code.json diff --git a/crates/fhir/tests/data/R4/valueset-consent-data-meaning.json b/crates/fhir/tests/data/json/R4/valueset-consent-data-meaning.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-consent-data-meaning.json rename to crates/fhir/tests/data/json/R4/valueset-consent-data-meaning.json diff --git a/crates/fhir/tests/data/R4/valueset-consent-performer.json b/crates/fhir/tests/data/json/R4/valueset-consent-performer.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-consent-performer.json rename to crates/fhir/tests/data/json/R4/valueset-consent-performer.json diff --git a/crates/fhir/tests/data/R4/valueset-consent-policy.json b/crates/fhir/tests/data/json/R4/valueset-consent-policy.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-consent-policy.json rename to crates/fhir/tests/data/json/R4/valueset-consent-policy.json diff --git a/crates/fhir/tests/data/R4/valueset-consent-provision-type.json b/crates/fhir/tests/data/json/R4/valueset-consent-provision-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-consent-provision-type.json rename to crates/fhir/tests/data/json/R4/valueset-consent-provision-type.json diff --git a/crates/fhir/tests/data/R4/valueset-consent-scope.json b/crates/fhir/tests/data/json/R4/valueset-consent-scope.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-consent-scope.json rename to crates/fhir/tests/data/json/R4/valueset-consent-scope.json diff --git a/crates/fhir/tests/data/R4/valueset-consent-state-codes.json b/crates/fhir/tests/data/json/R4/valueset-consent-state-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-consent-state-codes.json rename to crates/fhir/tests/data/json/R4/valueset-consent-state-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-consistency-type.json b/crates/fhir/tests/data/json/R4/valueset-consistency-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-consistency-type.json rename to crates/fhir/tests/data/json/R4/valueset-consistency-type.json diff --git a/crates/fhir/tests/data/R4/valueset-constraint-severity.json b/crates/fhir/tests/data/json/R4/valueset-constraint-severity.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-constraint-severity.json rename to crates/fhir/tests/data/json/R4/valueset-constraint-severity.json diff --git a/crates/fhir/tests/data/R4/valueset-contact-point-system.json b/crates/fhir/tests/data/json/R4/valueset-contact-point-system.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contact-point-system.json rename to crates/fhir/tests/data/json/R4/valueset-contact-point-system.json diff --git a/crates/fhir/tests/data/R4/valueset-contact-point-use.json b/crates/fhir/tests/data/json/R4/valueset-contact-point-use.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contact-point-use.json rename to crates/fhir/tests/data/json/R4/valueset-contact-point-use.json diff --git a/crates/fhir/tests/data/R4/valueset-contactentity-type.json b/crates/fhir/tests/data/json/R4/valueset-contactentity-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contactentity-type.json rename to crates/fhir/tests/data/json/R4/valueset-contactentity-type.json diff --git a/crates/fhir/tests/data/R4/valueset-container-cap.json b/crates/fhir/tests/data/json/R4/valueset-container-cap.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-container-cap.json rename to crates/fhir/tests/data/json/R4/valueset-container-cap.json diff --git a/crates/fhir/tests/data/R4/valueset-container-material.json b/crates/fhir/tests/data/json/R4/valueset-container-material.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-container-material.json rename to crates/fhir/tests/data/json/R4/valueset-container-material.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-action.json b/crates/fhir/tests/data/json/R4/valueset-contract-action.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-action.json rename to crates/fhir/tests/data/json/R4/valueset-contract-action.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-actionstatus.json b/crates/fhir/tests/data/json/R4/valueset-contract-actionstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-actionstatus.json rename to crates/fhir/tests/data/json/R4/valueset-contract-actionstatus.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-actorrole.json b/crates/fhir/tests/data/json/R4/valueset-contract-actorrole.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-actorrole.json rename to crates/fhir/tests/data/json/R4/valueset-contract-actorrole.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-assetcontext.json b/crates/fhir/tests/data/json/R4/valueset-contract-assetcontext.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-assetcontext.json rename to crates/fhir/tests/data/json/R4/valueset-contract-assetcontext.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-assetscope.json b/crates/fhir/tests/data/json/R4/valueset-contract-assetscope.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-assetscope.json rename to crates/fhir/tests/data/json/R4/valueset-contract-assetscope.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-assetsubtype.json b/crates/fhir/tests/data/json/R4/valueset-contract-assetsubtype.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-assetsubtype.json rename to crates/fhir/tests/data/json/R4/valueset-contract-assetsubtype.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-assettype.json b/crates/fhir/tests/data/json/R4/valueset-contract-assettype.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-assettype.json rename to crates/fhir/tests/data/json/R4/valueset-contract-assettype.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-content-derivative.json b/crates/fhir/tests/data/json/R4/valueset-contract-content-derivative.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-content-derivative.json rename to crates/fhir/tests/data/json/R4/valueset-contract-content-derivative.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-data-meaning.json b/crates/fhir/tests/data/json/R4/valueset-contract-data-meaning.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-data-meaning.json rename to crates/fhir/tests/data/json/R4/valueset-contract-data-meaning.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-decision-mode.json b/crates/fhir/tests/data/json/R4/valueset-contract-decision-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-decision-mode.json rename to crates/fhir/tests/data/json/R4/valueset-contract-decision-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-definition-subtype.json b/crates/fhir/tests/data/json/R4/valueset-contract-definition-subtype.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-definition-subtype.json rename to crates/fhir/tests/data/json/R4/valueset-contract-definition-subtype.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-definition-type.json b/crates/fhir/tests/data/json/R4/valueset-contract-definition-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-definition-type.json rename to crates/fhir/tests/data/json/R4/valueset-contract-definition-type.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-expiration-type.json b/crates/fhir/tests/data/json/R4/valueset-contract-expiration-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-expiration-type.json rename to crates/fhir/tests/data/json/R4/valueset-contract-expiration-type.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-legalstate.json b/crates/fhir/tests/data/json/R4/valueset-contract-legalstate.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-legalstate.json rename to crates/fhir/tests/data/json/R4/valueset-contract-legalstate.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-party-role.json b/crates/fhir/tests/data/json/R4/valueset-contract-party-role.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-party-role.json rename to crates/fhir/tests/data/json/R4/valueset-contract-party-role.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-publicationstatus.json b/crates/fhir/tests/data/json/R4/valueset-contract-publicationstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-publicationstatus.json rename to crates/fhir/tests/data/json/R4/valueset-contract-publicationstatus.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-scope.json b/crates/fhir/tests/data/json/R4/valueset-contract-scope.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-scope.json rename to crates/fhir/tests/data/json/R4/valueset-contract-scope.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-security-category.json b/crates/fhir/tests/data/json/R4/valueset-contract-security-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-security-category.json rename to crates/fhir/tests/data/json/R4/valueset-contract-security-category.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-security-classification.json b/crates/fhir/tests/data/json/R4/valueset-contract-security-classification.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-security-classification.json rename to crates/fhir/tests/data/json/R4/valueset-contract-security-classification.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-security-control.json b/crates/fhir/tests/data/json/R4/valueset-contract-security-control.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-security-control.json rename to crates/fhir/tests/data/json/R4/valueset-contract-security-control.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-signer-type.json b/crates/fhir/tests/data/json/R4/valueset-contract-signer-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-signer-type.json rename to crates/fhir/tests/data/json/R4/valueset-contract-signer-type.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-status.json b/crates/fhir/tests/data/json/R4/valueset-contract-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-status.json rename to crates/fhir/tests/data/json/R4/valueset-contract-status.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-subtype.json b/crates/fhir/tests/data/json/R4/valueset-contract-subtype.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-subtype.json rename to crates/fhir/tests/data/json/R4/valueset-contract-subtype.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-term-subtype.json b/crates/fhir/tests/data/json/R4/valueset-contract-term-subtype.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-term-subtype.json rename to crates/fhir/tests/data/json/R4/valueset-contract-term-subtype.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-term-type.json b/crates/fhir/tests/data/json/R4/valueset-contract-term-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-term-type.json rename to crates/fhir/tests/data/json/R4/valueset-contract-term-type.json diff --git a/crates/fhir/tests/data/R4/valueset-contract-type.json b/crates/fhir/tests/data/json/R4/valueset-contract-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contract-type.json rename to crates/fhir/tests/data/json/R4/valueset-contract-type.json diff --git a/crates/fhir/tests/data/R4/valueset-contributor-type.json b/crates/fhir/tests/data/json/R4/valueset-contributor-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-contributor-type.json rename to crates/fhir/tests/data/json/R4/valueset-contributor-type.json diff --git a/crates/fhir/tests/data/R4/valueset-copy-number-event.json b/crates/fhir/tests/data/json/R4/valueset-copy-number-event.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-copy-number-event.json rename to crates/fhir/tests/data/json/R4/valueset-copy-number-event.json diff --git a/crates/fhir/tests/data/R4/valueset-cosmic.json b/crates/fhir/tests/data/json/R4/valueset-cosmic.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-cosmic.json rename to crates/fhir/tests/data/json/R4/valueset-cosmic.json diff --git a/crates/fhir/tests/data/R4/valueset-coverage-class.json b/crates/fhir/tests/data/json/R4/valueset-coverage-class.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-coverage-class.json rename to crates/fhir/tests/data/json/R4/valueset-coverage-class.json diff --git a/crates/fhir/tests/data/R4/valueset-coverage-copay-type.json b/crates/fhir/tests/data/json/R4/valueset-coverage-copay-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-coverage-copay-type.json rename to crates/fhir/tests/data/json/R4/valueset-coverage-copay-type.json diff --git a/crates/fhir/tests/data/R4/valueset-coverage-financial-exception.json b/crates/fhir/tests/data/json/R4/valueset-coverage-financial-exception.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-coverage-financial-exception.json rename to crates/fhir/tests/data/json/R4/valueset-coverage-financial-exception.json diff --git a/crates/fhir/tests/data/R4/valueset-coverage-selfpay.json b/crates/fhir/tests/data/json/R4/valueset-coverage-selfpay.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-coverage-selfpay.json rename to crates/fhir/tests/data/json/R4/valueset-coverage-selfpay.json diff --git a/crates/fhir/tests/data/R4/valueset-coverage-type.json b/crates/fhir/tests/data/json/R4/valueset-coverage-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-coverage-type.json rename to crates/fhir/tests/data/json/R4/valueset-coverage-type.json diff --git a/crates/fhir/tests/data/R4/valueset-coverageeligibilityresponse-ex-auth-support.json b/crates/fhir/tests/data/json/R4/valueset-coverageeligibilityresponse-ex-auth-support.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-coverageeligibilityresponse-ex-auth-support.json rename to crates/fhir/tests/data/json/R4/valueset-coverageeligibilityresponse-ex-auth-support.json diff --git a/crates/fhir/tests/data/R4/valueset-cpt-all.json b/crates/fhir/tests/data/json/R4/valueset-cpt-all.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-cpt-all.json rename to crates/fhir/tests/data/json/R4/valueset-cpt-all.json diff --git a/crates/fhir/tests/data/R4/valueset-currencies.json b/crates/fhir/tests/data/json/R4/valueset-currencies.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-currencies.json rename to crates/fhir/tests/data/json/R4/valueset-currencies.json diff --git a/crates/fhir/tests/data/R4/valueset-data-absent-reason.json b/crates/fhir/tests/data/json/R4/valueset-data-absent-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-data-absent-reason.json rename to crates/fhir/tests/data/json/R4/valueset-data-absent-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-data-types.json b/crates/fhir/tests/data/json/R4/valueset-data-types.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-data-types.json rename to crates/fhir/tests/data/json/R4/valueset-data-types.json diff --git a/crates/fhir/tests/data/R4/valueset-dataelement-sdcobjectclass.json b/crates/fhir/tests/data/json/R4/valueset-dataelement-sdcobjectclass.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-dataelement-sdcobjectclass.json rename to crates/fhir/tests/data/json/R4/valueset-dataelement-sdcobjectclass.json diff --git a/crates/fhir/tests/data/R4/valueset-dataelement-sdcobjectclassproperty.json b/crates/fhir/tests/data/json/R4/valueset-dataelement-sdcobjectclassproperty.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-dataelement-sdcobjectclassproperty.json rename to crates/fhir/tests/data/json/R4/valueset-dataelement-sdcobjectclassproperty.json diff --git a/crates/fhir/tests/data/R4/valueset-days-of-week.json b/crates/fhir/tests/data/json/R4/valueset-days-of-week.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-days-of-week.json rename to crates/fhir/tests/data/json/R4/valueset-days-of-week.json diff --git a/crates/fhir/tests/data/R4/valueset-dbsnp.json b/crates/fhir/tests/data/json/R4/valueset-dbsnp.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-dbsnp.json rename to crates/fhir/tests/data/json/R4/valueset-dbsnp.json diff --git a/crates/fhir/tests/data/R4/valueset-defined-types.json b/crates/fhir/tests/data/json/R4/valueset-defined-types.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-defined-types.json rename to crates/fhir/tests/data/json/R4/valueset-defined-types.json diff --git a/crates/fhir/tests/data/R4/valueset-definition-resource-types.json b/crates/fhir/tests/data/json/R4/valueset-definition-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-definition-resource-types.json rename to crates/fhir/tests/data/json/R4/valueset-definition-resource-types.json diff --git a/crates/fhir/tests/data/R4/valueset-definition-status.json b/crates/fhir/tests/data/json/R4/valueset-definition-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-definition-status.json rename to crates/fhir/tests/data/json/R4/valueset-definition-status.json diff --git a/crates/fhir/tests/data/R4/valueset-definition-topic.json b/crates/fhir/tests/data/json/R4/valueset-definition-topic.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-definition-topic.json rename to crates/fhir/tests/data/json/R4/valueset-definition-topic.json diff --git a/crates/fhir/tests/data/R4/valueset-definition-use.json b/crates/fhir/tests/data/json/R4/valueset-definition-use.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-definition-use.json rename to crates/fhir/tests/data/json/R4/valueset-definition-use.json diff --git a/crates/fhir/tests/data/R4/valueset-designation-use.json b/crates/fhir/tests/data/json/R4/valueset-designation-use.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-designation-use.json rename to crates/fhir/tests/data/json/R4/valueset-designation-use.json diff --git a/crates/fhir/tests/data/R4/valueset-detectedissue-category.json b/crates/fhir/tests/data/json/R4/valueset-detectedissue-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-detectedissue-category.json rename to crates/fhir/tests/data/json/R4/valueset-detectedissue-category.json diff --git a/crates/fhir/tests/data/R4/valueset-detectedissue-mitigation-action.json b/crates/fhir/tests/data/json/R4/valueset-detectedissue-mitigation-action.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-detectedissue-mitigation-action.json rename to crates/fhir/tests/data/json/R4/valueset-detectedissue-mitigation-action.json diff --git a/crates/fhir/tests/data/R4/valueset-detectedissue-severity.json b/crates/fhir/tests/data/json/R4/valueset-detectedissue-severity.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-detectedissue-severity.json rename to crates/fhir/tests/data/json/R4/valueset-detectedissue-severity.json diff --git a/crates/fhir/tests/data/R4/valueset-device-action.json b/crates/fhir/tests/data/json/R4/valueset-device-action.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-device-action.json rename to crates/fhir/tests/data/json/R4/valueset-device-action.json diff --git a/crates/fhir/tests/data/R4/valueset-device-component-property.json b/crates/fhir/tests/data/json/R4/valueset-device-component-property.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-device-component-property.json rename to crates/fhir/tests/data/json/R4/valueset-device-component-property.json diff --git a/crates/fhir/tests/data/R4/valueset-device-definition-status.json b/crates/fhir/tests/data/json/R4/valueset-device-definition-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-device-definition-status.json rename to crates/fhir/tests/data/json/R4/valueset-device-definition-status.json diff --git a/crates/fhir/tests/data/R4/valueset-device-kind.json b/crates/fhir/tests/data/json/R4/valueset-device-kind.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-device-kind.json rename to crates/fhir/tests/data/json/R4/valueset-device-kind.json diff --git a/crates/fhir/tests/data/R4/valueset-device-nametype.json b/crates/fhir/tests/data/json/R4/valueset-device-nametype.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-device-nametype.json rename to crates/fhir/tests/data/json/R4/valueset-device-nametype.json diff --git a/crates/fhir/tests/data/R4/valueset-device-safety.json b/crates/fhir/tests/data/json/R4/valueset-device-safety.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-device-safety.json rename to crates/fhir/tests/data/json/R4/valueset-device-safety.json diff --git a/crates/fhir/tests/data/R4/valueset-device-statement-status.json b/crates/fhir/tests/data/json/R4/valueset-device-statement-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-device-statement-status.json rename to crates/fhir/tests/data/json/R4/valueset-device-statement-status.json diff --git a/crates/fhir/tests/data/R4/valueset-device-status-reason.json b/crates/fhir/tests/data/json/R4/valueset-device-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-device-status-reason.json rename to crates/fhir/tests/data/json/R4/valueset-device-status-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-device-status.json b/crates/fhir/tests/data/json/R4/valueset-device-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-device-status.json rename to crates/fhir/tests/data/json/R4/valueset-device-status.json diff --git a/crates/fhir/tests/data/R4/valueset-device-type.json b/crates/fhir/tests/data/json/R4/valueset-device-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-device-type.json rename to crates/fhir/tests/data/json/R4/valueset-device-type.json diff --git a/crates/fhir/tests/data/R4/valueset-devicemetric-type.json b/crates/fhir/tests/data/json/R4/valueset-devicemetric-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-devicemetric-type.json rename to crates/fhir/tests/data/json/R4/valueset-devicemetric-type.json diff --git a/crates/fhir/tests/data/R4/valueset-diagnosis-role.json b/crates/fhir/tests/data/json/R4/valueset-diagnosis-role.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-diagnosis-role.json rename to crates/fhir/tests/data/json/R4/valueset-diagnosis-role.json diff --git a/crates/fhir/tests/data/R4/valueset-diagnostic-based-on-snomed.json b/crates/fhir/tests/data/json/R4/valueset-diagnostic-based-on-snomed.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-diagnostic-based-on-snomed.json rename to crates/fhir/tests/data/json/R4/valueset-diagnostic-based-on-snomed.json diff --git a/crates/fhir/tests/data/R4/valueset-diagnostic-report-status.json b/crates/fhir/tests/data/json/R4/valueset-diagnostic-report-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-diagnostic-report-status.json rename to crates/fhir/tests/data/json/R4/valueset-diagnostic-report-status.json diff --git a/crates/fhir/tests/data/R4/valueset-diagnostic-service-sections.json b/crates/fhir/tests/data/json/R4/valueset-diagnostic-service-sections.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-diagnostic-service-sections.json rename to crates/fhir/tests/data/json/R4/valueset-diagnostic-service-sections.json diff --git a/crates/fhir/tests/data/R4/valueset-dicm-405-mediatype.json b/crates/fhir/tests/data/json/R4/valueset-dicm-405-mediatype.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-dicm-405-mediatype.json rename to crates/fhir/tests/data/json/R4/valueset-dicm-405-mediatype.json diff --git a/crates/fhir/tests/data/R4/valueset-diet-type.json b/crates/fhir/tests/data/json/R4/valueset-diet-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-diet-type.json rename to crates/fhir/tests/data/json/R4/valueset-diet-type.json diff --git a/crates/fhir/tests/data/R4/valueset-discriminator-type.json b/crates/fhir/tests/data/json/R4/valueset-discriminator-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-discriminator-type.json rename to crates/fhir/tests/data/json/R4/valueset-discriminator-type.json diff --git a/crates/fhir/tests/data/R4/valueset-distance-units.json b/crates/fhir/tests/data/json/R4/valueset-distance-units.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-distance-units.json rename to crates/fhir/tests/data/json/R4/valueset-distance-units.json diff --git a/crates/fhir/tests/data/R4/valueset-doc-section-codes.json b/crates/fhir/tests/data/json/R4/valueset-doc-section-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-doc-section-codes.json rename to crates/fhir/tests/data/json/R4/valueset-doc-section-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-doc-typecodes.json b/crates/fhir/tests/data/json/R4/valueset-doc-typecodes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-doc-typecodes.json rename to crates/fhir/tests/data/json/R4/valueset-doc-typecodes.json diff --git a/crates/fhir/tests/data/R4/valueset-document-classcodes.json b/crates/fhir/tests/data/json/R4/valueset-document-classcodes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-document-classcodes.json rename to crates/fhir/tests/data/json/R4/valueset-document-classcodes.json diff --git a/crates/fhir/tests/data/R4/valueset-document-mode.json b/crates/fhir/tests/data/json/R4/valueset-document-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-document-mode.json rename to crates/fhir/tests/data/json/R4/valueset-document-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-document-reference-status.json b/crates/fhir/tests/data/json/R4/valueset-document-reference-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-document-reference-status.json rename to crates/fhir/tests/data/json/R4/valueset-document-reference-status.json diff --git a/crates/fhir/tests/data/R4/valueset-document-relationship-type.json b/crates/fhir/tests/data/json/R4/valueset-document-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-document-relationship-type.json rename to crates/fhir/tests/data/json/R4/valueset-document-relationship-type.json diff --git a/crates/fhir/tests/data/R4/valueset-dose-rate-type.json b/crates/fhir/tests/data/json/R4/valueset-dose-rate-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-dose-rate-type.json rename to crates/fhir/tests/data/json/R4/valueset-dose-rate-type.json diff --git a/crates/fhir/tests/data/R4/valueset-duration-units.json b/crates/fhir/tests/data/json/R4/valueset-duration-units.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-duration-units.json rename to crates/fhir/tests/data/json/R4/valueset-duration-units.json diff --git a/crates/fhir/tests/data/R4/valueset-effect-estimate-type.json b/crates/fhir/tests/data/json/R4/valueset-effect-estimate-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-effect-estimate-type.json rename to crates/fhir/tests/data/json/R4/valueset-effect-estimate-type.json diff --git a/crates/fhir/tests/data/R4/valueset-eligibilityrequest-purpose.json b/crates/fhir/tests/data/json/R4/valueset-eligibilityrequest-purpose.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-eligibilityrequest-purpose.json rename to crates/fhir/tests/data/json/R4/valueset-eligibilityrequest-purpose.json diff --git a/crates/fhir/tests/data/R4/valueset-eligibilityresponse-purpose.json b/crates/fhir/tests/data/json/R4/valueset-eligibilityresponse-purpose.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-eligibilityresponse-purpose.json rename to crates/fhir/tests/data/json/R4/valueset-eligibilityresponse-purpose.json diff --git a/crates/fhir/tests/data/R4/valueset-encounter-admit-source.json b/crates/fhir/tests/data/json/R4/valueset-encounter-admit-source.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-encounter-admit-source.json rename to crates/fhir/tests/data/json/R4/valueset-encounter-admit-source.json diff --git a/crates/fhir/tests/data/R4/valueset-encounter-diet.json b/crates/fhir/tests/data/json/R4/valueset-encounter-diet.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-encounter-diet.json rename to crates/fhir/tests/data/json/R4/valueset-encounter-diet.json diff --git a/crates/fhir/tests/data/R4/valueset-encounter-discharge-disposition.json b/crates/fhir/tests/data/json/R4/valueset-encounter-discharge-disposition.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-encounter-discharge-disposition.json rename to crates/fhir/tests/data/json/R4/valueset-encounter-discharge-disposition.json diff --git a/crates/fhir/tests/data/R4/valueset-encounter-location-status.json b/crates/fhir/tests/data/json/R4/valueset-encounter-location-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-encounter-location-status.json rename to crates/fhir/tests/data/json/R4/valueset-encounter-location-status.json diff --git a/crates/fhir/tests/data/R4/valueset-encounter-participant-type.json b/crates/fhir/tests/data/json/R4/valueset-encounter-participant-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-encounter-participant-type.json rename to crates/fhir/tests/data/json/R4/valueset-encounter-participant-type.json diff --git a/crates/fhir/tests/data/R4/valueset-encounter-reason.json b/crates/fhir/tests/data/json/R4/valueset-encounter-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-encounter-reason.json rename to crates/fhir/tests/data/json/R4/valueset-encounter-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-encounter-special-arrangements.json b/crates/fhir/tests/data/json/R4/valueset-encounter-special-arrangements.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-encounter-special-arrangements.json rename to crates/fhir/tests/data/json/R4/valueset-encounter-special-arrangements.json diff --git a/crates/fhir/tests/data/R4/valueset-encounter-special-courtesy.json b/crates/fhir/tests/data/json/R4/valueset-encounter-special-courtesy.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-encounter-special-courtesy.json rename to crates/fhir/tests/data/json/R4/valueset-encounter-special-courtesy.json diff --git a/crates/fhir/tests/data/R4/valueset-encounter-status.json b/crates/fhir/tests/data/json/R4/valueset-encounter-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-encounter-status.json rename to crates/fhir/tests/data/json/R4/valueset-encounter-status.json diff --git a/crates/fhir/tests/data/R4/valueset-encounter-type.json b/crates/fhir/tests/data/json/R4/valueset-encounter-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-encounter-type.json rename to crates/fhir/tests/data/json/R4/valueset-encounter-type.json diff --git a/crates/fhir/tests/data/R4/valueset-endpoint-connection-type.json b/crates/fhir/tests/data/json/R4/valueset-endpoint-connection-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-endpoint-connection-type.json rename to crates/fhir/tests/data/json/R4/valueset-endpoint-connection-type.json diff --git a/crates/fhir/tests/data/R4/valueset-endpoint-payload-type.json b/crates/fhir/tests/data/json/R4/valueset-endpoint-payload-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-endpoint-payload-type.json rename to crates/fhir/tests/data/json/R4/valueset-endpoint-payload-type.json diff --git a/crates/fhir/tests/data/R4/valueset-endpoint-status.json b/crates/fhir/tests/data/json/R4/valueset-endpoint-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-endpoint-status.json rename to crates/fhir/tests/data/json/R4/valueset-endpoint-status.json diff --git a/crates/fhir/tests/data/R4/valueset-ensembl.json b/crates/fhir/tests/data/json/R4/valueset-ensembl.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-ensembl.json rename to crates/fhir/tests/data/json/R4/valueset-ensembl.json diff --git a/crates/fhir/tests/data/R4/valueset-enteral-route.json b/crates/fhir/tests/data/json/R4/valueset-enteral-route.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-enteral-route.json rename to crates/fhir/tests/data/json/R4/valueset-enteral-route.json diff --git a/crates/fhir/tests/data/R4/valueset-entformula-additive.json b/crates/fhir/tests/data/json/R4/valueset-entformula-additive.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-entformula-additive.json rename to crates/fhir/tests/data/json/R4/valueset-entformula-additive.json diff --git a/crates/fhir/tests/data/R4/valueset-entformula-type.json b/crates/fhir/tests/data/json/R4/valueset-entformula-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-entformula-type.json rename to crates/fhir/tests/data/json/R4/valueset-entformula-type.json diff --git a/crates/fhir/tests/data/R4/valueset-episode-of-care-status.json b/crates/fhir/tests/data/json/R4/valueset-episode-of-care-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-episode-of-care-status.json rename to crates/fhir/tests/data/json/R4/valueset-episode-of-care-status.json diff --git a/crates/fhir/tests/data/R4/valueset-episodeofcare-type.json b/crates/fhir/tests/data/json/R4/valueset-episodeofcare-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-episodeofcare-type.json rename to crates/fhir/tests/data/json/R4/valueset-episodeofcare-type.json diff --git a/crates/fhir/tests/data/R4/valueset-event-capability-mode.json b/crates/fhir/tests/data/json/R4/valueset-event-capability-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-event-capability-mode.json rename to crates/fhir/tests/data/json/R4/valueset-event-capability-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-event-or-request-resource-types.json b/crates/fhir/tests/data/json/R4/valueset-event-or-request-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-event-or-request-resource-types.json rename to crates/fhir/tests/data/json/R4/valueset-event-or-request-resource-types.json diff --git a/crates/fhir/tests/data/R4/valueset-event-resource-types.json b/crates/fhir/tests/data/json/R4/valueset-event-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-event-resource-types.json rename to crates/fhir/tests/data/json/R4/valueset-event-resource-types.json diff --git a/crates/fhir/tests/data/R4/valueset-event-status.json b/crates/fhir/tests/data/json/R4/valueset-event-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-event-status.json rename to crates/fhir/tests/data/json/R4/valueset-event-status.json diff --git a/crates/fhir/tests/data/R4/valueset-event-timing.json b/crates/fhir/tests/data/json/R4/valueset-event-timing.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-event-timing.json rename to crates/fhir/tests/data/json/R4/valueset-event-timing.json diff --git a/crates/fhir/tests/data/R4/valueset-evidence-quality.json b/crates/fhir/tests/data/json/R4/valueset-evidence-quality.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-evidence-quality.json rename to crates/fhir/tests/data/json/R4/valueset-evidence-quality.json diff --git a/crates/fhir/tests/data/R4/valueset-evidence-variant-state.json b/crates/fhir/tests/data/json/R4/valueset-evidence-variant-state.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-evidence-variant-state.json rename to crates/fhir/tests/data/json/R4/valueset-evidence-variant-state.json diff --git a/crates/fhir/tests/data/R4/valueset-ex-benefitcategory.json b/crates/fhir/tests/data/json/R4/valueset-ex-benefitcategory.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-ex-benefitcategory.json rename to crates/fhir/tests/data/json/R4/valueset-ex-benefitcategory.json diff --git a/crates/fhir/tests/data/R4/valueset-ex-diagnosis-on-admission.json b/crates/fhir/tests/data/json/R4/valueset-ex-diagnosis-on-admission.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-ex-diagnosis-on-admission.json rename to crates/fhir/tests/data/json/R4/valueset-ex-diagnosis-on-admission.json diff --git a/crates/fhir/tests/data/R4/valueset-ex-diagnosisrelatedgroup.json b/crates/fhir/tests/data/json/R4/valueset-ex-diagnosisrelatedgroup.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-ex-diagnosisrelatedgroup.json rename to crates/fhir/tests/data/json/R4/valueset-ex-diagnosisrelatedgroup.json diff --git a/crates/fhir/tests/data/R4/valueset-ex-diagnosistype.json b/crates/fhir/tests/data/json/R4/valueset-ex-diagnosistype.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-ex-diagnosistype.json rename to crates/fhir/tests/data/json/R4/valueset-ex-diagnosistype.json diff --git a/crates/fhir/tests/data/R4/valueset-ex-onsettype.json b/crates/fhir/tests/data/json/R4/valueset-ex-onsettype.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-ex-onsettype.json rename to crates/fhir/tests/data/json/R4/valueset-ex-onsettype.json diff --git a/crates/fhir/tests/data/R4/valueset-ex-payee-resource-type.json b/crates/fhir/tests/data/json/R4/valueset-ex-payee-resource-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-ex-payee-resource-type.json rename to crates/fhir/tests/data/json/R4/valueset-ex-payee-resource-type.json diff --git a/crates/fhir/tests/data/R4/valueset-ex-paymenttype.json b/crates/fhir/tests/data/json/R4/valueset-ex-paymenttype.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-ex-paymenttype.json rename to crates/fhir/tests/data/json/R4/valueset-ex-paymenttype.json diff --git a/crates/fhir/tests/data/R4/valueset-ex-procedure-type.json b/crates/fhir/tests/data/json/R4/valueset-ex-procedure-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-ex-procedure-type.json rename to crates/fhir/tests/data/json/R4/valueset-ex-procedure-type.json diff --git a/crates/fhir/tests/data/R4/valueset-ex-program-code.json b/crates/fhir/tests/data/json/R4/valueset-ex-program-code.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-ex-program-code.json rename to crates/fhir/tests/data/json/R4/valueset-ex-program-code.json diff --git a/crates/fhir/tests/data/R4/valueset-ex-revenue-center.json b/crates/fhir/tests/data/json/R4/valueset-ex-revenue-center.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-ex-revenue-center.json rename to crates/fhir/tests/data/json/R4/valueset-ex-revenue-center.json diff --git a/crates/fhir/tests/data/R4/valueset-example-expansion.json b/crates/fhir/tests/data/json/R4/valueset-example-expansion.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-example-expansion.json rename to crates/fhir/tests/data/json/R4/valueset-example-expansion.json diff --git a/crates/fhir/tests/data/R4/valueset-example-filter.json b/crates/fhir/tests/data/json/R4/valueset-example-filter.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-example-filter.json rename to crates/fhir/tests/data/json/R4/valueset-example-filter.json diff --git a/crates/fhir/tests/data/R4/valueset-example-hierarchical.json b/crates/fhir/tests/data/json/R4/valueset-example-hierarchical.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-example-hierarchical.json rename to crates/fhir/tests/data/json/R4/valueset-example-hierarchical.json diff --git a/crates/fhir/tests/data/R4/valueset-example-inactive.json b/crates/fhir/tests/data/json/R4/valueset-example-inactive.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-example-inactive.json rename to crates/fhir/tests/data/json/R4/valueset-example-inactive.json diff --git a/crates/fhir/tests/data/R4/valueset-example-intensional.json b/crates/fhir/tests/data/json/R4/valueset-example-intensional.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-example-intensional.json rename to crates/fhir/tests/data/json/R4/valueset-example-intensional.json diff --git a/crates/fhir/tests/data/R4/valueset-example-yesnodontknow.json b/crates/fhir/tests/data/json/R4/valueset-example-yesnodontknow.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-example-yesnodontknow.json rename to crates/fhir/tests/data/json/R4/valueset-example-yesnodontknow.json diff --git a/crates/fhir/tests/data/R4/valueset-example.json b/crates/fhir/tests/data/json/R4/valueset-example.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-example.json rename to crates/fhir/tests/data/json/R4/valueset-example.json diff --git a/crates/fhir/tests/data/R4/valueset-examplescenario-actor-type.json b/crates/fhir/tests/data/json/R4/valueset-examplescenario-actor-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-examplescenario-actor-type.json rename to crates/fhir/tests/data/json/R4/valueset-examplescenario-actor-type.json diff --git a/crates/fhir/tests/data/R4/valueset-expansion-parameter-source.json b/crates/fhir/tests/data/json/R4/valueset-expansion-parameter-source.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-expansion-parameter-source.json rename to crates/fhir/tests/data/json/R4/valueset-expansion-parameter-source.json diff --git a/crates/fhir/tests/data/R4/valueset-expansion-processing-rule.json b/crates/fhir/tests/data/json/R4/valueset-expansion-processing-rule.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-expansion-processing-rule.json rename to crates/fhir/tests/data/json/R4/valueset-expansion-processing-rule.json diff --git a/crates/fhir/tests/data/R4/valueset-explanationofbenefit-status.json b/crates/fhir/tests/data/json/R4/valueset-explanationofbenefit-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-explanationofbenefit-status.json rename to crates/fhir/tests/data/json/R4/valueset-explanationofbenefit-status.json diff --git a/crates/fhir/tests/data/R4/valueset-exposure-state.json b/crates/fhir/tests/data/json/R4/valueset-exposure-state.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-exposure-state.json rename to crates/fhir/tests/data/json/R4/valueset-exposure-state.json diff --git a/crates/fhir/tests/data/R4/valueset-expression-language.json b/crates/fhir/tests/data/json/R4/valueset-expression-language.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-expression-language.json rename to crates/fhir/tests/data/json/R4/valueset-expression-language.json diff --git a/crates/fhir/tests/data/R4/valueset-extension-context-type.json b/crates/fhir/tests/data/json/R4/valueset-extension-context-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-extension-context-type.json rename to crates/fhir/tests/data/json/R4/valueset-extension-context-type.json diff --git a/crates/fhir/tests/data/R4/valueset-extensions-ValueSet-author.json b/crates/fhir/tests/data/json/R4/valueset-extensions-ValueSet-author.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-extensions-ValueSet-author.json rename to crates/fhir/tests/data/json/R4/valueset-extensions-ValueSet-author.json diff --git a/crates/fhir/tests/data/R4/valueset-extensions-ValueSet-effective.json b/crates/fhir/tests/data/json/R4/valueset-extensions-ValueSet-effective.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-extensions-ValueSet-effective.json rename to crates/fhir/tests/data/json/R4/valueset-extensions-ValueSet-effective.json diff --git a/crates/fhir/tests/data/R4/valueset-extensions-ValueSet-end.json b/crates/fhir/tests/data/json/R4/valueset-extensions-ValueSet-end.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-extensions-ValueSet-end.json rename to crates/fhir/tests/data/json/R4/valueset-extensions-ValueSet-end.json diff --git a/crates/fhir/tests/data/R4/valueset-extensions-ValueSet-keyword.json b/crates/fhir/tests/data/json/R4/valueset-extensions-ValueSet-keyword.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-extensions-ValueSet-keyword.json rename to crates/fhir/tests/data/json/R4/valueset-extensions-ValueSet-keyword.json diff --git a/crates/fhir/tests/data/R4/valueset-extensions-ValueSet-workflow.json b/crates/fhir/tests/data/json/R4/valueset-extensions-ValueSet-workflow.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-extensions-ValueSet-workflow.json rename to crates/fhir/tests/data/json/R4/valueset-extensions-ValueSet-workflow.json diff --git a/crates/fhir/tests/data/R4/valueset-feeding-device.json b/crates/fhir/tests/data/json/R4/valueset-feeding-device.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-feeding-device.json rename to crates/fhir/tests/data/json/R4/valueset-feeding-device.json diff --git a/crates/fhir/tests/data/R4/valueset-filter-operator.json b/crates/fhir/tests/data/json/R4/valueset-filter-operator.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-filter-operator.json rename to crates/fhir/tests/data/json/R4/valueset-filter-operator.json diff --git a/crates/fhir/tests/data/R4/valueset-financial-taskcode.json b/crates/fhir/tests/data/json/R4/valueset-financial-taskcode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-financial-taskcode.json rename to crates/fhir/tests/data/json/R4/valueset-financial-taskcode.json diff --git a/crates/fhir/tests/data/R4/valueset-financial-taskinputtype.json b/crates/fhir/tests/data/json/R4/valueset-financial-taskinputtype.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-financial-taskinputtype.json rename to crates/fhir/tests/data/json/R4/valueset-financial-taskinputtype.json diff --git a/crates/fhir/tests/data/R4/valueset-flag-category.json b/crates/fhir/tests/data/json/R4/valueset-flag-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-flag-category.json rename to crates/fhir/tests/data/json/R4/valueset-flag-category.json diff --git a/crates/fhir/tests/data/R4/valueset-flag-code.json b/crates/fhir/tests/data/json/R4/valueset-flag-code.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-flag-code.json rename to crates/fhir/tests/data/json/R4/valueset-flag-code.json diff --git a/crates/fhir/tests/data/R4/valueset-flag-priority.json b/crates/fhir/tests/data/json/R4/valueset-flag-priority.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-flag-priority.json rename to crates/fhir/tests/data/json/R4/valueset-flag-priority.json diff --git a/crates/fhir/tests/data/R4/valueset-flag-status.json b/crates/fhir/tests/data/json/R4/valueset-flag-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-flag-status.json rename to crates/fhir/tests/data/json/R4/valueset-flag-status.json diff --git a/crates/fhir/tests/data/R4/valueset-fm-conditions.json b/crates/fhir/tests/data/json/R4/valueset-fm-conditions.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-fm-conditions.json rename to crates/fhir/tests/data/json/R4/valueset-fm-conditions.json diff --git a/crates/fhir/tests/data/R4/valueset-fm-itemtype.json b/crates/fhir/tests/data/json/R4/valueset-fm-itemtype.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-fm-itemtype.json rename to crates/fhir/tests/data/json/R4/valueset-fm-itemtype.json diff --git a/crates/fhir/tests/data/R4/valueset-fm-status.json b/crates/fhir/tests/data/json/R4/valueset-fm-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-fm-status.json rename to crates/fhir/tests/data/json/R4/valueset-fm-status.json diff --git a/crates/fhir/tests/data/R4/valueset-focal-subject.json b/crates/fhir/tests/data/json/R4/valueset-focal-subject.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-focal-subject.json rename to crates/fhir/tests/data/json/R4/valueset-focal-subject.json diff --git a/crates/fhir/tests/data/R4/valueset-food-type.json b/crates/fhir/tests/data/json/R4/valueset-food-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-food-type.json rename to crates/fhir/tests/data/json/R4/valueset-food-type.json diff --git a/crates/fhir/tests/data/R4/valueset-formatcodes.json b/crates/fhir/tests/data/json/R4/valueset-formatcodes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-formatcodes.json rename to crates/fhir/tests/data/json/R4/valueset-formatcodes.json diff --git a/crates/fhir/tests/data/R4/valueset-forms.json b/crates/fhir/tests/data/json/R4/valueset-forms.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-forms.json rename to crates/fhir/tests/data/json/R4/valueset-forms.json diff --git a/crates/fhir/tests/data/R4/valueset-fundsreserve.json b/crates/fhir/tests/data/json/R4/valueset-fundsreserve.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-fundsreserve.json rename to crates/fhir/tests/data/json/R4/valueset-fundsreserve.json diff --git a/crates/fhir/tests/data/R4/valueset-gender-identity.json b/crates/fhir/tests/data/json/R4/valueset-gender-identity.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-gender-identity.json rename to crates/fhir/tests/data/json/R4/valueset-gender-identity.json diff --git a/crates/fhir/tests/data/R4/valueset-genenames.json b/crates/fhir/tests/data/json/R4/valueset-genenames.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-genenames.json rename to crates/fhir/tests/data/json/R4/valueset-genenames.json diff --git a/crates/fhir/tests/data/R4/valueset-goal-acceptance-status.json b/crates/fhir/tests/data/json/R4/valueset-goal-acceptance-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-goal-acceptance-status.json rename to crates/fhir/tests/data/json/R4/valueset-goal-acceptance-status.json diff --git a/crates/fhir/tests/data/R4/valueset-goal-achievement.json b/crates/fhir/tests/data/json/R4/valueset-goal-achievement.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-goal-achievement.json rename to crates/fhir/tests/data/json/R4/valueset-goal-achievement.json diff --git a/crates/fhir/tests/data/R4/valueset-goal-category.json b/crates/fhir/tests/data/json/R4/valueset-goal-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-goal-category.json rename to crates/fhir/tests/data/json/R4/valueset-goal-category.json diff --git a/crates/fhir/tests/data/R4/valueset-goal-priority.json b/crates/fhir/tests/data/json/R4/valueset-goal-priority.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-goal-priority.json rename to crates/fhir/tests/data/json/R4/valueset-goal-priority.json diff --git a/crates/fhir/tests/data/R4/valueset-goal-relationship-type.json b/crates/fhir/tests/data/json/R4/valueset-goal-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-goal-relationship-type.json rename to crates/fhir/tests/data/json/R4/valueset-goal-relationship-type.json diff --git a/crates/fhir/tests/data/R4/valueset-goal-start-event.json b/crates/fhir/tests/data/json/R4/valueset-goal-start-event.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-goal-start-event.json rename to crates/fhir/tests/data/json/R4/valueset-goal-start-event.json diff --git a/crates/fhir/tests/data/R4/valueset-goal-status-reason.json b/crates/fhir/tests/data/json/R4/valueset-goal-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-goal-status-reason.json rename to crates/fhir/tests/data/json/R4/valueset-goal-status-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-goal-status.json b/crates/fhir/tests/data/json/R4/valueset-goal-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-goal-status.json rename to crates/fhir/tests/data/json/R4/valueset-goal-status.json diff --git a/crates/fhir/tests/data/R4/valueset-graph-compartment-rule.json b/crates/fhir/tests/data/json/R4/valueset-graph-compartment-rule.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-graph-compartment-rule.json rename to crates/fhir/tests/data/json/R4/valueset-graph-compartment-rule.json diff --git a/crates/fhir/tests/data/R4/valueset-graph-compartment-use.json b/crates/fhir/tests/data/json/R4/valueset-graph-compartment-use.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-graph-compartment-use.json rename to crates/fhir/tests/data/json/R4/valueset-graph-compartment-use.json diff --git a/crates/fhir/tests/data/R4/valueset-group-measure.json b/crates/fhir/tests/data/json/R4/valueset-group-measure.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-group-measure.json rename to crates/fhir/tests/data/json/R4/valueset-group-measure.json diff --git a/crates/fhir/tests/data/R4/valueset-group-type.json b/crates/fhir/tests/data/json/R4/valueset-group-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-group-type.json rename to crates/fhir/tests/data/json/R4/valueset-group-type.json diff --git a/crates/fhir/tests/data/R4/valueset-guidance-response-status.json b/crates/fhir/tests/data/json/R4/valueset-guidance-response-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-guidance-response-status.json rename to crates/fhir/tests/data/json/R4/valueset-guidance-response-status.json diff --git a/crates/fhir/tests/data/R4/valueset-guide-page-generation.json b/crates/fhir/tests/data/json/R4/valueset-guide-page-generation.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-guide-page-generation.json rename to crates/fhir/tests/data/json/R4/valueset-guide-page-generation.json diff --git a/crates/fhir/tests/data/R4/valueset-guide-parameter-code.json b/crates/fhir/tests/data/json/R4/valueset-guide-parameter-code.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-guide-parameter-code.json rename to crates/fhir/tests/data/json/R4/valueset-guide-parameter-code.json diff --git a/crates/fhir/tests/data/R4/valueset-handling-condition.json b/crates/fhir/tests/data/json/R4/valueset-handling-condition.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-handling-condition.json rename to crates/fhir/tests/data/json/R4/valueset-handling-condition.json diff --git a/crates/fhir/tests/data/R4/valueset-history-absent-reason.json b/crates/fhir/tests/data/json/R4/valueset-history-absent-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-history-absent-reason.json rename to crates/fhir/tests/data/json/R4/valueset-history-absent-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-history-status.json b/crates/fhir/tests/data/json/R4/valueset-history-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-history-status.json rename to crates/fhir/tests/data/json/R4/valueset-history-status.json diff --git a/crates/fhir/tests/data/R4/valueset-hl7-work-group.json b/crates/fhir/tests/data/json/R4/valueset-hl7-work-group.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-hl7-work-group.json rename to crates/fhir/tests/data/json/R4/valueset-hl7-work-group.json diff --git a/crates/fhir/tests/data/R4/valueset-http-operations.json b/crates/fhir/tests/data/json/R4/valueset-http-operations.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-http-operations.json rename to crates/fhir/tests/data/json/R4/valueset-http-operations.json diff --git a/crates/fhir/tests/data/R4/valueset-http-verb.json b/crates/fhir/tests/data/json/R4/valueset-http-verb.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-http-verb.json rename to crates/fhir/tests/data/json/R4/valueset-http-verb.json diff --git a/crates/fhir/tests/data/R4/valueset-icd-10-procedures.json b/crates/fhir/tests/data/json/R4/valueset-icd-10-procedures.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-icd-10-procedures.json rename to crates/fhir/tests/data/json/R4/valueset-icd-10-procedures.json diff --git a/crates/fhir/tests/data/R4/valueset-icd-10.json b/crates/fhir/tests/data/json/R4/valueset-icd-10.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-icd-10.json rename to crates/fhir/tests/data/json/R4/valueset-icd-10.json diff --git a/crates/fhir/tests/data/R4/valueset-identifier-type.json b/crates/fhir/tests/data/json/R4/valueset-identifier-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-identifier-type.json rename to crates/fhir/tests/data/json/R4/valueset-identifier-type.json diff --git a/crates/fhir/tests/data/R4/valueset-identifier-use.json b/crates/fhir/tests/data/json/R4/valueset-identifier-use.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-identifier-use.json rename to crates/fhir/tests/data/json/R4/valueset-identifier-use.json diff --git a/crates/fhir/tests/data/R4/valueset-identity-assuranceLevel.json b/crates/fhir/tests/data/json/R4/valueset-identity-assuranceLevel.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-identity-assuranceLevel.json rename to crates/fhir/tests/data/json/R4/valueset-identity-assuranceLevel.json diff --git a/crates/fhir/tests/data/R4/valueset-imagingstudy-status.json b/crates/fhir/tests/data/json/R4/valueset-imagingstudy-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-imagingstudy-status.json rename to crates/fhir/tests/data/json/R4/valueset-imagingstudy-status.json diff --git a/crates/fhir/tests/data/R4/valueset-immunization-evaluation-dose-status-reason.json b/crates/fhir/tests/data/json/R4/valueset-immunization-evaluation-dose-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-immunization-evaluation-dose-status-reason.json rename to crates/fhir/tests/data/json/R4/valueset-immunization-evaluation-dose-status-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-immunization-evaluation-dose-status.json b/crates/fhir/tests/data/json/R4/valueset-immunization-evaluation-dose-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-immunization-evaluation-dose-status.json rename to crates/fhir/tests/data/json/R4/valueset-immunization-evaluation-dose-status.json diff --git a/crates/fhir/tests/data/R4/valueset-immunization-evaluation-status.json b/crates/fhir/tests/data/json/R4/valueset-immunization-evaluation-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-immunization-evaluation-status.json rename to crates/fhir/tests/data/json/R4/valueset-immunization-evaluation-status.json diff --git a/crates/fhir/tests/data/R4/valueset-immunization-evaluation-target-disease.json b/crates/fhir/tests/data/json/R4/valueset-immunization-evaluation-target-disease.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-immunization-evaluation-target-disease.json rename to crates/fhir/tests/data/json/R4/valueset-immunization-evaluation-target-disease.json diff --git a/crates/fhir/tests/data/R4/valueset-immunization-function.json b/crates/fhir/tests/data/json/R4/valueset-immunization-function.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-immunization-function.json rename to crates/fhir/tests/data/json/R4/valueset-immunization-function.json diff --git a/crates/fhir/tests/data/R4/valueset-immunization-funding-source.json b/crates/fhir/tests/data/json/R4/valueset-immunization-funding-source.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-immunization-funding-source.json rename to crates/fhir/tests/data/json/R4/valueset-immunization-funding-source.json diff --git a/crates/fhir/tests/data/R4/valueset-immunization-origin.json b/crates/fhir/tests/data/json/R4/valueset-immunization-origin.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-immunization-origin.json rename to crates/fhir/tests/data/json/R4/valueset-immunization-origin.json diff --git a/crates/fhir/tests/data/R4/valueset-immunization-program-eligibility.json b/crates/fhir/tests/data/json/R4/valueset-immunization-program-eligibility.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-immunization-program-eligibility.json rename to crates/fhir/tests/data/json/R4/valueset-immunization-program-eligibility.json diff --git a/crates/fhir/tests/data/R4/valueset-immunization-reason.json b/crates/fhir/tests/data/json/R4/valueset-immunization-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-immunization-reason.json rename to crates/fhir/tests/data/json/R4/valueset-immunization-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-immunization-recommendation-date-criterion.json b/crates/fhir/tests/data/json/R4/valueset-immunization-recommendation-date-criterion.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-immunization-recommendation-date-criterion.json rename to crates/fhir/tests/data/json/R4/valueset-immunization-recommendation-date-criterion.json diff --git a/crates/fhir/tests/data/R4/valueset-immunization-recommendation-reason.json b/crates/fhir/tests/data/json/R4/valueset-immunization-recommendation-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-immunization-recommendation-reason.json rename to crates/fhir/tests/data/json/R4/valueset-immunization-recommendation-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-immunization-recommendation-status.json b/crates/fhir/tests/data/json/R4/valueset-immunization-recommendation-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-immunization-recommendation-status.json rename to crates/fhir/tests/data/json/R4/valueset-immunization-recommendation-status.json diff --git a/crates/fhir/tests/data/R4/valueset-immunization-recommendation-target-disease.json b/crates/fhir/tests/data/json/R4/valueset-immunization-recommendation-target-disease.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-immunization-recommendation-target-disease.json rename to crates/fhir/tests/data/json/R4/valueset-immunization-recommendation-target-disease.json diff --git a/crates/fhir/tests/data/R4/valueset-immunization-route.json b/crates/fhir/tests/data/json/R4/valueset-immunization-route.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-immunization-route.json rename to crates/fhir/tests/data/json/R4/valueset-immunization-route.json diff --git a/crates/fhir/tests/data/R4/valueset-immunization-site.json b/crates/fhir/tests/data/json/R4/valueset-immunization-site.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-immunization-site.json rename to crates/fhir/tests/data/json/R4/valueset-immunization-site.json diff --git a/crates/fhir/tests/data/R4/valueset-immunization-status-reason.json b/crates/fhir/tests/data/json/R4/valueset-immunization-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-immunization-status-reason.json rename to crates/fhir/tests/data/json/R4/valueset-immunization-status-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-immunization-status.json b/crates/fhir/tests/data/json/R4/valueset-immunization-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-immunization-status.json rename to crates/fhir/tests/data/json/R4/valueset-immunization-status.json diff --git a/crates/fhir/tests/data/R4/valueset-immunization-subpotent-reason.json b/crates/fhir/tests/data/json/R4/valueset-immunization-subpotent-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-immunization-subpotent-reason.json rename to crates/fhir/tests/data/json/R4/valueset-immunization-subpotent-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-immunization-target-disease.json b/crates/fhir/tests/data/json/R4/valueset-immunization-target-disease.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-immunization-target-disease.json rename to crates/fhir/tests/data/json/R4/valueset-immunization-target-disease.json diff --git a/crates/fhir/tests/data/R4/valueset-implantStatus.json b/crates/fhir/tests/data/json/R4/valueset-implantStatus.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-implantStatus.json rename to crates/fhir/tests/data/json/R4/valueset-implantStatus.json diff --git a/crates/fhir/tests/data/R4/valueset-instance-availability.json b/crates/fhir/tests/data/json/R4/valueset-instance-availability.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-instance-availability.json rename to crates/fhir/tests/data/json/R4/valueset-instance-availability.json diff --git a/crates/fhir/tests/data/R4/valueset-insuranceplan-applicability.json b/crates/fhir/tests/data/json/R4/valueset-insuranceplan-applicability.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-insuranceplan-applicability.json rename to crates/fhir/tests/data/json/R4/valueset-insuranceplan-applicability.json diff --git a/crates/fhir/tests/data/R4/valueset-insuranceplan-type.json b/crates/fhir/tests/data/json/R4/valueset-insuranceplan-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-insuranceplan-type.json rename to crates/fhir/tests/data/json/R4/valueset-insuranceplan-type.json diff --git a/crates/fhir/tests/data/R4/valueset-intervention.json b/crates/fhir/tests/data/json/R4/valueset-intervention.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-intervention.json rename to crates/fhir/tests/data/json/R4/valueset-intervention.json diff --git a/crates/fhir/tests/data/R4/valueset-investigation-sets.json b/crates/fhir/tests/data/json/R4/valueset-investigation-sets.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-investigation-sets.json rename to crates/fhir/tests/data/json/R4/valueset-investigation-sets.json diff --git a/crates/fhir/tests/data/R4/valueset-invoice-priceComponentType.json b/crates/fhir/tests/data/json/R4/valueset-invoice-priceComponentType.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-invoice-priceComponentType.json rename to crates/fhir/tests/data/json/R4/valueset-invoice-priceComponentType.json diff --git a/crates/fhir/tests/data/R4/valueset-invoice-status.json b/crates/fhir/tests/data/json/R4/valueset-invoice-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-invoice-status.json rename to crates/fhir/tests/data/json/R4/valueset-invoice-status.json diff --git a/crates/fhir/tests/data/R4/valueset-iso3166-1-2.json b/crates/fhir/tests/data/json/R4/valueset-iso3166-1-2.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-iso3166-1-2.json rename to crates/fhir/tests/data/json/R4/valueset-iso3166-1-2.json diff --git a/crates/fhir/tests/data/R4/valueset-iso3166-1-3.json b/crates/fhir/tests/data/json/R4/valueset-iso3166-1-3.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-iso3166-1-3.json rename to crates/fhir/tests/data/json/R4/valueset-iso3166-1-3.json diff --git a/crates/fhir/tests/data/R4/valueset-iso3166-1-N.json b/crates/fhir/tests/data/json/R4/valueset-iso3166-1-N.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-iso3166-1-N.json rename to crates/fhir/tests/data/json/R4/valueset-iso3166-1-N.json diff --git a/crates/fhir/tests/data/R4/valueset-issue-severity.json b/crates/fhir/tests/data/json/R4/valueset-issue-severity.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-issue-severity.json rename to crates/fhir/tests/data/json/R4/valueset-issue-severity.json diff --git a/crates/fhir/tests/data/R4/valueset-issue-type.json b/crates/fhir/tests/data/json/R4/valueset-issue-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-issue-type.json rename to crates/fhir/tests/data/json/R4/valueset-issue-type.json diff --git a/crates/fhir/tests/data/R4/valueset-item-type.json b/crates/fhir/tests/data/json/R4/valueset-item-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-item-type.json rename to crates/fhir/tests/data/json/R4/valueset-item-type.json diff --git a/crates/fhir/tests/data/R4/valueset-jurisdiction.json b/crates/fhir/tests/data/json/R4/valueset-jurisdiction.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-jurisdiction.json rename to crates/fhir/tests/data/json/R4/valueset-jurisdiction.json diff --git a/crates/fhir/tests/data/R4/valueset-knowledge-resource-types.json b/crates/fhir/tests/data/json/R4/valueset-knowledge-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-knowledge-resource-types.json rename to crates/fhir/tests/data/json/R4/valueset-knowledge-resource-types.json diff --git a/crates/fhir/tests/data/R4/valueset-language-preference-type.json b/crates/fhir/tests/data/json/R4/valueset-language-preference-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-language-preference-type.json rename to crates/fhir/tests/data/json/R4/valueset-language-preference-type.json diff --git a/crates/fhir/tests/data/R4/valueset-languages.json b/crates/fhir/tests/data/json/R4/valueset-languages.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-languages.json rename to crates/fhir/tests/data/json/R4/valueset-languages.json diff --git a/crates/fhir/tests/data/R4/valueset-ldlcholesterol-codes.json b/crates/fhir/tests/data/json/R4/valueset-ldlcholesterol-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-ldlcholesterol-codes.json rename to crates/fhir/tests/data/json/R4/valueset-ldlcholesterol-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-library-type.json b/crates/fhir/tests/data/json/R4/valueset-library-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-library-type.json rename to crates/fhir/tests/data/json/R4/valueset-library-type.json diff --git a/crates/fhir/tests/data/R4/valueset-link-type.json b/crates/fhir/tests/data/json/R4/valueset-link-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-link-type.json rename to crates/fhir/tests/data/json/R4/valueset-link-type.json diff --git a/crates/fhir/tests/data/R4/valueset-linkage-type.json b/crates/fhir/tests/data/json/R4/valueset-linkage-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-linkage-type.json rename to crates/fhir/tests/data/json/R4/valueset-linkage-type.json diff --git a/crates/fhir/tests/data/R4/valueset-list-empty-reason.json b/crates/fhir/tests/data/json/R4/valueset-list-empty-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-list-empty-reason.json rename to crates/fhir/tests/data/json/R4/valueset-list-empty-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-list-example-codes.json b/crates/fhir/tests/data/json/R4/valueset-list-example-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-list-example-codes.json rename to crates/fhir/tests/data/json/R4/valueset-list-example-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-list-item-flag.json b/crates/fhir/tests/data/json/R4/valueset-list-item-flag.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-list-item-flag.json rename to crates/fhir/tests/data/json/R4/valueset-list-item-flag.json diff --git a/crates/fhir/tests/data/R4/valueset-list-mode.json b/crates/fhir/tests/data/json/R4/valueset-list-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-list-mode.json rename to crates/fhir/tests/data/json/R4/valueset-list-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-list-order.json b/crates/fhir/tests/data/json/R4/valueset-list-order.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-list-order.json rename to crates/fhir/tests/data/json/R4/valueset-list-order.json diff --git a/crates/fhir/tests/data/R4/valueset-list-status.json b/crates/fhir/tests/data/json/R4/valueset-list-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-list-status.json rename to crates/fhir/tests/data/json/R4/valueset-list-status.json diff --git a/crates/fhir/tests/data/R4/valueset-location-mode.json b/crates/fhir/tests/data/json/R4/valueset-location-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-location-mode.json rename to crates/fhir/tests/data/json/R4/valueset-location-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-location-physical-type.json b/crates/fhir/tests/data/json/R4/valueset-location-physical-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-location-physical-type.json rename to crates/fhir/tests/data/json/R4/valueset-location-physical-type.json diff --git a/crates/fhir/tests/data/R4/valueset-location-status.json b/crates/fhir/tests/data/json/R4/valueset-location-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-location-status.json rename to crates/fhir/tests/data/json/R4/valueset-location-status.json diff --git a/crates/fhir/tests/data/R4/valueset-manifestation-or-symptom.json b/crates/fhir/tests/data/json/R4/valueset-manifestation-or-symptom.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-manifestation-or-symptom.json rename to crates/fhir/tests/data/json/R4/valueset-manifestation-or-symptom.json diff --git a/crates/fhir/tests/data/R4/valueset-map-context-type.json b/crates/fhir/tests/data/json/R4/valueset-map-context-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-map-context-type.json rename to crates/fhir/tests/data/json/R4/valueset-map-context-type.json diff --git a/crates/fhir/tests/data/R4/valueset-map-group-type-mode.json b/crates/fhir/tests/data/json/R4/valueset-map-group-type-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-map-group-type-mode.json rename to crates/fhir/tests/data/json/R4/valueset-map-group-type-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-map-input-mode.json b/crates/fhir/tests/data/json/R4/valueset-map-input-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-map-input-mode.json rename to crates/fhir/tests/data/json/R4/valueset-map-input-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-map-model-mode.json b/crates/fhir/tests/data/json/R4/valueset-map-model-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-map-model-mode.json rename to crates/fhir/tests/data/json/R4/valueset-map-model-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-map-source-list-mode.json b/crates/fhir/tests/data/json/R4/valueset-map-source-list-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-map-source-list-mode.json rename to crates/fhir/tests/data/json/R4/valueset-map-source-list-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-map-target-list-mode.json b/crates/fhir/tests/data/json/R4/valueset-map-target-list-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-map-target-list-mode.json rename to crates/fhir/tests/data/json/R4/valueset-map-target-list-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-map-transform.json b/crates/fhir/tests/data/json/R4/valueset-map-transform.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-map-transform.json rename to crates/fhir/tests/data/json/R4/valueset-map-transform.json diff --git a/crates/fhir/tests/data/R4/valueset-marital-status.json b/crates/fhir/tests/data/json/R4/valueset-marital-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-marital-status.json rename to crates/fhir/tests/data/json/R4/valueset-marital-status.json diff --git a/crates/fhir/tests/data/R4/valueset-match-grade.json b/crates/fhir/tests/data/json/R4/valueset-match-grade.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-match-grade.json rename to crates/fhir/tests/data/json/R4/valueset-match-grade.json diff --git a/crates/fhir/tests/data/R4/valueset-measure-data-usage.json b/crates/fhir/tests/data/json/R4/valueset-measure-data-usage.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-measure-data-usage.json rename to crates/fhir/tests/data/json/R4/valueset-measure-data-usage.json diff --git a/crates/fhir/tests/data/R4/valueset-measure-improvement-notation.json b/crates/fhir/tests/data/json/R4/valueset-measure-improvement-notation.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-measure-improvement-notation.json rename to crates/fhir/tests/data/json/R4/valueset-measure-improvement-notation.json diff --git a/crates/fhir/tests/data/R4/valueset-measure-population.json b/crates/fhir/tests/data/json/R4/valueset-measure-population.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-measure-population.json rename to crates/fhir/tests/data/json/R4/valueset-measure-population.json diff --git a/crates/fhir/tests/data/R4/valueset-measure-report-status.json b/crates/fhir/tests/data/json/R4/valueset-measure-report-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-measure-report-status.json rename to crates/fhir/tests/data/json/R4/valueset-measure-report-status.json diff --git a/crates/fhir/tests/data/R4/valueset-measure-report-type.json b/crates/fhir/tests/data/json/R4/valueset-measure-report-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-measure-report-type.json rename to crates/fhir/tests/data/json/R4/valueset-measure-report-type.json diff --git a/crates/fhir/tests/data/R4/valueset-measure-scoring.json b/crates/fhir/tests/data/json/R4/valueset-measure-scoring.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-measure-scoring.json rename to crates/fhir/tests/data/json/R4/valueset-measure-scoring.json diff --git a/crates/fhir/tests/data/R4/valueset-measure-type.json b/crates/fhir/tests/data/json/R4/valueset-measure-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-measure-type.json rename to crates/fhir/tests/data/json/R4/valueset-measure-type.json diff --git a/crates/fhir/tests/data/R4/valueset-med-admin-perform-function.json b/crates/fhir/tests/data/json/R4/valueset-med-admin-perform-function.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-med-admin-perform-function.json rename to crates/fhir/tests/data/json/R4/valueset-med-admin-perform-function.json diff --git a/crates/fhir/tests/data/R4/valueset-media-modality.json b/crates/fhir/tests/data/json/R4/valueset-media-modality.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-media-modality.json rename to crates/fhir/tests/data/json/R4/valueset-media-modality.json diff --git a/crates/fhir/tests/data/R4/valueset-media-type.json b/crates/fhir/tests/data/json/R4/valueset-media-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-media-type.json rename to crates/fhir/tests/data/json/R4/valueset-media-type.json diff --git a/crates/fhir/tests/data/R4/valueset-media-view.json b/crates/fhir/tests/data/json/R4/valueset-media-view.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-media-view.json rename to crates/fhir/tests/data/json/R4/valueset-media-view.json diff --git a/crates/fhir/tests/data/R4/valueset-medication-admin-category.json b/crates/fhir/tests/data/json/R4/valueset-medication-admin-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medication-admin-category.json rename to crates/fhir/tests/data/json/R4/valueset-medication-admin-category.json diff --git a/crates/fhir/tests/data/R4/valueset-medication-admin-status.json b/crates/fhir/tests/data/json/R4/valueset-medication-admin-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medication-admin-status.json rename to crates/fhir/tests/data/json/R4/valueset-medication-admin-status.json diff --git a/crates/fhir/tests/data/R4/valueset-medication-as-needed-reason.json b/crates/fhir/tests/data/json/R4/valueset-medication-as-needed-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medication-as-needed-reason.json rename to crates/fhir/tests/data/json/R4/valueset-medication-as-needed-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-medication-codes.json b/crates/fhir/tests/data/json/R4/valueset-medication-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medication-codes.json rename to crates/fhir/tests/data/json/R4/valueset-medication-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-medication-form-codes.json b/crates/fhir/tests/data/json/R4/valueset-medication-form-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medication-form-codes.json rename to crates/fhir/tests/data/json/R4/valueset-medication-form-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-medication-statement-category.json b/crates/fhir/tests/data/json/R4/valueset-medication-statement-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medication-statement-category.json rename to crates/fhir/tests/data/json/R4/valueset-medication-statement-category.json diff --git a/crates/fhir/tests/data/R4/valueset-medication-statement-status.json b/crates/fhir/tests/data/json/R4/valueset-medication-statement-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medication-statement-status.json rename to crates/fhir/tests/data/json/R4/valueset-medication-statement-status.json diff --git a/crates/fhir/tests/data/R4/valueset-medication-status.json b/crates/fhir/tests/data/json/R4/valueset-medication-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medication-status.json rename to crates/fhir/tests/data/json/R4/valueset-medication-status.json diff --git a/crates/fhir/tests/data/R4/valueset-medicationdispense-category.json b/crates/fhir/tests/data/json/R4/valueset-medicationdispense-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medicationdispense-category.json rename to crates/fhir/tests/data/json/R4/valueset-medicationdispense-category.json diff --git a/crates/fhir/tests/data/R4/valueset-medicationdispense-performer-function.json b/crates/fhir/tests/data/json/R4/valueset-medicationdispense-performer-function.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medicationdispense-performer-function.json rename to crates/fhir/tests/data/json/R4/valueset-medicationdispense-performer-function.json diff --git a/crates/fhir/tests/data/R4/valueset-medicationdispense-status-reason.json b/crates/fhir/tests/data/json/R4/valueset-medicationdispense-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medicationdispense-status-reason.json rename to crates/fhir/tests/data/json/R4/valueset-medicationdispense-status-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-medicationdispense-status.json b/crates/fhir/tests/data/json/R4/valueset-medicationdispense-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medicationdispense-status.json rename to crates/fhir/tests/data/json/R4/valueset-medicationdispense-status.json diff --git a/crates/fhir/tests/data/R4/valueset-medicationknowledge-characteristic.json b/crates/fhir/tests/data/json/R4/valueset-medicationknowledge-characteristic.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medicationknowledge-characteristic.json rename to crates/fhir/tests/data/json/R4/valueset-medicationknowledge-characteristic.json diff --git a/crates/fhir/tests/data/R4/valueset-medicationknowledge-package-type.json b/crates/fhir/tests/data/json/R4/valueset-medicationknowledge-package-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medicationknowledge-package-type.json rename to crates/fhir/tests/data/json/R4/valueset-medicationknowledge-package-type.json diff --git a/crates/fhir/tests/data/R4/valueset-medicationknowledge-status.json b/crates/fhir/tests/data/json/R4/valueset-medicationknowledge-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medicationknowledge-status.json rename to crates/fhir/tests/data/json/R4/valueset-medicationknowledge-status.json diff --git a/crates/fhir/tests/data/R4/valueset-medicationrequest-category.json b/crates/fhir/tests/data/json/R4/valueset-medicationrequest-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medicationrequest-category.json rename to crates/fhir/tests/data/json/R4/valueset-medicationrequest-category.json diff --git a/crates/fhir/tests/data/R4/valueset-medicationrequest-course-of-therapy.json b/crates/fhir/tests/data/json/R4/valueset-medicationrequest-course-of-therapy.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medicationrequest-course-of-therapy.json rename to crates/fhir/tests/data/json/R4/valueset-medicationrequest-course-of-therapy.json diff --git a/crates/fhir/tests/data/R4/valueset-medicationrequest-intent.json b/crates/fhir/tests/data/json/R4/valueset-medicationrequest-intent.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medicationrequest-intent.json rename to crates/fhir/tests/data/json/R4/valueset-medicationrequest-intent.json diff --git a/crates/fhir/tests/data/R4/valueset-medicationrequest-status-reason.json b/crates/fhir/tests/data/json/R4/valueset-medicationrequest-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medicationrequest-status-reason.json rename to crates/fhir/tests/data/json/R4/valueset-medicationrequest-status-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-medicationrequest-status.json b/crates/fhir/tests/data/json/R4/valueset-medicationrequest-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-medicationrequest-status.json rename to crates/fhir/tests/data/json/R4/valueset-medicationrequest-status.json diff --git a/crates/fhir/tests/data/R4/valueset-message-events.json b/crates/fhir/tests/data/json/R4/valueset-message-events.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-message-events.json rename to crates/fhir/tests/data/json/R4/valueset-message-events.json diff --git a/crates/fhir/tests/data/R4/valueset-message-reason-encounter.json b/crates/fhir/tests/data/json/R4/valueset-message-reason-encounter.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-message-reason-encounter.json rename to crates/fhir/tests/data/json/R4/valueset-message-reason-encounter.json diff --git a/crates/fhir/tests/data/R4/valueset-message-significance-category.json b/crates/fhir/tests/data/json/R4/valueset-message-significance-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-message-significance-category.json rename to crates/fhir/tests/data/json/R4/valueset-message-significance-category.json diff --git a/crates/fhir/tests/data/R4/valueset-message-transport.json b/crates/fhir/tests/data/json/R4/valueset-message-transport.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-message-transport.json rename to crates/fhir/tests/data/json/R4/valueset-message-transport.json diff --git a/crates/fhir/tests/data/R4/valueset-messageheader-response-request.json b/crates/fhir/tests/data/json/R4/valueset-messageheader-response-request.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-messageheader-response-request.json rename to crates/fhir/tests/data/json/R4/valueset-messageheader-response-request.json diff --git a/crates/fhir/tests/data/R4/valueset-metric-calibration-state.json b/crates/fhir/tests/data/json/R4/valueset-metric-calibration-state.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-metric-calibration-state.json rename to crates/fhir/tests/data/json/R4/valueset-metric-calibration-state.json diff --git a/crates/fhir/tests/data/R4/valueset-metric-calibration-type.json b/crates/fhir/tests/data/json/R4/valueset-metric-calibration-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-metric-calibration-type.json rename to crates/fhir/tests/data/json/R4/valueset-metric-calibration-type.json diff --git a/crates/fhir/tests/data/R4/valueset-metric-category.json b/crates/fhir/tests/data/json/R4/valueset-metric-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-metric-category.json rename to crates/fhir/tests/data/json/R4/valueset-metric-category.json diff --git a/crates/fhir/tests/data/R4/valueset-metric-color.json b/crates/fhir/tests/data/json/R4/valueset-metric-color.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-metric-color.json rename to crates/fhir/tests/data/json/R4/valueset-metric-color.json diff --git a/crates/fhir/tests/data/R4/valueset-metric-operational-status.json b/crates/fhir/tests/data/json/R4/valueset-metric-operational-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-metric-operational-status.json rename to crates/fhir/tests/data/json/R4/valueset-metric-operational-status.json diff --git a/crates/fhir/tests/data/R4/valueset-mimetypes.json b/crates/fhir/tests/data/json/R4/valueset-mimetypes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-mimetypes.json rename to crates/fhir/tests/data/json/R4/valueset-mimetypes.json diff --git a/crates/fhir/tests/data/R4/valueset-missing-tooth-reason.json b/crates/fhir/tests/data/json/R4/valueset-missing-tooth-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-missing-tooth-reason.json rename to crates/fhir/tests/data/json/R4/valueset-missing-tooth-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-modified-foodtype.json b/crates/fhir/tests/data/json/R4/valueset-modified-foodtype.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-modified-foodtype.json rename to crates/fhir/tests/data/json/R4/valueset-modified-foodtype.json diff --git a/crates/fhir/tests/data/R4/valueset-name-assembly-order.json b/crates/fhir/tests/data/json/R4/valueset-name-assembly-order.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-name-assembly-order.json rename to crates/fhir/tests/data/json/R4/valueset-name-assembly-order.json diff --git a/crates/fhir/tests/data/R4/valueset-name-part-qualifier.json b/crates/fhir/tests/data/json/R4/valueset-name-part-qualifier.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-name-part-qualifier.json rename to crates/fhir/tests/data/json/R4/valueset-name-part-qualifier.json diff --git a/crates/fhir/tests/data/R4/valueset-name-use.json b/crates/fhir/tests/data/json/R4/valueset-name-use.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-name-use.json rename to crates/fhir/tests/data/json/R4/valueset-name-use.json diff --git a/crates/fhir/tests/data/R4/valueset-name-v3-representation.json b/crates/fhir/tests/data/json/R4/valueset-name-v3-representation.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-name-v3-representation.json rename to crates/fhir/tests/data/json/R4/valueset-name-v3-representation.json diff --git a/crates/fhir/tests/data/R4/valueset-namingsystem-identifier-type.json b/crates/fhir/tests/data/json/R4/valueset-namingsystem-identifier-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-namingsystem-identifier-type.json rename to crates/fhir/tests/data/json/R4/valueset-namingsystem-identifier-type.json diff --git a/crates/fhir/tests/data/R4/valueset-namingsystem-type.json b/crates/fhir/tests/data/json/R4/valueset-namingsystem-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-namingsystem-type.json rename to crates/fhir/tests/data/json/R4/valueset-namingsystem-type.json diff --git a/crates/fhir/tests/data/R4/valueset-narrative-status.json b/crates/fhir/tests/data/json/R4/valueset-narrative-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-narrative-status.json rename to crates/fhir/tests/data/json/R4/valueset-narrative-status.json diff --git a/crates/fhir/tests/data/R4/valueset-network-type.json b/crates/fhir/tests/data/json/R4/valueset-network-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-network-type.json rename to crates/fhir/tests/data/json/R4/valueset-network-type.json diff --git a/crates/fhir/tests/data/R4/valueset-nhin-purposeofuse.json b/crates/fhir/tests/data/json/R4/valueset-nhin-purposeofuse.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-nhin-purposeofuse.json rename to crates/fhir/tests/data/json/R4/valueset-nhin-purposeofuse.json diff --git a/crates/fhir/tests/data/R4/valueset-note-type.json b/crates/fhir/tests/data/json/R4/valueset-note-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-note-type.json rename to crates/fhir/tests/data/json/R4/valueset-note-type.json diff --git a/crates/fhir/tests/data/R4/valueset-nutrient-code.json b/crates/fhir/tests/data/json/R4/valueset-nutrient-code.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-nutrient-code.json rename to crates/fhir/tests/data/json/R4/valueset-nutrient-code.json diff --git a/crates/fhir/tests/data/R4/valueset-object-lifecycle-events.json b/crates/fhir/tests/data/json/R4/valueset-object-lifecycle-events.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-object-lifecycle-events.json rename to crates/fhir/tests/data/json/R4/valueset-object-lifecycle-events.json diff --git a/crates/fhir/tests/data/R4/valueset-object-role.json b/crates/fhir/tests/data/json/R4/valueset-object-role.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-object-role.json rename to crates/fhir/tests/data/json/R4/valueset-object-role.json diff --git a/crates/fhir/tests/data/R4/valueset-observation-category.json b/crates/fhir/tests/data/json/R4/valueset-observation-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-observation-category.json rename to crates/fhir/tests/data/json/R4/valueset-observation-category.json diff --git a/crates/fhir/tests/data/R4/valueset-observation-codes.json b/crates/fhir/tests/data/json/R4/valueset-observation-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-observation-codes.json rename to crates/fhir/tests/data/json/R4/valueset-observation-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-observation-interpretation.json b/crates/fhir/tests/data/json/R4/valueset-observation-interpretation.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-observation-interpretation.json rename to crates/fhir/tests/data/json/R4/valueset-observation-interpretation.json diff --git a/crates/fhir/tests/data/R4/valueset-observation-methods.json b/crates/fhir/tests/data/json/R4/valueset-observation-methods.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-observation-methods.json rename to crates/fhir/tests/data/json/R4/valueset-observation-methods.json diff --git a/crates/fhir/tests/data/R4/valueset-observation-range-category.json b/crates/fhir/tests/data/json/R4/valueset-observation-range-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-observation-range-category.json rename to crates/fhir/tests/data/json/R4/valueset-observation-range-category.json diff --git a/crates/fhir/tests/data/R4/valueset-observation-statistics.json b/crates/fhir/tests/data/json/R4/valueset-observation-statistics.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-observation-statistics.json rename to crates/fhir/tests/data/json/R4/valueset-observation-statistics.json diff --git a/crates/fhir/tests/data/R4/valueset-observation-status.json b/crates/fhir/tests/data/json/R4/valueset-observation-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-observation-status.json rename to crates/fhir/tests/data/json/R4/valueset-observation-status.json diff --git a/crates/fhir/tests/data/R4/valueset-observation-vitalsignresult.json b/crates/fhir/tests/data/json/R4/valueset-observation-vitalsignresult.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-observation-vitalsignresult.json rename to crates/fhir/tests/data/json/R4/valueset-observation-vitalsignresult.json diff --git a/crates/fhir/tests/data/R4/valueset-operation-kind.json b/crates/fhir/tests/data/json/R4/valueset-operation-kind.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-operation-kind.json rename to crates/fhir/tests/data/json/R4/valueset-operation-kind.json diff --git a/crates/fhir/tests/data/R4/valueset-operation-outcome.json b/crates/fhir/tests/data/json/R4/valueset-operation-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-operation-outcome.json rename to crates/fhir/tests/data/json/R4/valueset-operation-outcome.json diff --git a/crates/fhir/tests/data/R4/valueset-operation-parameter-use.json b/crates/fhir/tests/data/json/R4/valueset-operation-parameter-use.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-operation-parameter-use.json rename to crates/fhir/tests/data/json/R4/valueset-operation-parameter-use.json diff --git a/crates/fhir/tests/data/R4/valueset-oral-prosthodontic-material.json b/crates/fhir/tests/data/json/R4/valueset-oral-prosthodontic-material.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-oral-prosthodontic-material.json rename to crates/fhir/tests/data/json/R4/valueset-oral-prosthodontic-material.json diff --git a/crates/fhir/tests/data/R4/valueset-organization-role.json b/crates/fhir/tests/data/json/R4/valueset-organization-role.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-organization-role.json rename to crates/fhir/tests/data/json/R4/valueset-organization-role.json diff --git a/crates/fhir/tests/data/R4/valueset-organization-type.json b/crates/fhir/tests/data/json/R4/valueset-organization-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-organization-type.json rename to crates/fhir/tests/data/json/R4/valueset-organization-type.json diff --git a/crates/fhir/tests/data/R4/valueset-orientation-type.json b/crates/fhir/tests/data/json/R4/valueset-orientation-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-orientation-type.json rename to crates/fhir/tests/data/json/R4/valueset-orientation-type.json diff --git a/crates/fhir/tests/data/R4/valueset-parameter-group.json b/crates/fhir/tests/data/json/R4/valueset-parameter-group.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-parameter-group.json rename to crates/fhir/tests/data/json/R4/valueset-parameter-group.json diff --git a/crates/fhir/tests/data/R4/valueset-parent-relationship-codes.json b/crates/fhir/tests/data/json/R4/valueset-parent-relationship-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-parent-relationship-codes.json rename to crates/fhir/tests/data/json/R4/valueset-parent-relationship-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-participant-role.json b/crates/fhir/tests/data/json/R4/valueset-participant-role.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-participant-role.json rename to crates/fhir/tests/data/json/R4/valueset-participant-role.json diff --git a/crates/fhir/tests/data/R4/valueset-participantrequired.json b/crates/fhir/tests/data/json/R4/valueset-participantrequired.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-participantrequired.json rename to crates/fhir/tests/data/json/R4/valueset-participantrequired.json diff --git a/crates/fhir/tests/data/R4/valueset-participation-role-type.json b/crates/fhir/tests/data/json/R4/valueset-participation-role-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-participation-role-type.json rename to crates/fhir/tests/data/json/R4/valueset-participation-role-type.json diff --git a/crates/fhir/tests/data/R4/valueset-participationstatus.json b/crates/fhir/tests/data/json/R4/valueset-participationstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-participationstatus.json rename to crates/fhir/tests/data/json/R4/valueset-participationstatus.json diff --git a/crates/fhir/tests/data/R4/valueset-patient-contactrelationship.json b/crates/fhir/tests/data/json/R4/valueset-patient-contactrelationship.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-patient-contactrelationship.json rename to crates/fhir/tests/data/json/R4/valueset-patient-contactrelationship.json diff --git a/crates/fhir/tests/data/R4/valueset-payeetype.json b/crates/fhir/tests/data/json/R4/valueset-payeetype.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-payeetype.json rename to crates/fhir/tests/data/json/R4/valueset-payeetype.json diff --git a/crates/fhir/tests/data/R4/valueset-payment-adjustment-reason.json b/crates/fhir/tests/data/json/R4/valueset-payment-adjustment-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-payment-adjustment-reason.json rename to crates/fhir/tests/data/json/R4/valueset-payment-adjustment-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-payment-status.json b/crates/fhir/tests/data/json/R4/valueset-payment-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-payment-status.json rename to crates/fhir/tests/data/json/R4/valueset-payment-status.json diff --git a/crates/fhir/tests/data/R4/valueset-payment-type.json b/crates/fhir/tests/data/json/R4/valueset-payment-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-payment-type.json rename to crates/fhir/tests/data/json/R4/valueset-payment-type.json diff --git a/crates/fhir/tests/data/R4/valueset-performer-function.json b/crates/fhir/tests/data/json/R4/valueset-performer-function.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-performer-function.json rename to crates/fhir/tests/data/json/R4/valueset-performer-function.json diff --git a/crates/fhir/tests/data/R4/valueset-performer-role.json b/crates/fhir/tests/data/json/R4/valueset-performer-role.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-performer-role.json rename to crates/fhir/tests/data/json/R4/valueset-performer-role.json diff --git a/crates/fhir/tests/data/R4/valueset-permitted-data-type.json b/crates/fhir/tests/data/json/R4/valueset-permitted-data-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-permitted-data-type.json rename to crates/fhir/tests/data/json/R4/valueset-permitted-data-type.json diff --git a/crates/fhir/tests/data/R4/valueset-plan-definition-type.json b/crates/fhir/tests/data/json/R4/valueset-plan-definition-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-plan-definition-type.json rename to crates/fhir/tests/data/json/R4/valueset-plan-definition-type.json diff --git a/crates/fhir/tests/data/R4/valueset-postal-address-use.json b/crates/fhir/tests/data/json/R4/valueset-postal-address-use.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-postal-address-use.json rename to crates/fhir/tests/data/json/R4/valueset-postal-address-use.json diff --git a/crates/fhir/tests/data/R4/valueset-practitioner-role.json b/crates/fhir/tests/data/json/R4/valueset-practitioner-role.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-practitioner-role.json rename to crates/fhir/tests/data/json/R4/valueset-practitioner-role.json diff --git a/crates/fhir/tests/data/R4/valueset-practitioner-specialty.json b/crates/fhir/tests/data/json/R4/valueset-practitioner-specialty.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-practitioner-specialty.json rename to crates/fhir/tests/data/json/R4/valueset-practitioner-specialty.json diff --git a/crates/fhir/tests/data/R4/valueset-precision-estimate-type.json b/crates/fhir/tests/data/json/R4/valueset-precision-estimate-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-precision-estimate-type.json rename to crates/fhir/tests/data/json/R4/valueset-precision-estimate-type.json diff --git a/crates/fhir/tests/data/R4/valueset-prepare-patient-prior-specimen-collection.json b/crates/fhir/tests/data/json/R4/valueset-prepare-patient-prior-specimen-collection.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-prepare-patient-prior-specimen-collection.json rename to crates/fhir/tests/data/json/R4/valueset-prepare-patient-prior-specimen-collection.json diff --git a/crates/fhir/tests/data/R4/valueset-probability-distribution-type.json b/crates/fhir/tests/data/json/R4/valueset-probability-distribution-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-probability-distribution-type.json rename to crates/fhir/tests/data/json/R4/valueset-probability-distribution-type.json diff --git a/crates/fhir/tests/data/R4/valueset-procedure-category.json b/crates/fhir/tests/data/json/R4/valueset-procedure-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-procedure-category.json rename to crates/fhir/tests/data/json/R4/valueset-procedure-category.json diff --git a/crates/fhir/tests/data/R4/valueset-procedure-code.json b/crates/fhir/tests/data/json/R4/valueset-procedure-code.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-procedure-code.json rename to crates/fhir/tests/data/json/R4/valueset-procedure-code.json diff --git a/crates/fhir/tests/data/R4/valueset-procedure-followup.json b/crates/fhir/tests/data/json/R4/valueset-procedure-followup.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-procedure-followup.json rename to crates/fhir/tests/data/json/R4/valueset-procedure-followup.json diff --git a/crates/fhir/tests/data/R4/valueset-procedure-not-performed-reason.json b/crates/fhir/tests/data/json/R4/valueset-procedure-not-performed-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-procedure-not-performed-reason.json rename to crates/fhir/tests/data/json/R4/valueset-procedure-not-performed-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-procedure-outcome.json b/crates/fhir/tests/data/json/R4/valueset-procedure-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-procedure-outcome.json rename to crates/fhir/tests/data/json/R4/valueset-procedure-outcome.json diff --git a/crates/fhir/tests/data/R4/valueset-procedure-progress-status-codes.json b/crates/fhir/tests/data/json/R4/valueset-procedure-progress-status-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-procedure-progress-status-codes.json rename to crates/fhir/tests/data/json/R4/valueset-procedure-progress-status-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-procedure-reason.json b/crates/fhir/tests/data/json/R4/valueset-procedure-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-procedure-reason.json rename to crates/fhir/tests/data/json/R4/valueset-procedure-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-process-priority.json b/crates/fhir/tests/data/json/R4/valueset-process-priority.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-process-priority.json rename to crates/fhir/tests/data/json/R4/valueset-process-priority.json diff --git a/crates/fhir/tests/data/R4/valueset-product-category.json b/crates/fhir/tests/data/json/R4/valueset-product-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-product-category.json rename to crates/fhir/tests/data/json/R4/valueset-product-category.json diff --git a/crates/fhir/tests/data/R4/valueset-product-status.json b/crates/fhir/tests/data/json/R4/valueset-product-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-product-status.json rename to crates/fhir/tests/data/json/R4/valueset-product-status.json diff --git a/crates/fhir/tests/data/R4/valueset-product-storage-scale.json b/crates/fhir/tests/data/json/R4/valueset-product-storage-scale.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-product-storage-scale.json rename to crates/fhir/tests/data/json/R4/valueset-product-storage-scale.json diff --git a/crates/fhir/tests/data/R4/valueset-program.json b/crates/fhir/tests/data/json/R4/valueset-program.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-program.json rename to crates/fhir/tests/data/json/R4/valueset-program.json diff --git a/crates/fhir/tests/data/R4/valueset-property-representation.json b/crates/fhir/tests/data/json/R4/valueset-property-representation.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-property-representation.json rename to crates/fhir/tests/data/json/R4/valueset-property-representation.json diff --git a/crates/fhir/tests/data/R4/valueset-provenance-activity-type.json b/crates/fhir/tests/data/json/R4/valueset-provenance-activity-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-provenance-activity-type.json rename to crates/fhir/tests/data/json/R4/valueset-provenance-activity-type.json diff --git a/crates/fhir/tests/data/R4/valueset-provenance-agent-role.json b/crates/fhir/tests/data/json/R4/valueset-provenance-agent-role.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-provenance-agent-role.json rename to crates/fhir/tests/data/json/R4/valueset-provenance-agent-role.json diff --git a/crates/fhir/tests/data/R4/valueset-provenance-agent-type.json b/crates/fhir/tests/data/json/R4/valueset-provenance-agent-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-provenance-agent-type.json rename to crates/fhir/tests/data/json/R4/valueset-provenance-agent-type.json diff --git a/crates/fhir/tests/data/R4/valueset-provenance-entity-role.json b/crates/fhir/tests/data/json/R4/valueset-provenance-entity-role.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-provenance-entity-role.json rename to crates/fhir/tests/data/json/R4/valueset-provenance-entity-role.json diff --git a/crates/fhir/tests/data/R4/valueset-provenance-history-agent-type.json b/crates/fhir/tests/data/json/R4/valueset-provenance-history-agent-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-provenance-history-agent-type.json rename to crates/fhir/tests/data/json/R4/valueset-provenance-history-agent-type.json diff --git a/crates/fhir/tests/data/R4/valueset-provenance-history-record-activity.json b/crates/fhir/tests/data/json/R4/valueset-provenance-history-record-activity.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-provenance-history-record-activity.json rename to crates/fhir/tests/data/json/R4/valueset-provenance-history-record-activity.json diff --git a/crates/fhir/tests/data/R4/valueset-provider-qualification.json b/crates/fhir/tests/data/json/R4/valueset-provider-qualification.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-provider-qualification.json rename to crates/fhir/tests/data/json/R4/valueset-provider-qualification.json diff --git a/crates/fhir/tests/data/R4/valueset-provider-taxonomy.json b/crates/fhir/tests/data/json/R4/valueset-provider-taxonomy.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-provider-taxonomy.json rename to crates/fhir/tests/data/json/R4/valueset-provider-taxonomy.json diff --git a/crates/fhir/tests/data/R4/valueset-publication-status.json b/crates/fhir/tests/data/json/R4/valueset-publication-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-publication-status.json rename to crates/fhir/tests/data/json/R4/valueset-publication-status.json diff --git a/crates/fhir/tests/data/R4/valueset-quality-type.json b/crates/fhir/tests/data/json/R4/valueset-quality-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-quality-type.json rename to crates/fhir/tests/data/json/R4/valueset-quality-type.json diff --git a/crates/fhir/tests/data/R4/valueset-quantity-comparator.json b/crates/fhir/tests/data/json/R4/valueset-quantity-comparator.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-quantity-comparator.json rename to crates/fhir/tests/data/json/R4/valueset-quantity-comparator.json diff --git a/crates/fhir/tests/data/R4/valueset-question-max-occurs.json b/crates/fhir/tests/data/json/R4/valueset-question-max-occurs.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-question-max-occurs.json rename to crates/fhir/tests/data/json/R4/valueset-question-max-occurs.json diff --git a/crates/fhir/tests/data/R4/valueset-questionnaire-answers-status.json b/crates/fhir/tests/data/json/R4/valueset-questionnaire-answers-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-questionnaire-answers-status.json rename to crates/fhir/tests/data/json/R4/valueset-questionnaire-answers-status.json diff --git a/crates/fhir/tests/data/R4/valueset-questionnaire-answers.json b/crates/fhir/tests/data/json/R4/valueset-questionnaire-answers.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-questionnaire-answers.json rename to crates/fhir/tests/data/json/R4/valueset-questionnaire-answers.json diff --git a/crates/fhir/tests/data/R4/valueset-questionnaire-category.json b/crates/fhir/tests/data/json/R4/valueset-questionnaire-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-questionnaire-category.json rename to crates/fhir/tests/data/json/R4/valueset-questionnaire-category.json diff --git a/crates/fhir/tests/data/R4/valueset-questionnaire-display-category.json b/crates/fhir/tests/data/json/R4/valueset-questionnaire-display-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-questionnaire-display-category.json rename to crates/fhir/tests/data/json/R4/valueset-questionnaire-display-category.json diff --git a/crates/fhir/tests/data/R4/valueset-questionnaire-enable-behavior.json b/crates/fhir/tests/data/json/R4/valueset-questionnaire-enable-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-questionnaire-enable-behavior.json rename to crates/fhir/tests/data/json/R4/valueset-questionnaire-enable-behavior.json diff --git a/crates/fhir/tests/data/R4/valueset-questionnaire-enable-operator.json b/crates/fhir/tests/data/json/R4/valueset-questionnaire-enable-operator.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-questionnaire-enable-operator.json rename to crates/fhir/tests/data/json/R4/valueset-questionnaire-enable-operator.json diff --git a/crates/fhir/tests/data/R4/valueset-questionnaire-item-control.json b/crates/fhir/tests/data/json/R4/valueset-questionnaire-item-control.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-questionnaire-item-control.json rename to crates/fhir/tests/data/json/R4/valueset-questionnaire-item-control.json diff --git a/crates/fhir/tests/data/R4/valueset-questionnaire-questions.json b/crates/fhir/tests/data/json/R4/valueset-questionnaire-questions.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-questionnaire-questions.json rename to crates/fhir/tests/data/json/R4/valueset-questionnaire-questions.json diff --git a/crates/fhir/tests/data/R4/valueset-questionnaire-usage-mode.json b/crates/fhir/tests/data/json/R4/valueset-questionnaire-usage-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-questionnaire-usage-mode.json rename to crates/fhir/tests/data/json/R4/valueset-questionnaire-usage-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-questionnaire.json b/crates/fhir/tests/data/json/R4/valueset-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-questionnaire.json rename to crates/fhir/tests/data/json/R4/valueset-questionnaire.json diff --git a/crates/fhir/tests/data/R4/valueset-questionnaireresponse-mode.json b/crates/fhir/tests/data/json/R4/valueset-questionnaireresponse-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-questionnaireresponse-mode.json rename to crates/fhir/tests/data/json/R4/valueset-questionnaireresponse-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-reaction-event-certainty.json b/crates/fhir/tests/data/json/R4/valueset-reaction-event-certainty.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-reaction-event-certainty.json rename to crates/fhir/tests/data/json/R4/valueset-reaction-event-certainty.json diff --git a/crates/fhir/tests/data/R4/valueset-reaction-event-severity.json b/crates/fhir/tests/data/json/R4/valueset-reaction-event-severity.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-reaction-event-severity.json rename to crates/fhir/tests/data/json/R4/valueset-reaction-event-severity.json diff --git a/crates/fhir/tests/data/R4/valueset-reason-medication-given-codes.json b/crates/fhir/tests/data/json/R4/valueset-reason-medication-given-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-reason-medication-given-codes.json rename to crates/fhir/tests/data/json/R4/valueset-reason-medication-given-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-reason-medication-not-given-codes.json b/crates/fhir/tests/data/json/R4/valueset-reason-medication-not-given-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-reason-medication-not-given-codes.json rename to crates/fhir/tests/data/json/R4/valueset-reason-medication-not-given-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-reason-medication-status-codes.json b/crates/fhir/tests/data/json/R4/valueset-reason-medication-status-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-reason-medication-status-codes.json rename to crates/fhir/tests/data/json/R4/valueset-reason-medication-status-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-recommendation-strength.json b/crates/fhir/tests/data/json/R4/valueset-recommendation-strength.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-recommendation-strength.json rename to crates/fhir/tests/data/json/R4/valueset-recommendation-strength.json diff --git a/crates/fhir/tests/data/R4/valueset-ref-sequences.json b/crates/fhir/tests/data/json/R4/valueset-ref-sequences.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-ref-sequences.json rename to crates/fhir/tests/data/json/R4/valueset-ref-sequences.json diff --git a/crates/fhir/tests/data/R4/valueset-reference-handling-policy.json b/crates/fhir/tests/data/json/R4/valueset-reference-handling-policy.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-reference-handling-policy.json rename to crates/fhir/tests/data/json/R4/valueset-reference-handling-policy.json diff --git a/crates/fhir/tests/data/R4/valueset-reference-version-rules.json b/crates/fhir/tests/data/json/R4/valueset-reference-version-rules.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-reference-version-rules.json rename to crates/fhir/tests/data/json/R4/valueset-reference-version-rules.json diff --git a/crates/fhir/tests/data/R4/valueset-referencerange-appliesto.json b/crates/fhir/tests/data/json/R4/valueset-referencerange-appliesto.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-referencerange-appliesto.json rename to crates/fhir/tests/data/json/R4/valueset-referencerange-appliesto.json diff --git a/crates/fhir/tests/data/R4/valueset-referencerange-meaning.json b/crates/fhir/tests/data/json/R4/valueset-referencerange-meaning.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-referencerange-meaning.json rename to crates/fhir/tests/data/json/R4/valueset-referencerange-meaning.json diff --git a/crates/fhir/tests/data/R4/valueset-rejection-criteria.json b/crates/fhir/tests/data/json/R4/valueset-rejection-criteria.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-rejection-criteria.json rename to crates/fhir/tests/data/json/R4/valueset-rejection-criteria.json diff --git a/crates/fhir/tests/data/R4/valueset-related-artifact-type.json b/crates/fhir/tests/data/json/R4/valueset-related-artifact-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-related-artifact-type.json rename to crates/fhir/tests/data/json/R4/valueset-related-artifact-type.json diff --git a/crates/fhir/tests/data/R4/valueset-related-claim-relationship.json b/crates/fhir/tests/data/json/R4/valueset-related-claim-relationship.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-related-claim-relationship.json rename to crates/fhir/tests/data/json/R4/valueset-related-claim-relationship.json diff --git a/crates/fhir/tests/data/R4/valueset-relatedperson-relationshiptype.json b/crates/fhir/tests/data/json/R4/valueset-relatedperson-relationshiptype.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-relatedperson-relationshiptype.json rename to crates/fhir/tests/data/json/R4/valueset-relatedperson-relationshiptype.json diff --git a/crates/fhir/tests/data/R4/valueset-relation-type.json b/crates/fhir/tests/data/json/R4/valueset-relation-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-relation-type.json rename to crates/fhir/tests/data/json/R4/valueset-relation-type.json diff --git a/crates/fhir/tests/data/R4/valueset-relationship.json b/crates/fhir/tests/data/json/R4/valueset-relationship.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-relationship.json rename to crates/fhir/tests/data/json/R4/valueset-relationship.json diff --git a/crates/fhir/tests/data/R4/valueset-remittance-outcome.json b/crates/fhir/tests/data/json/R4/valueset-remittance-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-remittance-outcome.json rename to crates/fhir/tests/data/json/R4/valueset-remittance-outcome.json diff --git a/crates/fhir/tests/data/R4/valueset-report-action-result-codes.json b/crates/fhir/tests/data/json/R4/valueset-report-action-result-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-report-action-result-codes.json rename to crates/fhir/tests/data/json/R4/valueset-report-action-result-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-report-codes.json b/crates/fhir/tests/data/json/R4/valueset-report-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-report-codes.json rename to crates/fhir/tests/data/json/R4/valueset-report-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-report-participant-type.json b/crates/fhir/tests/data/json/R4/valueset-report-participant-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-report-participant-type.json rename to crates/fhir/tests/data/json/R4/valueset-report-participant-type.json diff --git a/crates/fhir/tests/data/R4/valueset-report-result-codes.json b/crates/fhir/tests/data/json/R4/valueset-report-result-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-report-result-codes.json rename to crates/fhir/tests/data/json/R4/valueset-report-result-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-report-status-codes.json b/crates/fhir/tests/data/json/R4/valueset-report-status-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-report-status-codes.json rename to crates/fhir/tests/data/json/R4/valueset-report-status-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-repository-type.json b/crates/fhir/tests/data/json/R4/valueset-repository-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-repository-type.json rename to crates/fhir/tests/data/json/R4/valueset-repository-type.json diff --git a/crates/fhir/tests/data/R4/valueset-request-intent.json b/crates/fhir/tests/data/json/R4/valueset-request-intent.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-request-intent.json rename to crates/fhir/tests/data/json/R4/valueset-request-intent.json diff --git a/crates/fhir/tests/data/R4/valueset-request-priority.json b/crates/fhir/tests/data/json/R4/valueset-request-priority.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-request-priority.json rename to crates/fhir/tests/data/json/R4/valueset-request-priority.json diff --git a/crates/fhir/tests/data/R4/valueset-request-resource-types.json b/crates/fhir/tests/data/json/R4/valueset-request-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-request-resource-types.json rename to crates/fhir/tests/data/json/R4/valueset-request-resource-types.json diff --git a/crates/fhir/tests/data/R4/valueset-request-status.json b/crates/fhir/tests/data/json/R4/valueset-request-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-request-status.json rename to crates/fhir/tests/data/json/R4/valueset-request-status.json diff --git a/crates/fhir/tests/data/R4/valueset-research-element-type.json b/crates/fhir/tests/data/json/R4/valueset-research-element-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-research-element-type.json rename to crates/fhir/tests/data/json/R4/valueset-research-element-type.json diff --git a/crates/fhir/tests/data/R4/valueset-research-study-objective-type.json b/crates/fhir/tests/data/json/R4/valueset-research-study-objective-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-research-study-objective-type.json rename to crates/fhir/tests/data/json/R4/valueset-research-study-objective-type.json diff --git a/crates/fhir/tests/data/R4/valueset-research-study-phase.json b/crates/fhir/tests/data/json/R4/valueset-research-study-phase.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-research-study-phase.json rename to crates/fhir/tests/data/json/R4/valueset-research-study-phase.json diff --git a/crates/fhir/tests/data/R4/valueset-research-study-prim-purp-type.json b/crates/fhir/tests/data/json/R4/valueset-research-study-prim-purp-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-research-study-prim-purp-type.json rename to crates/fhir/tests/data/json/R4/valueset-research-study-prim-purp-type.json diff --git a/crates/fhir/tests/data/R4/valueset-research-study-reason-stopped.json b/crates/fhir/tests/data/json/R4/valueset-research-study-reason-stopped.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-research-study-reason-stopped.json rename to crates/fhir/tests/data/json/R4/valueset-research-study-reason-stopped.json diff --git a/crates/fhir/tests/data/R4/valueset-research-study-status.json b/crates/fhir/tests/data/json/R4/valueset-research-study-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-research-study-status.json rename to crates/fhir/tests/data/json/R4/valueset-research-study-status.json diff --git a/crates/fhir/tests/data/R4/valueset-research-subject-status.json b/crates/fhir/tests/data/json/R4/valueset-research-subject-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-research-subject-status.json rename to crates/fhir/tests/data/json/R4/valueset-research-subject-status.json diff --git a/crates/fhir/tests/data/R4/valueset-resource-aggregation-mode.json b/crates/fhir/tests/data/json/R4/valueset-resource-aggregation-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-resource-aggregation-mode.json rename to crates/fhir/tests/data/json/R4/valueset-resource-aggregation-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-resource-security-category.json b/crates/fhir/tests/data/json/R4/valueset-resource-security-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-resource-security-category.json rename to crates/fhir/tests/data/json/R4/valueset-resource-security-category.json diff --git a/crates/fhir/tests/data/R4/valueset-resource-slicing-rules.json b/crates/fhir/tests/data/json/R4/valueset-resource-slicing-rules.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-resource-slicing-rules.json rename to crates/fhir/tests/data/json/R4/valueset-resource-slicing-rules.json diff --git a/crates/fhir/tests/data/R4/valueset-resource-status.json b/crates/fhir/tests/data/json/R4/valueset-resource-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-resource-status.json rename to crates/fhir/tests/data/json/R4/valueset-resource-status.json diff --git a/crates/fhir/tests/data/R4/valueset-resource-type-link.json b/crates/fhir/tests/data/json/R4/valueset-resource-type-link.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-resource-type-link.json rename to crates/fhir/tests/data/json/R4/valueset-resource-type-link.json diff --git a/crates/fhir/tests/data/R4/valueset-resource-types.json b/crates/fhir/tests/data/json/R4/valueset-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-resource-types.json rename to crates/fhir/tests/data/json/R4/valueset-resource-types.json diff --git a/crates/fhir/tests/data/R4/valueset-resource-validation-mode.json b/crates/fhir/tests/data/json/R4/valueset-resource-validation-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-resource-validation-mode.json rename to crates/fhir/tests/data/json/R4/valueset-resource-validation-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-response-code.json b/crates/fhir/tests/data/json/R4/valueset-response-code.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-response-code.json rename to crates/fhir/tests/data/json/R4/valueset-response-code.json diff --git a/crates/fhir/tests/data/R4/valueset-restful-capability-mode.json b/crates/fhir/tests/data/json/R4/valueset-restful-capability-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-restful-capability-mode.json rename to crates/fhir/tests/data/json/R4/valueset-restful-capability-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-restful-security-service.json b/crates/fhir/tests/data/json/R4/valueset-restful-security-service.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-restful-security-service.json rename to crates/fhir/tests/data/json/R4/valueset-restful-security-service.json diff --git a/crates/fhir/tests/data/R4/valueset-risk-estimate-type.json b/crates/fhir/tests/data/json/R4/valueset-risk-estimate-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-risk-estimate-type.json rename to crates/fhir/tests/data/json/R4/valueset-risk-estimate-type.json diff --git a/crates/fhir/tests/data/R4/valueset-risk-probability.json b/crates/fhir/tests/data/json/R4/valueset-risk-probability.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-risk-probability.json rename to crates/fhir/tests/data/json/R4/valueset-risk-probability.json diff --git a/crates/fhir/tests/data/R4/valueset-route-codes.json b/crates/fhir/tests/data/json/R4/valueset-route-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-route-codes.json rename to crates/fhir/tests/data/json/R4/valueset-route-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-search-comparator.json b/crates/fhir/tests/data/json/R4/valueset-search-comparator.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-search-comparator.json rename to crates/fhir/tests/data/json/R4/valueset-search-comparator.json diff --git a/crates/fhir/tests/data/R4/valueset-search-entry-mode.json b/crates/fhir/tests/data/json/R4/valueset-search-entry-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-search-entry-mode.json rename to crates/fhir/tests/data/json/R4/valueset-search-entry-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-search-modifier-code.json b/crates/fhir/tests/data/json/R4/valueset-search-modifier-code.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-search-modifier-code.json rename to crates/fhir/tests/data/json/R4/valueset-search-modifier-code.json diff --git a/crates/fhir/tests/data/R4/valueset-search-param-type.json b/crates/fhir/tests/data/json/R4/valueset-search-param-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-search-param-type.json rename to crates/fhir/tests/data/json/R4/valueset-search-param-type.json diff --git a/crates/fhir/tests/data/R4/valueset-search-xpath-usage.json b/crates/fhir/tests/data/json/R4/valueset-search-xpath-usage.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-search-xpath-usage.json rename to crates/fhir/tests/data/json/R4/valueset-search-xpath-usage.json diff --git a/crates/fhir/tests/data/R4/valueset-secondary-finding.json b/crates/fhir/tests/data/json/R4/valueset-secondary-finding.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-secondary-finding.json rename to crates/fhir/tests/data/json/R4/valueset-secondary-finding.json diff --git a/crates/fhir/tests/data/R4/valueset-security-labels.json b/crates/fhir/tests/data/json/R4/valueset-security-labels.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-security-labels.json rename to crates/fhir/tests/data/json/R4/valueset-security-labels.json diff --git a/crates/fhir/tests/data/R4/valueset-security-role-type.json b/crates/fhir/tests/data/json/R4/valueset-security-role-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-security-role-type.json rename to crates/fhir/tests/data/json/R4/valueset-security-role-type.json diff --git a/crates/fhir/tests/data/R4/valueset-sequence-quality-method.json b/crates/fhir/tests/data/json/R4/valueset-sequence-quality-method.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-sequence-quality-method.json rename to crates/fhir/tests/data/json/R4/valueset-sequence-quality-method.json diff --git a/crates/fhir/tests/data/R4/valueset-sequence-quality-standardSequence.json b/crates/fhir/tests/data/json/R4/valueset-sequence-quality-standardSequence.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-sequence-quality-standardSequence.json rename to crates/fhir/tests/data/json/R4/valueset-sequence-quality-standardSequence.json diff --git a/crates/fhir/tests/data/R4/valueset-sequence-referenceSeq.json b/crates/fhir/tests/data/json/R4/valueset-sequence-referenceSeq.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-sequence-referenceSeq.json rename to crates/fhir/tests/data/json/R4/valueset-sequence-referenceSeq.json diff --git a/crates/fhir/tests/data/R4/valueset-sequence-species.json b/crates/fhir/tests/data/json/R4/valueset-sequence-species.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-sequence-species.json rename to crates/fhir/tests/data/json/R4/valueset-sequence-species.json diff --git a/crates/fhir/tests/data/R4/valueset-sequence-type.json b/crates/fhir/tests/data/json/R4/valueset-sequence-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-sequence-type.json rename to crates/fhir/tests/data/json/R4/valueset-sequence-type.json diff --git a/crates/fhir/tests/data/R4/valueset-sequenceontology.json b/crates/fhir/tests/data/json/R4/valueset-sequenceontology.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-sequenceontology.json rename to crates/fhir/tests/data/json/R4/valueset-sequenceontology.json diff --git a/crates/fhir/tests/data/R4/valueset-series-performer-function.json b/crates/fhir/tests/data/json/R4/valueset-series-performer-function.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-series-performer-function.json rename to crates/fhir/tests/data/json/R4/valueset-series-performer-function.json diff --git a/crates/fhir/tests/data/R4/valueset-service-category.json b/crates/fhir/tests/data/json/R4/valueset-service-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-service-category.json rename to crates/fhir/tests/data/json/R4/valueset-service-category.json diff --git a/crates/fhir/tests/data/R4/valueset-service-modifiers.json b/crates/fhir/tests/data/json/R4/valueset-service-modifiers.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-service-modifiers.json rename to crates/fhir/tests/data/json/R4/valueset-service-modifiers.json diff --git a/crates/fhir/tests/data/R4/valueset-service-pharmacy.json b/crates/fhir/tests/data/json/R4/valueset-service-pharmacy.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-service-pharmacy.json rename to crates/fhir/tests/data/json/R4/valueset-service-pharmacy.json diff --git a/crates/fhir/tests/data/R4/valueset-service-place.json b/crates/fhir/tests/data/json/R4/valueset-service-place.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-service-place.json rename to crates/fhir/tests/data/json/R4/valueset-service-place.json diff --git a/crates/fhir/tests/data/R4/valueset-service-product.json b/crates/fhir/tests/data/json/R4/valueset-service-product.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-service-product.json rename to crates/fhir/tests/data/json/R4/valueset-service-product.json diff --git a/crates/fhir/tests/data/R4/valueset-service-provision-conditions.json b/crates/fhir/tests/data/json/R4/valueset-service-provision-conditions.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-service-provision-conditions.json rename to crates/fhir/tests/data/json/R4/valueset-service-provision-conditions.json diff --git a/crates/fhir/tests/data/R4/valueset-service-referral-method.json b/crates/fhir/tests/data/json/R4/valueset-service-referral-method.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-service-referral-method.json rename to crates/fhir/tests/data/json/R4/valueset-service-referral-method.json diff --git a/crates/fhir/tests/data/R4/valueset-service-type.json b/crates/fhir/tests/data/json/R4/valueset-service-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-service-type.json rename to crates/fhir/tests/data/json/R4/valueset-service-type.json diff --git a/crates/fhir/tests/data/R4/valueset-service-uscls.json b/crates/fhir/tests/data/json/R4/valueset-service-uscls.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-service-uscls.json rename to crates/fhir/tests/data/json/R4/valueset-service-uscls.json diff --git a/crates/fhir/tests/data/R4/valueset-servicerequest-category.json b/crates/fhir/tests/data/json/R4/valueset-servicerequest-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-servicerequest-category.json rename to crates/fhir/tests/data/json/R4/valueset-servicerequest-category.json diff --git a/crates/fhir/tests/data/R4/valueset-servicerequest-orderdetail.json b/crates/fhir/tests/data/json/R4/valueset-servicerequest-orderdetail.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-servicerequest-orderdetail.json rename to crates/fhir/tests/data/json/R4/valueset-servicerequest-orderdetail.json diff --git a/crates/fhir/tests/data/R4/valueset-sibling-relationship-codes.json b/crates/fhir/tests/data/json/R4/valueset-sibling-relationship-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-sibling-relationship-codes.json rename to crates/fhir/tests/data/json/R4/valueset-sibling-relationship-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-signature-type.json b/crates/fhir/tests/data/json/R4/valueset-signature-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-signature-type.json rename to crates/fhir/tests/data/json/R4/valueset-signature-type.json diff --git a/crates/fhir/tests/data/R4/valueset-slotstatus.json b/crates/fhir/tests/data/json/R4/valueset-slotstatus.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-slotstatus.json rename to crates/fhir/tests/data/json/R4/valueset-slotstatus.json diff --git a/crates/fhir/tests/data/R4/valueset-smart-capabilities.json b/crates/fhir/tests/data/json/R4/valueset-smart-capabilities.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-smart-capabilities.json rename to crates/fhir/tests/data/json/R4/valueset-smart-capabilities.json diff --git a/crates/fhir/tests/data/R4/valueset-sort-direction.json b/crates/fhir/tests/data/json/R4/valueset-sort-direction.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-sort-direction.json rename to crates/fhir/tests/data/json/R4/valueset-sort-direction.json diff --git a/crates/fhir/tests/data/R4/valueset-spdx-license.json b/crates/fhir/tests/data/json/R4/valueset-spdx-license.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-spdx-license.json rename to crates/fhir/tests/data/json/R4/valueset-spdx-license.json diff --git a/crates/fhir/tests/data/R4/valueset-special-values.json b/crates/fhir/tests/data/json/R4/valueset-special-values.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-special-values.json rename to crates/fhir/tests/data/json/R4/valueset-special-values.json diff --git a/crates/fhir/tests/data/R4/valueset-specimen-collection-method.json b/crates/fhir/tests/data/json/R4/valueset-specimen-collection-method.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-specimen-collection-method.json rename to crates/fhir/tests/data/json/R4/valueset-specimen-collection-method.json diff --git a/crates/fhir/tests/data/R4/valueset-specimen-collection-priority.json b/crates/fhir/tests/data/json/R4/valueset-specimen-collection-priority.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-specimen-collection-priority.json rename to crates/fhir/tests/data/json/R4/valueset-specimen-collection-priority.json diff --git a/crates/fhir/tests/data/R4/valueset-specimen-collection.json b/crates/fhir/tests/data/json/R4/valueset-specimen-collection.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-specimen-collection.json rename to crates/fhir/tests/data/json/R4/valueset-specimen-collection.json diff --git a/crates/fhir/tests/data/R4/valueset-specimen-contained-preference.json b/crates/fhir/tests/data/json/R4/valueset-specimen-contained-preference.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-specimen-contained-preference.json rename to crates/fhir/tests/data/json/R4/valueset-specimen-contained-preference.json diff --git a/crates/fhir/tests/data/R4/valueset-specimen-container-type.json b/crates/fhir/tests/data/json/R4/valueset-specimen-container-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-specimen-container-type.json rename to crates/fhir/tests/data/json/R4/valueset-specimen-container-type.json diff --git a/crates/fhir/tests/data/R4/valueset-specimen-processing-procedure.json b/crates/fhir/tests/data/json/R4/valueset-specimen-processing-procedure.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-specimen-processing-procedure.json rename to crates/fhir/tests/data/json/R4/valueset-specimen-processing-procedure.json diff --git a/crates/fhir/tests/data/R4/valueset-specimen-status.json b/crates/fhir/tests/data/json/R4/valueset-specimen-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-specimen-status.json rename to crates/fhir/tests/data/json/R4/valueset-specimen-status.json diff --git a/crates/fhir/tests/data/R4/valueset-standards-status.json b/crates/fhir/tests/data/json/R4/valueset-standards-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-standards-status.json rename to crates/fhir/tests/data/json/R4/valueset-standards-status.json diff --git a/crates/fhir/tests/data/R4/valueset-strand-type.json b/crates/fhir/tests/data/json/R4/valueset-strand-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-strand-type.json rename to crates/fhir/tests/data/json/R4/valueset-strand-type.json diff --git a/crates/fhir/tests/data/R4/valueset-structure-definition-kind.json b/crates/fhir/tests/data/json/R4/valueset-structure-definition-kind.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-structure-definition-kind.json rename to crates/fhir/tests/data/json/R4/valueset-structure-definition-kind.json diff --git a/crates/fhir/tests/data/R4/valueset-study-type.json b/crates/fhir/tests/data/json/R4/valueset-study-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-study-type.json rename to crates/fhir/tests/data/json/R4/valueset-study-type.json diff --git a/crates/fhir/tests/data/R4/valueset-subject-type.json b/crates/fhir/tests/data/json/R4/valueset-subject-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-subject-type.json rename to crates/fhir/tests/data/json/R4/valueset-subject-type.json diff --git a/crates/fhir/tests/data/R4/valueset-subscriber-relationship.json b/crates/fhir/tests/data/json/R4/valueset-subscriber-relationship.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-subscriber-relationship.json rename to crates/fhir/tests/data/json/R4/valueset-subscriber-relationship.json diff --git a/crates/fhir/tests/data/R4/valueset-subscription-channel-type.json b/crates/fhir/tests/data/json/R4/valueset-subscription-channel-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-subscription-channel-type.json rename to crates/fhir/tests/data/json/R4/valueset-subscription-channel-type.json diff --git a/crates/fhir/tests/data/R4/valueset-subscription-status.json b/crates/fhir/tests/data/json/R4/valueset-subscription-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-subscription-status.json rename to crates/fhir/tests/data/json/R4/valueset-subscription-status.json diff --git a/crates/fhir/tests/data/R4/valueset-subscription-tag.json b/crates/fhir/tests/data/json/R4/valueset-subscription-tag.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-subscription-tag.json rename to crates/fhir/tests/data/json/R4/valueset-subscription-tag.json diff --git a/crates/fhir/tests/data/R4/valueset-substance-category.json b/crates/fhir/tests/data/json/R4/valueset-substance-category.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-substance-category.json rename to crates/fhir/tests/data/json/R4/valueset-substance-category.json diff --git a/crates/fhir/tests/data/R4/valueset-substance-code.json b/crates/fhir/tests/data/json/R4/valueset-substance-code.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-substance-code.json rename to crates/fhir/tests/data/json/R4/valueset-substance-code.json diff --git a/crates/fhir/tests/data/R4/valueset-substance-status.json b/crates/fhir/tests/data/json/R4/valueset-substance-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-substance-status.json rename to crates/fhir/tests/data/json/R4/valueset-substance-status.json diff --git a/crates/fhir/tests/data/R4/valueset-supplement-type.json b/crates/fhir/tests/data/json/R4/valueset-supplement-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-supplement-type.json rename to crates/fhir/tests/data/json/R4/valueset-supplement-type.json diff --git a/crates/fhir/tests/data/R4/valueset-supply-item.json b/crates/fhir/tests/data/json/R4/valueset-supply-item.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-supply-item.json rename to crates/fhir/tests/data/json/R4/valueset-supply-item.json diff --git a/crates/fhir/tests/data/R4/valueset-supplydelivery-status.json b/crates/fhir/tests/data/json/R4/valueset-supplydelivery-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-supplydelivery-status.json rename to crates/fhir/tests/data/json/R4/valueset-supplydelivery-status.json diff --git a/crates/fhir/tests/data/R4/valueset-supplydelivery-type.json b/crates/fhir/tests/data/json/R4/valueset-supplydelivery-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-supplydelivery-type.json rename to crates/fhir/tests/data/json/R4/valueset-supplydelivery-type.json diff --git a/crates/fhir/tests/data/R4/valueset-supplyrequest-kind.json b/crates/fhir/tests/data/json/R4/valueset-supplyrequest-kind.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-supplyrequest-kind.json rename to crates/fhir/tests/data/json/R4/valueset-supplyrequest-kind.json diff --git a/crates/fhir/tests/data/R4/valueset-supplyrequest-reason.json b/crates/fhir/tests/data/json/R4/valueset-supplyrequest-reason.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-supplyrequest-reason.json rename to crates/fhir/tests/data/json/R4/valueset-supplyrequest-reason.json diff --git a/crates/fhir/tests/data/R4/valueset-supplyrequest-status.json b/crates/fhir/tests/data/json/R4/valueset-supplyrequest-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-supplyrequest-status.json rename to crates/fhir/tests/data/json/R4/valueset-supplyrequest-status.json diff --git a/crates/fhir/tests/data/R4/valueset-surface.json b/crates/fhir/tests/data/json/R4/valueset-surface.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-surface.json rename to crates/fhir/tests/data/json/R4/valueset-surface.json diff --git a/crates/fhir/tests/data/R4/valueset-synthesis-type.json b/crates/fhir/tests/data/json/R4/valueset-synthesis-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-synthesis-type.json rename to crates/fhir/tests/data/json/R4/valueset-synthesis-type.json diff --git a/crates/fhir/tests/data/R4/valueset-system-restful-interaction.json b/crates/fhir/tests/data/json/R4/valueset-system-restful-interaction.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-system-restful-interaction.json rename to crates/fhir/tests/data/json/R4/valueset-system-restful-interaction.json diff --git a/crates/fhir/tests/data/R4/valueset-task-code.json b/crates/fhir/tests/data/json/R4/valueset-task-code.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-task-code.json rename to crates/fhir/tests/data/json/R4/valueset-task-code.json diff --git a/crates/fhir/tests/data/R4/valueset-task-intent.json b/crates/fhir/tests/data/json/R4/valueset-task-intent.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-task-intent.json rename to crates/fhir/tests/data/json/R4/valueset-task-intent.json diff --git a/crates/fhir/tests/data/R4/valueset-task-status.json b/crates/fhir/tests/data/json/R4/valueset-task-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-task-status.json rename to crates/fhir/tests/data/json/R4/valueset-task-status.json diff --git a/crates/fhir/tests/data/R4/valueset-teeth.json b/crates/fhir/tests/data/json/R4/valueset-teeth.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-teeth.json rename to crates/fhir/tests/data/json/R4/valueset-teeth.json diff --git a/crates/fhir/tests/data/R4/valueset-template-status-code.json b/crates/fhir/tests/data/json/R4/valueset-template-status-code.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-template-status-code.json rename to crates/fhir/tests/data/json/R4/valueset-template-status-code.json diff --git a/crates/fhir/tests/data/R4/valueset-testscript-operation-codes.json b/crates/fhir/tests/data/json/R4/valueset-testscript-operation-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-testscript-operation-codes.json rename to crates/fhir/tests/data/json/R4/valueset-testscript-operation-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-testscript-profile-destination-types.json b/crates/fhir/tests/data/json/R4/valueset-testscript-profile-destination-types.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-testscript-profile-destination-types.json rename to crates/fhir/tests/data/json/R4/valueset-testscript-profile-destination-types.json diff --git a/crates/fhir/tests/data/R4/valueset-testscript-profile-origin-types.json b/crates/fhir/tests/data/json/R4/valueset-testscript-profile-origin-types.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-testscript-profile-origin-types.json rename to crates/fhir/tests/data/json/R4/valueset-testscript-profile-origin-types.json diff --git a/crates/fhir/tests/data/R4/valueset-texture-code.json b/crates/fhir/tests/data/json/R4/valueset-texture-code.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-texture-code.json rename to crates/fhir/tests/data/json/R4/valueset-texture-code.json diff --git a/crates/fhir/tests/data/R4/valueset-timezones.json b/crates/fhir/tests/data/json/R4/valueset-timezones.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-timezones.json rename to crates/fhir/tests/data/json/R4/valueset-timezones.json diff --git a/crates/fhir/tests/data/R4/valueset-timing-abbreviation.json b/crates/fhir/tests/data/json/R4/valueset-timing-abbreviation.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-timing-abbreviation.json rename to crates/fhir/tests/data/json/R4/valueset-timing-abbreviation.json diff --git a/crates/fhir/tests/data/R4/valueset-tooth.json b/crates/fhir/tests/data/json/R4/valueset-tooth.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-tooth.json rename to crates/fhir/tests/data/json/R4/valueset-tooth.json diff --git a/crates/fhir/tests/data/R4/valueset-transaction-mode.json b/crates/fhir/tests/data/json/R4/valueset-transaction-mode.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-transaction-mode.json rename to crates/fhir/tests/data/json/R4/valueset-transaction-mode.json diff --git a/crates/fhir/tests/data/R4/valueset-trigger-type.json b/crates/fhir/tests/data/json/R4/valueset-trigger-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-trigger-type.json rename to crates/fhir/tests/data/json/R4/valueset-trigger-type.json diff --git a/crates/fhir/tests/data/R4/valueset-type-derivation-rule.json b/crates/fhir/tests/data/json/R4/valueset-type-derivation-rule.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-type-derivation-rule.json rename to crates/fhir/tests/data/json/R4/valueset-type-derivation-rule.json diff --git a/crates/fhir/tests/data/R4/valueset-type-restful-interaction.json b/crates/fhir/tests/data/json/R4/valueset-type-restful-interaction.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-type-restful-interaction.json rename to crates/fhir/tests/data/json/R4/valueset-type-restful-interaction.json diff --git a/crates/fhir/tests/data/R4/valueset-ucum-bodylength.json b/crates/fhir/tests/data/json/R4/valueset-ucum-bodylength.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-ucum-bodylength.json rename to crates/fhir/tests/data/json/R4/valueset-ucum-bodylength.json diff --git a/crates/fhir/tests/data/R4/valueset-ucum-bodytemp.json b/crates/fhir/tests/data/json/R4/valueset-ucum-bodytemp.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-ucum-bodytemp.json rename to crates/fhir/tests/data/json/R4/valueset-ucum-bodytemp.json diff --git a/crates/fhir/tests/data/R4/valueset-ucum-bodyweight.json b/crates/fhir/tests/data/json/R4/valueset-ucum-bodyweight.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-ucum-bodyweight.json rename to crates/fhir/tests/data/json/R4/valueset-ucum-bodyweight.json diff --git a/crates/fhir/tests/data/R4/valueset-ucum-common.json b/crates/fhir/tests/data/json/R4/valueset-ucum-common.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-ucum-common.json rename to crates/fhir/tests/data/json/R4/valueset-ucum-common.json diff --git a/crates/fhir/tests/data/R4/valueset-ucum-units.json b/crates/fhir/tests/data/json/R4/valueset-ucum-units.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-ucum-units.json rename to crates/fhir/tests/data/json/R4/valueset-ucum-units.json diff --git a/crates/fhir/tests/data/R4/valueset-ucum-vitals-common.json b/crates/fhir/tests/data/json/R4/valueset-ucum-vitals-common.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-ucum-vitals-common.json rename to crates/fhir/tests/data/json/R4/valueset-ucum-vitals-common.json diff --git a/crates/fhir/tests/data/R4/valueset-udi-entry-type.json b/crates/fhir/tests/data/json/R4/valueset-udi-entry-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-udi-entry-type.json rename to crates/fhir/tests/data/json/R4/valueset-udi-entry-type.json diff --git a/crates/fhir/tests/data/R4/valueset-udi.json b/crates/fhir/tests/data/json/R4/valueset-udi.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-udi.json rename to crates/fhir/tests/data/json/R4/valueset-udi.json diff --git a/crates/fhir/tests/data/R4/valueset-units-of-time.json b/crates/fhir/tests/data/json/R4/valueset-units-of-time.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-units-of-time.json rename to crates/fhir/tests/data/json/R4/valueset-units-of-time.json diff --git a/crates/fhir/tests/data/R4/valueset-unknown-content-code.json b/crates/fhir/tests/data/json/R4/valueset-unknown-content-code.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-unknown-content-code.json rename to crates/fhir/tests/data/json/R4/valueset-unknown-content-code.json diff --git a/crates/fhir/tests/data/R4/valueset-usage-context-type.json b/crates/fhir/tests/data/json/R4/valueset-usage-context-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-usage-context-type.json rename to crates/fhir/tests/data/json/R4/valueset-usage-context-type.json diff --git a/crates/fhir/tests/data/R4/valueset-use-context.json b/crates/fhir/tests/data/json/R4/valueset-use-context.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-use-context.json rename to crates/fhir/tests/data/json/R4/valueset-use-context.json diff --git a/crates/fhir/tests/data/R4/valueset-vaccine-code.json b/crates/fhir/tests/data/json/R4/valueset-vaccine-code.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-vaccine-code.json rename to crates/fhir/tests/data/json/R4/valueset-vaccine-code.json diff --git a/crates/fhir/tests/data/R4/valueset-variable-type.json b/crates/fhir/tests/data/json/R4/valueset-variable-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-variable-type.json rename to crates/fhir/tests/data/json/R4/valueset-variable-type.json diff --git a/crates/fhir/tests/data/R4/valueset-variant-state.json b/crates/fhir/tests/data/json/R4/valueset-variant-state.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-variant-state.json rename to crates/fhir/tests/data/json/R4/valueset-variant-state.json diff --git a/crates/fhir/tests/data/R4/valueset-variants.json b/crates/fhir/tests/data/json/R4/valueset-variants.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-variants.json rename to crates/fhir/tests/data/json/R4/valueset-variants.json diff --git a/crates/fhir/tests/data/R4/valueset-verificationresult-can-push-updates.json b/crates/fhir/tests/data/json/R4/valueset-verificationresult-can-push-updates.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-verificationresult-can-push-updates.json rename to crates/fhir/tests/data/json/R4/valueset-verificationresult-can-push-updates.json diff --git a/crates/fhir/tests/data/R4/valueset-verificationresult-communication-method.json b/crates/fhir/tests/data/json/R4/valueset-verificationresult-communication-method.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-verificationresult-communication-method.json rename to crates/fhir/tests/data/json/R4/valueset-verificationresult-communication-method.json diff --git a/crates/fhir/tests/data/R4/valueset-verificationresult-failure-action.json b/crates/fhir/tests/data/json/R4/valueset-verificationresult-failure-action.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-verificationresult-failure-action.json rename to crates/fhir/tests/data/json/R4/valueset-verificationresult-failure-action.json diff --git a/crates/fhir/tests/data/R4/valueset-verificationresult-need.json b/crates/fhir/tests/data/json/R4/valueset-verificationresult-need.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-verificationresult-need.json rename to crates/fhir/tests/data/json/R4/valueset-verificationresult-need.json diff --git a/crates/fhir/tests/data/R4/valueset-verificationresult-primary-source-type.json b/crates/fhir/tests/data/json/R4/valueset-verificationresult-primary-source-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-verificationresult-primary-source-type.json rename to crates/fhir/tests/data/json/R4/valueset-verificationresult-primary-source-type.json diff --git a/crates/fhir/tests/data/R4/valueset-verificationresult-push-type-available.json b/crates/fhir/tests/data/json/R4/valueset-verificationresult-push-type-available.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-verificationresult-push-type-available.json rename to crates/fhir/tests/data/json/R4/valueset-verificationresult-push-type-available.json diff --git a/crates/fhir/tests/data/R4/valueset-verificationresult-status.json b/crates/fhir/tests/data/json/R4/valueset-verificationresult-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-verificationresult-status.json rename to crates/fhir/tests/data/json/R4/valueset-verificationresult-status.json diff --git a/crates/fhir/tests/data/R4/valueset-verificationresult-validation-process.json b/crates/fhir/tests/data/json/R4/valueset-verificationresult-validation-process.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-verificationresult-validation-process.json rename to crates/fhir/tests/data/json/R4/valueset-verificationresult-validation-process.json diff --git a/crates/fhir/tests/data/R4/valueset-verificationresult-validation-status.json b/crates/fhir/tests/data/json/R4/valueset-verificationresult-validation-status.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-verificationresult-validation-status.json rename to crates/fhir/tests/data/json/R4/valueset-verificationresult-validation-status.json diff --git a/crates/fhir/tests/data/R4/valueset-verificationresult-validation-type.json b/crates/fhir/tests/data/json/R4/valueset-verificationresult-validation-type.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-verificationresult-validation-type.json rename to crates/fhir/tests/data/json/R4/valueset-verificationresult-validation-type.json diff --git a/crates/fhir/tests/data/R4/valueset-versioning-policy.json b/crates/fhir/tests/data/json/R4/valueset-versioning-policy.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-versioning-policy.json rename to crates/fhir/tests/data/json/R4/valueset-versioning-policy.json diff --git a/crates/fhir/tests/data/R4/valueset-vision-base-codes.json b/crates/fhir/tests/data/json/R4/valueset-vision-base-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-vision-base-codes.json rename to crates/fhir/tests/data/json/R4/valueset-vision-base-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-vision-eye-codes.json b/crates/fhir/tests/data/json/R4/valueset-vision-eye-codes.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-vision-eye-codes.json rename to crates/fhir/tests/data/json/R4/valueset-vision-eye-codes.json diff --git a/crates/fhir/tests/data/R4/valueset-vision-product.json b/crates/fhir/tests/data/json/R4/valueset-vision-product.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-vision-product.json rename to crates/fhir/tests/data/json/R4/valueset-vision-product.json diff --git a/crates/fhir/tests/data/R4/valueset-written-language.json b/crates/fhir/tests/data/json/R4/valueset-written-language.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset-written-language.json rename to crates/fhir/tests/data/json/R4/valueset-written-language.json diff --git a/crates/fhir/tests/data/R4/valueset.profile.json b/crates/fhir/tests/data/json/R4/valueset.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/valueset.profile.json rename to crates/fhir/tests/data/json/R4/valueset.profile.json diff --git a/crates/fhir/tests/data/R4/valuesets.json b/crates/fhir/tests/data/json/R4/valuesets.json similarity index 100% rename from crates/fhir/tests/data/R4/valuesets.json rename to crates/fhir/tests/data/json/R4/valuesets.json diff --git a/crates/fhir/tests/data/R4/verificationresult-example.json b/crates/fhir/tests/data/json/R4/verificationresult-example.json similarity index 100% rename from crates/fhir/tests/data/R4/verificationresult-example.json rename to crates/fhir/tests/data/json/R4/verificationresult-example.json diff --git a/crates/fhir/tests/data/R4/verificationresult-questionnaire.json b/crates/fhir/tests/data/json/R4/verificationresult-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/verificationresult-questionnaire.json rename to crates/fhir/tests/data/json/R4/verificationresult-questionnaire.json diff --git a/crates/fhir/tests/data/R4/verificationresult.profile.json b/crates/fhir/tests/data/json/R4/verificationresult.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/verificationresult.profile.json rename to crates/fhir/tests/data/json/R4/verificationresult.profile.json diff --git a/crates/fhir/tests/data/R4/visionprescription-example-1.json b/crates/fhir/tests/data/json/R4/visionprescription-example-1.json similarity index 100% rename from crates/fhir/tests/data/R4/visionprescription-example-1.json rename to crates/fhir/tests/data/json/R4/visionprescription-example-1.json diff --git a/crates/fhir/tests/data/R4/visionprescription-example.json b/crates/fhir/tests/data/json/R4/visionprescription-example.json similarity index 100% rename from crates/fhir/tests/data/R4/visionprescription-example.json rename to crates/fhir/tests/data/json/R4/visionprescription-example.json diff --git a/crates/fhir/tests/data/R4/visionprescription-questionnaire.json b/crates/fhir/tests/data/json/R4/visionprescription-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/visionprescription-questionnaire.json rename to crates/fhir/tests/data/json/R4/visionprescription-questionnaire.json diff --git a/crates/fhir/tests/data/R4/visionprescription.profile.json b/crates/fhir/tests/data/json/R4/visionprescription.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/visionprescription.profile.json rename to crates/fhir/tests/data/json/R4/visionprescription.profile.json diff --git a/crates/fhir/tests/data/R4/vitalsigns-questionnaire.json b/crates/fhir/tests/data/json/R4/vitalsigns-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/vitalsigns-questionnaire.json rename to crates/fhir/tests/data/json/R4/vitalsigns-questionnaire.json diff --git a/crates/fhir/tests/data/R4/vitalsigns.profile.json b/crates/fhir/tests/data/json/R4/vitalsigns.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/vitalsigns.profile.json rename to crates/fhir/tests/data/json/R4/vitalsigns.profile.json diff --git a/crates/fhir/tests/data/R4/vitalspanel-questionnaire.json b/crates/fhir/tests/data/json/R4/vitalspanel-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4/vitalspanel-questionnaire.json rename to crates/fhir/tests/data/json/R4/vitalspanel-questionnaire.json diff --git a/crates/fhir/tests/data/R4/vitalspanel.profile.json b/crates/fhir/tests/data/json/R4/vitalspanel.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/vitalspanel.profile.json rename to crates/fhir/tests/data/json/R4/vitalspanel.profile.json diff --git a/crates/fhir/tests/data/R4/xds-example.json b/crates/fhir/tests/data/json/R4/xds-example.json similarity index 100% rename from crates/fhir/tests/data/R4/xds-example.json rename to crates/fhir/tests/data/json/R4/xds-example.json diff --git a/crates/fhir/tests/data/R4/xhtml.profile.json b/crates/fhir/tests/data/json/R4/xhtml.profile.json similarity index 100% rename from crates/fhir/tests/data/R4/xhtml.profile.json rename to crates/fhir/tests/data/json/R4/xhtml.profile.json diff --git a/crates/fhir/tests/data/R4B/account-example-with-guarantor.json b/crates/fhir/tests/data/json/R4B/account-example-with-guarantor.json similarity index 100% rename from crates/fhir/tests/data/R4B/account-example-with-guarantor.json rename to crates/fhir/tests/data/json/R4B/account-example-with-guarantor.json diff --git a/crates/fhir/tests/data/R4B/account-example.json b/crates/fhir/tests/data/json/R4B/account-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/account-example.json rename to crates/fhir/tests/data/json/R4B/account-example.json diff --git a/crates/fhir/tests/data/R4B/account-questionnaire.json b/crates/fhir/tests/data/json/R4B/account-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/account-questionnaire.json rename to crates/fhir/tests/data/json/R4B/account-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/account.profile.json b/crates/fhir/tests/data/json/R4B/account.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/account.profile.json rename to crates/fhir/tests/data/json/R4B/account.profile.json diff --git a/crates/fhir/tests/data/R4B/activitydefinition-administer-zika-virus-exposure-assessment.json b/crates/fhir/tests/data/json/R4B/activitydefinition-administer-zika-virus-exposure-assessment.json similarity index 100% rename from crates/fhir/tests/data/R4B/activitydefinition-administer-zika-virus-exposure-assessment.json rename to crates/fhir/tests/data/json/R4B/activitydefinition-administer-zika-virus-exposure-assessment.json diff --git a/crates/fhir/tests/data/R4B/activitydefinition-example-alteplase-dosing.json b/crates/fhir/tests/data/json/R4B/activitydefinition-example-alteplase-dosing.json similarity index 100% rename from crates/fhir/tests/data/R4B/activitydefinition-example-alteplase-dosing.json rename to crates/fhir/tests/data/json/R4B/activitydefinition-example-alteplase-dosing.json diff --git a/crates/fhir/tests/data/R4B/activitydefinition-example.json b/crates/fhir/tests/data/json/R4B/activitydefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/activitydefinition-example.json rename to crates/fhir/tests/data/json/R4B/activitydefinition-example.json diff --git a/crates/fhir/tests/data/R4B/activitydefinition-medicationorder-example.json b/crates/fhir/tests/data/json/R4B/activitydefinition-medicationorder-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/activitydefinition-medicationorder-example.json rename to crates/fhir/tests/data/json/R4B/activitydefinition-medicationorder-example.json diff --git a/crates/fhir/tests/data/R4B/activitydefinition-order-serum-dengue-virus-igm.json b/crates/fhir/tests/data/json/R4B/activitydefinition-order-serum-dengue-virus-igm.json similarity index 100% rename from crates/fhir/tests/data/R4B/activitydefinition-order-serum-dengue-virus-igm.json rename to crates/fhir/tests/data/json/R4B/activitydefinition-order-serum-dengue-virus-igm.json diff --git a/crates/fhir/tests/data/R4B/activitydefinition-order-serum-zika-dengue-virus-igm.json b/crates/fhir/tests/data/json/R4B/activitydefinition-order-serum-zika-dengue-virus-igm.json similarity index 100% rename from crates/fhir/tests/data/R4B/activitydefinition-order-serum-zika-dengue-virus-igm.json rename to crates/fhir/tests/data/json/R4B/activitydefinition-order-serum-zika-dengue-virus-igm.json diff --git a/crates/fhir/tests/data/R4B/activitydefinition-predecessor-example.json b/crates/fhir/tests/data/json/R4B/activitydefinition-predecessor-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/activitydefinition-predecessor-example.json rename to crates/fhir/tests/data/json/R4B/activitydefinition-predecessor-example.json diff --git a/crates/fhir/tests/data/R4B/activitydefinition-provide-mosquito-prevention-advice.json b/crates/fhir/tests/data/json/R4B/activitydefinition-provide-mosquito-prevention-advice.json similarity index 100% rename from crates/fhir/tests/data/R4B/activitydefinition-provide-mosquito-prevention-advice.json rename to crates/fhir/tests/data/json/R4B/activitydefinition-provide-mosquito-prevention-advice.json diff --git a/crates/fhir/tests/data/R4B/activitydefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/activitydefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/activitydefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/activitydefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/activitydefinition-servicerequest-example.json b/crates/fhir/tests/data/json/R4B/activitydefinition-servicerequest-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/activitydefinition-servicerequest-example.json rename to crates/fhir/tests/data/json/R4B/activitydefinition-servicerequest-example.json diff --git a/crates/fhir/tests/data/R4B/activitydefinition-supplyrequest-example.json b/crates/fhir/tests/data/json/R4B/activitydefinition-supplyrequest-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/activitydefinition-supplyrequest-example.json rename to crates/fhir/tests/data/json/R4B/activitydefinition-supplyrequest-example.json diff --git a/crates/fhir/tests/data/R4B/activitydefinition.profile.json b/crates/fhir/tests/data/json/R4B/activitydefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/activitydefinition.profile.json rename to crates/fhir/tests/data/json/R4B/activitydefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/actualgroup-questionnaire.json b/crates/fhir/tests/data/json/R4B/actualgroup-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/actualgroup-questionnaire.json rename to crates/fhir/tests/data/json/R4B/actualgroup-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/actualgroup.profile.json b/crates/fhir/tests/data/json/R4B/actualgroup.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/actualgroup.profile.json rename to crates/fhir/tests/data/json/R4B/actualgroup.profile.json diff --git a/crates/fhir/tests/data/R4B/address.profile.json b/crates/fhir/tests/data/json/R4B/address.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/address.profile.json rename to crates/fhir/tests/data/json/R4B/address.profile.json diff --git a/crates/fhir/tests/data/R4B/administrableproductdefinition-example.json b/crates/fhir/tests/data/json/R4B/administrableproductdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/administrableproductdefinition-example.json rename to crates/fhir/tests/data/json/R4B/administrableproductdefinition-example.json diff --git a/crates/fhir/tests/data/R4B/administrableproductdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/administrableproductdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/administrableproductdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/administrableproductdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/administrableproductdefinition.profile.json b/crates/fhir/tests/data/json/R4B/administrableproductdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/administrableproductdefinition.profile.json rename to crates/fhir/tests/data/json/R4B/administrableproductdefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/adverseevent-example.json b/crates/fhir/tests/data/json/R4B/adverseevent-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/adverseevent-example.json rename to crates/fhir/tests/data/json/R4B/adverseevent-example.json diff --git a/crates/fhir/tests/data/R4B/adverseevent-questionnaire.json b/crates/fhir/tests/data/json/R4B/adverseevent-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/adverseevent-questionnaire.json rename to crates/fhir/tests/data/json/R4B/adverseevent-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/adverseevent.profile.json b/crates/fhir/tests/data/json/R4B/adverseevent.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/adverseevent.profile.json rename to crates/fhir/tests/data/json/R4B/adverseevent.profile.json diff --git a/crates/fhir/tests/data/R4B/age.profile.json b/crates/fhir/tests/data/json/R4B/age.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/age.profile.json rename to crates/fhir/tests/data/json/R4B/age.profile.json diff --git a/crates/fhir/tests/data/R4B/allergyintolerance-example.json b/crates/fhir/tests/data/json/R4B/allergyintolerance-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/allergyintolerance-example.json rename to crates/fhir/tests/data/json/R4B/allergyintolerance-example.json diff --git a/crates/fhir/tests/data/R4B/allergyintolerance-fishallergy.json b/crates/fhir/tests/data/json/R4B/allergyintolerance-fishallergy.json similarity index 100% rename from crates/fhir/tests/data/R4B/allergyintolerance-fishallergy.json rename to crates/fhir/tests/data/json/R4B/allergyintolerance-fishallergy.json diff --git a/crates/fhir/tests/data/R4B/allergyintolerance-medication.json b/crates/fhir/tests/data/json/R4B/allergyintolerance-medication.json similarity index 100% rename from crates/fhir/tests/data/R4B/allergyintolerance-medication.json rename to crates/fhir/tests/data/json/R4B/allergyintolerance-medication.json diff --git a/crates/fhir/tests/data/R4B/allergyintolerance-nka.json b/crates/fhir/tests/data/json/R4B/allergyintolerance-nka.json similarity index 100% rename from crates/fhir/tests/data/R4B/allergyintolerance-nka.json rename to crates/fhir/tests/data/json/R4B/allergyintolerance-nka.json diff --git a/crates/fhir/tests/data/R4B/allergyintolerance-nkda.json b/crates/fhir/tests/data/json/R4B/allergyintolerance-nkda.json similarity index 100% rename from crates/fhir/tests/data/R4B/allergyintolerance-nkda.json rename to crates/fhir/tests/data/json/R4B/allergyintolerance-nkda.json diff --git a/crates/fhir/tests/data/R4B/allergyintolerance-nkla.json b/crates/fhir/tests/data/json/R4B/allergyintolerance-nkla.json similarity index 100% rename from crates/fhir/tests/data/R4B/allergyintolerance-nkla.json rename to crates/fhir/tests/data/json/R4B/allergyintolerance-nkla.json diff --git a/crates/fhir/tests/data/R4B/allergyintolerance-questionnaire.json b/crates/fhir/tests/data/json/R4B/allergyintolerance-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/allergyintolerance-questionnaire.json rename to crates/fhir/tests/data/json/R4B/allergyintolerance-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/allergyintolerance.profile.json b/crates/fhir/tests/data/json/R4B/allergyintolerance.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/allergyintolerance.profile.json rename to crates/fhir/tests/data/json/R4B/allergyintolerance.profile.json diff --git a/crates/fhir/tests/data/R4B/annotation.profile.json b/crates/fhir/tests/data/json/R4B/annotation.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/annotation.profile.json rename to crates/fhir/tests/data/json/R4B/annotation.profile.json diff --git a/crates/fhir/tests/data/R4B/appointment-example-request.json b/crates/fhir/tests/data/json/R4B/appointment-example-request.json similarity index 100% rename from crates/fhir/tests/data/R4B/appointment-example-request.json rename to crates/fhir/tests/data/json/R4B/appointment-example-request.json diff --git a/crates/fhir/tests/data/R4B/appointment-example.json b/crates/fhir/tests/data/json/R4B/appointment-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/appointment-example.json rename to crates/fhir/tests/data/json/R4B/appointment-example.json diff --git a/crates/fhir/tests/data/R4B/appointment-example2doctors.json b/crates/fhir/tests/data/json/R4B/appointment-example2doctors.json similarity index 100% rename from crates/fhir/tests/data/R4B/appointment-example2doctors.json rename to crates/fhir/tests/data/json/R4B/appointment-example2doctors.json diff --git a/crates/fhir/tests/data/R4B/appointment-questionnaire.json b/crates/fhir/tests/data/json/R4B/appointment-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/appointment-questionnaire.json rename to crates/fhir/tests/data/json/R4B/appointment-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/appointment.profile.json b/crates/fhir/tests/data/json/R4B/appointment.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/appointment.profile.json rename to crates/fhir/tests/data/json/R4B/appointment.profile.json diff --git a/crates/fhir/tests/data/R4B/appointmentresponse-example-req.json b/crates/fhir/tests/data/json/R4B/appointmentresponse-example-req.json similarity index 100% rename from crates/fhir/tests/data/R4B/appointmentresponse-example-req.json rename to crates/fhir/tests/data/json/R4B/appointmentresponse-example-req.json diff --git a/crates/fhir/tests/data/R4B/appointmentresponse-example.json b/crates/fhir/tests/data/json/R4B/appointmentresponse-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/appointmentresponse-example.json rename to crates/fhir/tests/data/json/R4B/appointmentresponse-example.json diff --git a/crates/fhir/tests/data/R4B/appointmentresponse-questionnaire.json b/crates/fhir/tests/data/json/R4B/appointmentresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/appointmentresponse-questionnaire.json rename to crates/fhir/tests/data/json/R4B/appointmentresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/appointmentresponse.profile.json b/crates/fhir/tests/data/json/R4B/appointmentresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/appointmentresponse.profile.json rename to crates/fhir/tests/data/json/R4B/appointmentresponse.profile.json diff --git a/crates/fhir/tests/data/R4B/attachment.profile.json b/crates/fhir/tests/data/json/R4B/attachment.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/attachment.profile.json rename to crates/fhir/tests/data/json/R4B/attachment.profile.json diff --git a/crates/fhir/tests/data/R4B/audit-event-example-login.json b/crates/fhir/tests/data/json/R4B/audit-event-example-login.json similarity index 100% rename from crates/fhir/tests/data/R4B/audit-event-example-login.json rename to crates/fhir/tests/data/json/R4B/audit-event-example-login.json diff --git a/crates/fhir/tests/data/R4B/audit-event-example-logout.json b/crates/fhir/tests/data/json/R4B/audit-event-example-logout.json similarity index 100% rename from crates/fhir/tests/data/R4B/audit-event-example-logout.json rename to crates/fhir/tests/data/json/R4B/audit-event-example-logout.json diff --git a/crates/fhir/tests/data/R4B/audit-event-example-media.json b/crates/fhir/tests/data/json/R4B/audit-event-example-media.json similarity index 100% rename from crates/fhir/tests/data/R4B/audit-event-example-media.json rename to crates/fhir/tests/data/json/R4B/audit-event-example-media.json diff --git a/crates/fhir/tests/data/R4B/audit-event-example-pixQuery.json b/crates/fhir/tests/data/json/R4B/audit-event-example-pixQuery.json similarity index 100% rename from crates/fhir/tests/data/R4B/audit-event-example-pixQuery.json rename to crates/fhir/tests/data/json/R4B/audit-event-example-pixQuery.json diff --git a/crates/fhir/tests/data/R4B/audit-event-example-search.json b/crates/fhir/tests/data/json/R4B/audit-event-example-search.json similarity index 100% rename from crates/fhir/tests/data/R4B/audit-event-example-search.json rename to crates/fhir/tests/data/json/R4B/audit-event-example-search.json diff --git a/crates/fhir/tests/data/R4B/audit-event-example-vread.json b/crates/fhir/tests/data/json/R4B/audit-event-example-vread.json similarity index 100% rename from crates/fhir/tests/data/R4B/audit-event-example-vread.json rename to crates/fhir/tests/data/json/R4B/audit-event-example-vread.json diff --git a/crates/fhir/tests/data/R4B/auditevent-example-disclosure.json b/crates/fhir/tests/data/json/R4B/auditevent-example-disclosure.json similarity index 100% rename from crates/fhir/tests/data/R4B/auditevent-example-disclosure.json rename to crates/fhir/tests/data/json/R4B/auditevent-example-disclosure.json diff --git a/crates/fhir/tests/data/R4B/auditevent-example-error.json b/crates/fhir/tests/data/json/R4B/auditevent-example-error.json similarity index 100% rename from crates/fhir/tests/data/R4B/auditevent-example-error.json rename to crates/fhir/tests/data/json/R4B/auditevent-example-error.json diff --git a/crates/fhir/tests/data/R4B/auditevent-example.json b/crates/fhir/tests/data/json/R4B/auditevent-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/auditevent-example.json rename to crates/fhir/tests/data/json/R4B/auditevent-example.json diff --git a/crates/fhir/tests/data/R4B/auditevent-questionnaire.json b/crates/fhir/tests/data/json/R4B/auditevent-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/auditevent-questionnaire.json rename to crates/fhir/tests/data/json/R4B/auditevent-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/auditevent.profile.json b/crates/fhir/tests/data/json/R4B/auditevent.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/auditevent.profile.json rename to crates/fhir/tests/data/json/R4B/auditevent.profile.json diff --git a/crates/fhir/tests/data/R4B/backboneelement.profile.json b/crates/fhir/tests/data/json/R4B/backboneelement.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/backboneelement.profile.json rename to crates/fhir/tests/data/json/R4B/backboneelement.profile.json diff --git a/crates/fhir/tests/data/R4B/base64binary.profile.json b/crates/fhir/tests/data/json/R4B/base64binary.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/base64binary.profile.json rename to crates/fhir/tests/data/json/R4B/base64binary.profile.json diff --git a/crates/fhir/tests/data/R4B/basic-example-narrative.json b/crates/fhir/tests/data/json/R4B/basic-example-narrative.json similarity index 100% rename from crates/fhir/tests/data/R4B/basic-example-narrative.json rename to crates/fhir/tests/data/json/R4B/basic-example-narrative.json diff --git a/crates/fhir/tests/data/R4B/basic-example.json b/crates/fhir/tests/data/json/R4B/basic-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/basic-example.json rename to crates/fhir/tests/data/json/R4B/basic-example.json diff --git a/crates/fhir/tests/data/R4B/basic-example2.json b/crates/fhir/tests/data/json/R4B/basic-example2.json similarity index 100% rename from crates/fhir/tests/data/R4B/basic-example2.json rename to crates/fhir/tests/data/json/R4B/basic-example2.json diff --git a/crates/fhir/tests/data/R4B/basic-questionnaire.json b/crates/fhir/tests/data/json/R4B/basic-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/basic-questionnaire.json rename to crates/fhir/tests/data/json/R4B/basic-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/basic.profile.json b/crates/fhir/tests/data/json/R4B/basic.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/basic.profile.json rename to crates/fhir/tests/data/json/R4B/basic.profile.json diff --git a/crates/fhir/tests/data/R4B/binary-example.json b/crates/fhir/tests/data/json/R4B/binary-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/binary-example.json rename to crates/fhir/tests/data/json/R4B/binary-example.json diff --git a/crates/fhir/tests/data/R4B/binary-f006.json b/crates/fhir/tests/data/json/R4B/binary-f006.json similarity index 100% rename from crates/fhir/tests/data/R4B/binary-f006.json rename to crates/fhir/tests/data/json/R4B/binary-f006.json diff --git a/crates/fhir/tests/data/R4B/binary-questionnaire.json b/crates/fhir/tests/data/json/R4B/binary-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/binary-questionnaire.json rename to crates/fhir/tests/data/json/R4B/binary-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/binary.profile.json b/crates/fhir/tests/data/json/R4B/binary.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/binary.profile.json rename to crates/fhir/tests/data/json/R4B/binary.profile.json diff --git a/crates/fhir/tests/data/R4B/biologicallyderivedproduct-example.json b/crates/fhir/tests/data/json/R4B/biologicallyderivedproduct-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/biologicallyderivedproduct-example.json rename to crates/fhir/tests/data/json/R4B/biologicallyderivedproduct-example.json diff --git a/crates/fhir/tests/data/R4B/biologicallyderivedproduct-questionnaire.json b/crates/fhir/tests/data/json/R4B/biologicallyderivedproduct-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/biologicallyderivedproduct-questionnaire.json rename to crates/fhir/tests/data/json/R4B/biologicallyderivedproduct-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/biologicallyderivedproduct.profile.json b/crates/fhir/tests/data/json/R4B/biologicallyderivedproduct.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/biologicallyderivedproduct.profile.json rename to crates/fhir/tests/data/json/R4B/biologicallyderivedproduct.profile.json diff --git a/crates/fhir/tests/data/R4B/bmi-questionnaire.json b/crates/fhir/tests/data/json/R4B/bmi-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/bmi-questionnaire.json rename to crates/fhir/tests/data/json/R4B/bmi-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/bmi.profile.json b/crates/fhir/tests/data/json/R4B/bmi.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/bmi.profile.json rename to crates/fhir/tests/data/json/R4B/bmi.profile.json diff --git a/crates/fhir/tests/data/R4B/bodyheight-questionnaire.json b/crates/fhir/tests/data/json/R4B/bodyheight-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/bodyheight-questionnaire.json rename to crates/fhir/tests/data/json/R4B/bodyheight-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/bodyheight.profile.json b/crates/fhir/tests/data/json/R4B/bodyheight.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/bodyheight.profile.json rename to crates/fhir/tests/data/json/R4B/bodyheight.profile.json diff --git a/crates/fhir/tests/data/R4B/bodystructure-example-fetus.json b/crates/fhir/tests/data/json/R4B/bodystructure-example-fetus.json similarity index 100% rename from crates/fhir/tests/data/R4B/bodystructure-example-fetus.json rename to crates/fhir/tests/data/json/R4B/bodystructure-example-fetus.json diff --git a/crates/fhir/tests/data/R4B/bodystructure-example-skin-patch.json b/crates/fhir/tests/data/json/R4B/bodystructure-example-skin-patch.json similarity index 100% rename from crates/fhir/tests/data/R4B/bodystructure-example-skin-patch.json rename to crates/fhir/tests/data/json/R4B/bodystructure-example-skin-patch.json diff --git a/crates/fhir/tests/data/R4B/bodystructure-example-tumor.json b/crates/fhir/tests/data/json/R4B/bodystructure-example-tumor.json similarity index 100% rename from crates/fhir/tests/data/R4B/bodystructure-example-tumor.json rename to crates/fhir/tests/data/json/R4B/bodystructure-example-tumor.json diff --git a/crates/fhir/tests/data/R4B/bodystructure-questionnaire.json b/crates/fhir/tests/data/json/R4B/bodystructure-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/bodystructure-questionnaire.json rename to crates/fhir/tests/data/json/R4B/bodystructure-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/bodystructure.profile.json b/crates/fhir/tests/data/json/R4B/bodystructure.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/bodystructure.profile.json rename to crates/fhir/tests/data/json/R4B/bodystructure.profile.json diff --git a/crates/fhir/tests/data/R4B/bodytemp-questionnaire.json b/crates/fhir/tests/data/json/R4B/bodytemp-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/bodytemp-questionnaire.json rename to crates/fhir/tests/data/json/R4B/bodytemp-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/bodytemp.profile.json b/crates/fhir/tests/data/json/R4B/bodytemp.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/bodytemp.profile.json rename to crates/fhir/tests/data/json/R4B/bodytemp.profile.json diff --git a/crates/fhir/tests/data/R4B/bodyweight-questionnaire.json b/crates/fhir/tests/data/json/R4B/bodyweight-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/bodyweight-questionnaire.json rename to crates/fhir/tests/data/json/R4B/bodyweight-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/bodyweight.profile.json b/crates/fhir/tests/data/json/R4B/bodyweight.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/bodyweight.profile.json rename to crates/fhir/tests/data/json/R4B/bodyweight.profile.json diff --git a/crates/fhir/tests/data/R4B/boolean.profile.json b/crates/fhir/tests/data/json/R4B/boolean.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/boolean.profile.json rename to crates/fhir/tests/data/json/R4B/boolean.profile.json diff --git a/crates/fhir/tests/data/R4B/bp-questionnaire.json b/crates/fhir/tests/data/json/R4B/bp-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/bp-questionnaire.json rename to crates/fhir/tests/data/json/R4B/bp-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/bp.profile.json b/crates/fhir/tests/data/json/R4B/bp.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/bp.profile.json rename to crates/fhir/tests/data/json/R4B/bp.profile.json diff --git a/crates/fhir/tests/data/R4B/bundle-comprehensive-bone-marrow-report.json b/crates/fhir/tests/data/json/R4B/bundle-comprehensive-bone-marrow-report.json similarity index 100% rename from crates/fhir/tests/data/R4B/bundle-comprehensive-bone-marrow-report.json rename to crates/fhir/tests/data/json/R4B/bundle-comprehensive-bone-marrow-report.json diff --git a/crates/fhir/tests/data/R4B/bundle-dg2.json b/crates/fhir/tests/data/json/R4B/bundle-dg2.json similarity index 100% rename from crates/fhir/tests/data/R4B/bundle-dg2.json rename to crates/fhir/tests/data/json/R4B/bundle-dg2.json diff --git a/crates/fhir/tests/data/R4B/bundle-example.json b/crates/fhir/tests/data/json/R4B/bundle-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/bundle-example.json rename to crates/fhir/tests/data/json/R4B/bundle-example.json diff --git a/crates/fhir/tests/data/R4B/bundle-hla-1.json b/crates/fhir/tests/data/json/R4B/bundle-hla-1.json similarity index 100% rename from crates/fhir/tests/data/R4B/bundle-hla-1.json rename to crates/fhir/tests/data/json/R4B/bundle-hla-1.json diff --git a/crates/fhir/tests/data/R4B/bundle-lipids.json b/crates/fhir/tests/data/json/R4B/bundle-lipids.json similarity index 100% rename from crates/fhir/tests/data/R4B/bundle-lipids.json rename to crates/fhir/tests/data/json/R4B/bundle-lipids.json diff --git a/crates/fhir/tests/data/R4B/bundle-questionnaire.json b/crates/fhir/tests/data/json/R4B/bundle-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/bundle-questionnaire.json rename to crates/fhir/tests/data/json/R4B/bundle-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/bundle-references.json b/crates/fhir/tests/data/json/R4B/bundle-references.json similarity index 100% rename from crates/fhir/tests/data/R4B/bundle-references.json rename to crates/fhir/tests/data/json/R4B/bundle-references.json diff --git a/crates/fhir/tests/data/R4B/bundle-request-medsallergies.json b/crates/fhir/tests/data/json/R4B/bundle-request-medsallergies.json similarity index 100% rename from crates/fhir/tests/data/R4B/bundle-request-medsallergies.json rename to crates/fhir/tests/data/json/R4B/bundle-request-medsallergies.json diff --git a/crates/fhir/tests/data/R4B/bundle-request-simplesummary.json b/crates/fhir/tests/data/json/R4B/bundle-request-simplesummary.json similarity index 100% rename from crates/fhir/tests/data/R4B/bundle-request-simplesummary.json rename to crates/fhir/tests/data/json/R4B/bundle-request-simplesummary.json diff --git a/crates/fhir/tests/data/R4B/bundle-response-medsallergies.json b/crates/fhir/tests/data/json/R4B/bundle-response-medsallergies.json similarity index 100% rename from crates/fhir/tests/data/R4B/bundle-response-medsallergies.json rename to crates/fhir/tests/data/json/R4B/bundle-response-medsallergies.json diff --git a/crates/fhir/tests/data/R4B/bundle-response-simplesummary.json b/crates/fhir/tests/data/json/R4B/bundle-response-simplesummary.json similarity index 100% rename from crates/fhir/tests/data/R4B/bundle-response-simplesummary.json rename to crates/fhir/tests/data/json/R4B/bundle-response-simplesummary.json diff --git a/crates/fhir/tests/data/R4B/bundle-response.json b/crates/fhir/tests/data/json/R4B/bundle-response.json similarity index 100% rename from crates/fhir/tests/data/R4B/bundle-response.json rename to crates/fhir/tests/data/json/R4B/bundle-response.json diff --git a/crates/fhir/tests/data/R4B/bundle-search-warning.json b/crates/fhir/tests/data/json/R4B/bundle-search-warning.json similarity index 100% rename from crates/fhir/tests/data/R4B/bundle-search-warning.json rename to crates/fhir/tests/data/json/R4B/bundle-search-warning.json diff --git a/crates/fhir/tests/data/R4B/bundle-transaction.json b/crates/fhir/tests/data/json/R4B/bundle-transaction.json similarity index 100% rename from crates/fhir/tests/data/R4B/bundle-transaction.json rename to crates/fhir/tests/data/json/R4B/bundle-transaction.json diff --git a/crates/fhir/tests/data/R4B/bundle.profile.json b/crates/fhir/tests/data/json/R4B/bundle.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/bundle.profile.json rename to crates/fhir/tests/data/json/R4B/bundle.profile.json diff --git a/crates/fhir/tests/data/R4B/canonical.profile.json b/crates/fhir/tests/data/json/R4B/canonical.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/canonical.profile.json rename to crates/fhir/tests/data/json/R4B/canonical.profile.json diff --git a/crates/fhir/tests/data/R4B/capabilitystatement-base.json b/crates/fhir/tests/data/json/R4B/capabilitystatement-base.json similarity index 100% rename from crates/fhir/tests/data/R4B/capabilitystatement-base.json rename to crates/fhir/tests/data/json/R4B/capabilitystatement-base.json diff --git a/crates/fhir/tests/data/R4B/capabilitystatement-base2.json b/crates/fhir/tests/data/json/R4B/capabilitystatement-base2.json similarity index 100% rename from crates/fhir/tests/data/R4B/capabilitystatement-base2.json rename to crates/fhir/tests/data/json/R4B/capabilitystatement-base2.json diff --git a/crates/fhir/tests/data/R4B/capabilitystatement-example.json b/crates/fhir/tests/data/json/R4B/capabilitystatement-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/capabilitystatement-example.json rename to crates/fhir/tests/data/json/R4B/capabilitystatement-example.json diff --git a/crates/fhir/tests/data/R4B/capabilitystatement-knowledge-repository.json b/crates/fhir/tests/data/json/R4B/capabilitystatement-knowledge-repository.json similarity index 100% rename from crates/fhir/tests/data/R4B/capabilitystatement-knowledge-repository.json rename to crates/fhir/tests/data/json/R4B/capabilitystatement-knowledge-repository.json diff --git a/crates/fhir/tests/data/R4B/capabilitystatement-measure-processor.json b/crates/fhir/tests/data/json/R4B/capabilitystatement-measure-processor.json similarity index 100% rename from crates/fhir/tests/data/R4B/capabilitystatement-measure-processor.json rename to crates/fhir/tests/data/json/R4B/capabilitystatement-measure-processor.json diff --git a/crates/fhir/tests/data/R4B/capabilitystatement-messagedefinition.json b/crates/fhir/tests/data/json/R4B/capabilitystatement-messagedefinition.json similarity index 100% rename from crates/fhir/tests/data/R4B/capabilitystatement-messagedefinition.json rename to crates/fhir/tests/data/json/R4B/capabilitystatement-messagedefinition.json diff --git a/crates/fhir/tests/data/R4B/capabilitystatement-phr-example.json b/crates/fhir/tests/data/json/R4B/capabilitystatement-phr-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/capabilitystatement-phr-example.json rename to crates/fhir/tests/data/json/R4B/capabilitystatement-phr-example.json diff --git a/crates/fhir/tests/data/R4B/capabilitystatement-questionnaire.json b/crates/fhir/tests/data/json/R4B/capabilitystatement-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/capabilitystatement-questionnaire.json rename to crates/fhir/tests/data/json/R4B/capabilitystatement-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/capabilitystatement-terminology-server.json b/crates/fhir/tests/data/json/R4B/capabilitystatement-terminology-server.json similarity index 100% rename from crates/fhir/tests/data/R4B/capabilitystatement-terminology-server.json rename to crates/fhir/tests/data/json/R4B/capabilitystatement-terminology-server.json diff --git a/crates/fhir/tests/data/R4B/capabilitystatement.profile.json b/crates/fhir/tests/data/json/R4B/capabilitystatement.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/capabilitystatement.profile.json rename to crates/fhir/tests/data/json/R4B/capabilitystatement.profile.json diff --git a/crates/fhir/tests/data/R4B/careplan-example-GPVisit.json b/crates/fhir/tests/data/json/R4B/careplan-example-GPVisit.json similarity index 100% rename from crates/fhir/tests/data/R4B/careplan-example-GPVisit.json rename to crates/fhir/tests/data/json/R4B/careplan-example-GPVisit.json diff --git a/crates/fhir/tests/data/R4B/careplan-example-f001-heart.json b/crates/fhir/tests/data/json/R4B/careplan-example-f001-heart.json similarity index 100% rename from crates/fhir/tests/data/R4B/careplan-example-f001-heart.json rename to crates/fhir/tests/data/json/R4B/careplan-example-f001-heart.json diff --git a/crates/fhir/tests/data/R4B/careplan-example-f002-lung.json b/crates/fhir/tests/data/json/R4B/careplan-example-f002-lung.json similarity index 100% rename from crates/fhir/tests/data/R4B/careplan-example-f002-lung.json rename to crates/fhir/tests/data/json/R4B/careplan-example-f002-lung.json diff --git a/crates/fhir/tests/data/R4B/careplan-example-f003-pharynx.json b/crates/fhir/tests/data/json/R4B/careplan-example-f003-pharynx.json similarity index 100% rename from crates/fhir/tests/data/R4B/careplan-example-f003-pharynx.json rename to crates/fhir/tests/data/json/R4B/careplan-example-f003-pharynx.json diff --git a/crates/fhir/tests/data/R4B/careplan-example-f201-renal.json b/crates/fhir/tests/data/json/R4B/careplan-example-f201-renal.json similarity index 100% rename from crates/fhir/tests/data/R4B/careplan-example-f201-renal.json rename to crates/fhir/tests/data/json/R4B/careplan-example-f201-renal.json diff --git a/crates/fhir/tests/data/R4B/careplan-example-f202-malignancy.json b/crates/fhir/tests/data/json/R4B/careplan-example-f202-malignancy.json similarity index 100% rename from crates/fhir/tests/data/R4B/careplan-example-f202-malignancy.json rename to crates/fhir/tests/data/json/R4B/careplan-example-f202-malignancy.json diff --git a/crates/fhir/tests/data/R4B/careplan-example-f203-sepsis.json b/crates/fhir/tests/data/json/R4B/careplan-example-f203-sepsis.json similarity index 100% rename from crates/fhir/tests/data/R4B/careplan-example-f203-sepsis.json rename to crates/fhir/tests/data/json/R4B/careplan-example-f203-sepsis.json diff --git a/crates/fhir/tests/data/R4B/careplan-example-integrated.json b/crates/fhir/tests/data/json/R4B/careplan-example-integrated.json similarity index 100% rename from crates/fhir/tests/data/R4B/careplan-example-integrated.json rename to crates/fhir/tests/data/json/R4B/careplan-example-integrated.json diff --git a/crates/fhir/tests/data/R4B/careplan-example-obesity-narrative.json b/crates/fhir/tests/data/json/R4B/careplan-example-obesity-narrative.json similarity index 100% rename from crates/fhir/tests/data/R4B/careplan-example-obesity-narrative.json rename to crates/fhir/tests/data/json/R4B/careplan-example-obesity-narrative.json diff --git a/crates/fhir/tests/data/R4B/careplan-example-pregnancy.json b/crates/fhir/tests/data/json/R4B/careplan-example-pregnancy.json similarity index 100% rename from crates/fhir/tests/data/R4B/careplan-example-pregnancy.json rename to crates/fhir/tests/data/json/R4B/careplan-example-pregnancy.json diff --git a/crates/fhir/tests/data/R4B/careplan-example.json b/crates/fhir/tests/data/json/R4B/careplan-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/careplan-example.json rename to crates/fhir/tests/data/json/R4B/careplan-example.json diff --git a/crates/fhir/tests/data/R4B/careplan-questionnaire.json b/crates/fhir/tests/data/json/R4B/careplan-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/careplan-questionnaire.json rename to crates/fhir/tests/data/json/R4B/careplan-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/careplan.profile.json b/crates/fhir/tests/data/json/R4B/careplan.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/careplan.profile.json rename to crates/fhir/tests/data/json/R4B/careplan.profile.json diff --git a/crates/fhir/tests/data/R4B/careteam-example.json b/crates/fhir/tests/data/json/R4B/careteam-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/careteam-example.json rename to crates/fhir/tests/data/json/R4B/careteam-example.json diff --git a/crates/fhir/tests/data/R4B/careteam-questionnaire.json b/crates/fhir/tests/data/json/R4B/careteam-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/careteam-questionnaire.json rename to crates/fhir/tests/data/json/R4B/careteam-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/careteam.profile.json b/crates/fhir/tests/data/json/R4B/careteam.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/careteam.profile.json rename to crates/fhir/tests/data/json/R4B/careteam.profile.json diff --git a/crates/fhir/tests/data/R4B/catalog-questionnaire.json b/crates/fhir/tests/data/json/R4B/catalog-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/catalog-questionnaire.json rename to crates/fhir/tests/data/json/R4B/catalog-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/catalog.profile.json b/crates/fhir/tests/data/json/R4B/catalog.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/catalog.profile.json rename to crates/fhir/tests/data/json/R4B/catalog.profile.json diff --git a/crates/fhir/tests/data/R4B/catalogentry-example.json b/crates/fhir/tests/data/json/R4B/catalogentry-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/catalogentry-example.json rename to crates/fhir/tests/data/json/R4B/catalogentry-example.json diff --git a/crates/fhir/tests/data/R4B/catalogentry-questionnaire.json b/crates/fhir/tests/data/json/R4B/catalogentry-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/catalogentry-questionnaire.json rename to crates/fhir/tests/data/json/R4B/catalogentry-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/catalogentry.profile.json b/crates/fhir/tests/data/json/R4B/catalogentry.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/catalogentry.profile.json rename to crates/fhir/tests/data/json/R4B/catalogentry.profile.json diff --git a/crates/fhir/tests/data/R4B/cdshooksguidanceresponse-questionnaire.json b/crates/fhir/tests/data/json/R4B/cdshooksguidanceresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/cdshooksguidanceresponse-questionnaire.json rename to crates/fhir/tests/data/json/R4B/cdshooksguidanceresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/cdshooksguidanceresponse.profile.json b/crates/fhir/tests/data/json/R4B/cdshooksguidanceresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/cdshooksguidanceresponse.profile.json rename to crates/fhir/tests/data/json/R4B/cdshooksguidanceresponse.profile.json diff --git a/crates/fhir/tests/data/R4B/cdshooksrequestgroup-questionnaire.json b/crates/fhir/tests/data/json/R4B/cdshooksrequestgroup-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/cdshooksrequestgroup-questionnaire.json rename to crates/fhir/tests/data/json/R4B/cdshooksrequestgroup-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/cdshooksrequestgroup.profile.json b/crates/fhir/tests/data/json/R4B/cdshooksrequestgroup.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/cdshooksrequestgroup.profile.json rename to crates/fhir/tests/data/json/R4B/cdshooksrequestgroup.profile.json diff --git a/crates/fhir/tests/data/R4B/cdshooksserviceplandefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/cdshooksserviceplandefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/cdshooksserviceplandefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/cdshooksserviceplandefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/cdshooksserviceplandefinition.profile.json b/crates/fhir/tests/data/json/R4B/cdshooksserviceplandefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/cdshooksserviceplandefinition.profile.json rename to crates/fhir/tests/data/json/R4B/cdshooksserviceplandefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/chargeitem-example.json b/crates/fhir/tests/data/json/R4B/chargeitem-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/chargeitem-example.json rename to crates/fhir/tests/data/json/R4B/chargeitem-example.json diff --git a/crates/fhir/tests/data/R4B/chargeitem-questionnaire.json b/crates/fhir/tests/data/json/R4B/chargeitem-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/chargeitem-questionnaire.json rename to crates/fhir/tests/data/json/R4B/chargeitem-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/chargeitem.profile.json b/crates/fhir/tests/data/json/R4B/chargeitem.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/chargeitem.profile.json rename to crates/fhir/tests/data/json/R4B/chargeitem.profile.json diff --git a/crates/fhir/tests/data/R4B/chargeitemdefinition-device-example.json b/crates/fhir/tests/data/json/R4B/chargeitemdefinition-device-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/chargeitemdefinition-device-example.json rename to crates/fhir/tests/data/json/R4B/chargeitemdefinition-device-example.json diff --git a/crates/fhir/tests/data/R4B/chargeitemdefinition-ebm-example.json b/crates/fhir/tests/data/json/R4B/chargeitemdefinition-ebm-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/chargeitemdefinition-ebm-example.json rename to crates/fhir/tests/data/json/R4B/chargeitemdefinition-ebm-example.json diff --git a/crates/fhir/tests/data/R4B/chargeitemdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/chargeitemdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/chargeitemdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/chargeitemdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/chargeitemdefinition.profile.json b/crates/fhir/tests/data/json/R4B/chargeitemdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/chargeitemdefinition.profile.json rename to crates/fhir/tests/data/json/R4B/chargeitemdefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/cholesterol-questionnaire.json b/crates/fhir/tests/data/json/R4B/cholesterol-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/cholesterol-questionnaire.json rename to crates/fhir/tests/data/json/R4B/cholesterol-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/cholesterol.profile.json b/crates/fhir/tests/data/json/R4B/cholesterol.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/cholesterol.profile.json rename to crates/fhir/tests/data/json/R4B/cholesterol.profile.json diff --git a/crates/fhir/tests/data/R4B/citation-example.json b/crates/fhir/tests/data/json/R4B/citation-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/citation-example.json rename to crates/fhir/tests/data/json/R4B/citation-example.json diff --git a/crates/fhir/tests/data/R4B/citation-questionnaire.json b/crates/fhir/tests/data/json/R4B/citation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/citation-questionnaire.json rename to crates/fhir/tests/data/json/R4B/citation-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/citation.profile.json b/crates/fhir/tests/data/json/R4B/citation.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/citation.profile.json rename to crates/fhir/tests/data/json/R4B/citation.profile.json diff --git a/crates/fhir/tests/data/R4B/claim-example-cms1500-medical.json b/crates/fhir/tests/data/json/R4B/claim-example-cms1500-medical.json similarity index 100% rename from crates/fhir/tests/data/R4B/claim-example-cms1500-medical.json rename to crates/fhir/tests/data/json/R4B/claim-example-cms1500-medical.json diff --git a/crates/fhir/tests/data/R4B/claim-example-institutional-rich.json b/crates/fhir/tests/data/json/R4B/claim-example-institutional-rich.json similarity index 100% rename from crates/fhir/tests/data/R4B/claim-example-institutional-rich.json rename to crates/fhir/tests/data/json/R4B/claim-example-institutional-rich.json diff --git a/crates/fhir/tests/data/R4B/claim-example-institutional.json b/crates/fhir/tests/data/json/R4B/claim-example-institutional.json similarity index 100% rename from crates/fhir/tests/data/R4B/claim-example-institutional.json rename to crates/fhir/tests/data/json/R4B/claim-example-institutional.json diff --git a/crates/fhir/tests/data/R4B/claim-example-oral-average.json b/crates/fhir/tests/data/json/R4B/claim-example-oral-average.json similarity index 100% rename from crates/fhir/tests/data/R4B/claim-example-oral-average.json rename to crates/fhir/tests/data/json/R4B/claim-example-oral-average.json diff --git a/crates/fhir/tests/data/R4B/claim-example-oral-bridge.json b/crates/fhir/tests/data/json/R4B/claim-example-oral-bridge.json similarity index 100% rename from crates/fhir/tests/data/R4B/claim-example-oral-bridge.json rename to crates/fhir/tests/data/json/R4B/claim-example-oral-bridge.json diff --git a/crates/fhir/tests/data/R4B/claim-example-oral-contained-identifier.json b/crates/fhir/tests/data/json/R4B/claim-example-oral-contained-identifier.json similarity index 100% rename from crates/fhir/tests/data/R4B/claim-example-oral-contained-identifier.json rename to crates/fhir/tests/data/json/R4B/claim-example-oral-contained-identifier.json diff --git a/crates/fhir/tests/data/R4B/claim-example-oral-contained.json b/crates/fhir/tests/data/json/R4B/claim-example-oral-contained.json similarity index 100% rename from crates/fhir/tests/data/R4B/claim-example-oral-contained.json rename to crates/fhir/tests/data/json/R4B/claim-example-oral-contained.json diff --git a/crates/fhir/tests/data/R4B/claim-example-oral-identifier.json b/crates/fhir/tests/data/json/R4B/claim-example-oral-identifier.json similarity index 100% rename from crates/fhir/tests/data/R4B/claim-example-oral-identifier.json rename to crates/fhir/tests/data/json/R4B/claim-example-oral-identifier.json diff --git a/crates/fhir/tests/data/R4B/claim-example-oral-orthoplan.json b/crates/fhir/tests/data/json/R4B/claim-example-oral-orthoplan.json similarity index 100% rename from crates/fhir/tests/data/R4B/claim-example-oral-orthoplan.json rename to crates/fhir/tests/data/json/R4B/claim-example-oral-orthoplan.json diff --git a/crates/fhir/tests/data/R4B/claim-example-pharmacy-compound.json b/crates/fhir/tests/data/json/R4B/claim-example-pharmacy-compound.json similarity index 100% rename from crates/fhir/tests/data/R4B/claim-example-pharmacy-compound.json rename to crates/fhir/tests/data/json/R4B/claim-example-pharmacy-compound.json diff --git a/crates/fhir/tests/data/R4B/claim-example-pharmacy-medication.json b/crates/fhir/tests/data/json/R4B/claim-example-pharmacy-medication.json similarity index 100% rename from crates/fhir/tests/data/R4B/claim-example-pharmacy-medication.json rename to crates/fhir/tests/data/json/R4B/claim-example-pharmacy-medication.json diff --git a/crates/fhir/tests/data/R4B/claim-example-pharmacy.json b/crates/fhir/tests/data/json/R4B/claim-example-pharmacy.json similarity index 100% rename from crates/fhir/tests/data/R4B/claim-example-pharmacy.json rename to crates/fhir/tests/data/json/R4B/claim-example-pharmacy.json diff --git a/crates/fhir/tests/data/R4B/claim-example-professional.json b/crates/fhir/tests/data/json/R4B/claim-example-professional.json similarity index 100% rename from crates/fhir/tests/data/R4B/claim-example-professional.json rename to crates/fhir/tests/data/json/R4B/claim-example-professional.json diff --git a/crates/fhir/tests/data/R4B/claim-example-vision-glasses-3tier.json b/crates/fhir/tests/data/json/R4B/claim-example-vision-glasses-3tier.json similarity index 100% rename from crates/fhir/tests/data/R4B/claim-example-vision-glasses-3tier.json rename to crates/fhir/tests/data/json/R4B/claim-example-vision-glasses-3tier.json diff --git a/crates/fhir/tests/data/R4B/claim-example-vision-glasses.json b/crates/fhir/tests/data/json/R4B/claim-example-vision-glasses.json similarity index 100% rename from crates/fhir/tests/data/R4B/claim-example-vision-glasses.json rename to crates/fhir/tests/data/json/R4B/claim-example-vision-glasses.json diff --git a/crates/fhir/tests/data/R4B/claim-example-vision.json b/crates/fhir/tests/data/json/R4B/claim-example-vision.json similarity index 100% rename from crates/fhir/tests/data/R4B/claim-example-vision.json rename to crates/fhir/tests/data/json/R4B/claim-example-vision.json diff --git a/crates/fhir/tests/data/R4B/claim-example.json b/crates/fhir/tests/data/json/R4B/claim-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/claim-example.json rename to crates/fhir/tests/data/json/R4B/claim-example.json diff --git a/crates/fhir/tests/data/R4B/claim-questionnaire.json b/crates/fhir/tests/data/json/R4B/claim-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/claim-questionnaire.json rename to crates/fhir/tests/data/json/R4B/claim-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/claim.profile.json b/crates/fhir/tests/data/json/R4B/claim.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/claim.profile.json rename to crates/fhir/tests/data/json/R4B/claim.profile.json diff --git a/crates/fhir/tests/data/R4B/claimresponse-example-2.json b/crates/fhir/tests/data/json/R4B/claimresponse-example-2.json similarity index 100% rename from crates/fhir/tests/data/R4B/claimresponse-example-2.json rename to crates/fhir/tests/data/json/R4B/claimresponse-example-2.json diff --git a/crates/fhir/tests/data/R4B/claimresponse-example-additem.json b/crates/fhir/tests/data/json/R4B/claimresponse-example-additem.json similarity index 100% rename from crates/fhir/tests/data/R4B/claimresponse-example-additem.json rename to crates/fhir/tests/data/json/R4B/claimresponse-example-additem.json diff --git a/crates/fhir/tests/data/R4B/claimresponse-example-unsolicited-preauth.json b/crates/fhir/tests/data/json/R4B/claimresponse-example-unsolicited-preauth.json similarity index 100% rename from crates/fhir/tests/data/R4B/claimresponse-example-unsolicited-preauth.json rename to crates/fhir/tests/data/json/R4B/claimresponse-example-unsolicited-preauth.json diff --git a/crates/fhir/tests/data/R4B/claimresponse-example-vision-3tier.json b/crates/fhir/tests/data/json/R4B/claimresponse-example-vision-3tier.json similarity index 100% rename from crates/fhir/tests/data/R4B/claimresponse-example-vision-3tier.json rename to crates/fhir/tests/data/json/R4B/claimresponse-example-vision-3tier.json diff --git a/crates/fhir/tests/data/R4B/claimresponse-example.json b/crates/fhir/tests/data/json/R4B/claimresponse-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/claimresponse-example.json rename to crates/fhir/tests/data/json/R4B/claimresponse-example.json diff --git a/crates/fhir/tests/data/R4B/claimresponse-questionnaire.json b/crates/fhir/tests/data/json/R4B/claimresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/claimresponse-questionnaire.json rename to crates/fhir/tests/data/json/R4B/claimresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/claimresponse.profile.json b/crates/fhir/tests/data/json/R4B/claimresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/claimresponse.profile.json rename to crates/fhir/tests/data/json/R4B/claimresponse.profile.json diff --git a/crates/fhir/tests/data/R4B/clinicaldocument-questionnaire.json b/crates/fhir/tests/data/json/R4B/clinicaldocument-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/clinicaldocument-questionnaire.json rename to crates/fhir/tests/data/json/R4B/clinicaldocument-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/clinicaldocument.profile.json b/crates/fhir/tests/data/json/R4B/clinicaldocument.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/clinicaldocument.profile.json rename to crates/fhir/tests/data/json/R4B/clinicaldocument.profile.json diff --git a/crates/fhir/tests/data/R4B/clinicalimpression-example.json b/crates/fhir/tests/data/json/R4B/clinicalimpression-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/clinicalimpression-example.json rename to crates/fhir/tests/data/json/R4B/clinicalimpression-example.json diff --git a/crates/fhir/tests/data/R4B/clinicalimpression-questionnaire.json b/crates/fhir/tests/data/json/R4B/clinicalimpression-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/clinicalimpression-questionnaire.json rename to crates/fhir/tests/data/json/R4B/clinicalimpression-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/clinicalimpression.profile.json b/crates/fhir/tests/data/json/R4B/clinicalimpression.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/clinicalimpression.profile.json rename to crates/fhir/tests/data/json/R4B/clinicalimpression.profile.json diff --git a/crates/fhir/tests/data/R4B/clinicalusedefinition-example.json b/crates/fhir/tests/data/json/R4B/clinicalusedefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/clinicalusedefinition-example.json rename to crates/fhir/tests/data/json/R4B/clinicalusedefinition-example.json diff --git a/crates/fhir/tests/data/R4B/clinicalusedefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/clinicalusedefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/clinicalusedefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/clinicalusedefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/clinicalusedefinition.profile.json b/crates/fhir/tests/data/json/R4B/clinicalusedefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/clinicalusedefinition.profile.json rename to crates/fhir/tests/data/json/R4B/clinicalusedefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/cm-address-type-v3.json b/crates/fhir/tests/data/json/R4B/cm-address-type-v3.json similarity index 100% rename from crates/fhir/tests/data/R4B/cm-address-type-v3.json rename to crates/fhir/tests/data/json/R4B/cm-address-type-v3.json diff --git a/crates/fhir/tests/data/R4B/cm-address-use-v2.json b/crates/fhir/tests/data/json/R4B/cm-address-use-v2.json similarity index 100% rename from crates/fhir/tests/data/R4B/cm-address-use-v2.json rename to crates/fhir/tests/data/json/R4B/cm-address-use-v2.json diff --git a/crates/fhir/tests/data/R4B/cm-address-use-v3.json b/crates/fhir/tests/data/json/R4B/cm-address-use-v3.json similarity index 100% rename from crates/fhir/tests/data/R4B/cm-address-use-v3.json rename to crates/fhir/tests/data/json/R4B/cm-address-use-v3.json diff --git a/crates/fhir/tests/data/R4B/cm-administrative-gender-v2.json b/crates/fhir/tests/data/json/R4B/cm-administrative-gender-v2.json similarity index 100% rename from crates/fhir/tests/data/R4B/cm-administrative-gender-v2.json rename to crates/fhir/tests/data/json/R4B/cm-administrative-gender-v2.json diff --git a/crates/fhir/tests/data/R4B/cm-administrative-gender-v3.json b/crates/fhir/tests/data/json/R4B/cm-administrative-gender-v3.json similarity index 100% rename from crates/fhir/tests/data/R4B/cm-administrative-gender-v3.json rename to crates/fhir/tests/data/json/R4B/cm-administrative-gender-v3.json diff --git a/crates/fhir/tests/data/R4B/cm-contact-point-system-v2.json b/crates/fhir/tests/data/json/R4B/cm-contact-point-system-v2.json similarity index 100% rename from crates/fhir/tests/data/R4B/cm-contact-point-system-v2.json rename to crates/fhir/tests/data/json/R4B/cm-contact-point-system-v2.json diff --git a/crates/fhir/tests/data/R4B/cm-contact-point-use-v2.json b/crates/fhir/tests/data/json/R4B/cm-contact-point-use-v2.json similarity index 100% rename from crates/fhir/tests/data/R4B/cm-contact-point-use-v2.json rename to crates/fhir/tests/data/json/R4B/cm-contact-point-use-v2.json diff --git a/crates/fhir/tests/data/R4B/cm-contact-point-use-v3.json b/crates/fhir/tests/data/json/R4B/cm-contact-point-use-v3.json similarity index 100% rename from crates/fhir/tests/data/R4B/cm-contact-point-use-v3.json rename to crates/fhir/tests/data/json/R4B/cm-contact-point-use-v3.json diff --git a/crates/fhir/tests/data/R4B/cm-data-absent-reason-v3.json b/crates/fhir/tests/data/json/R4B/cm-data-absent-reason-v3.json similarity index 100% rename from crates/fhir/tests/data/R4B/cm-data-absent-reason-v3.json rename to crates/fhir/tests/data/json/R4B/cm-data-absent-reason-v3.json diff --git a/crates/fhir/tests/data/R4B/cm-document-reference-status-v3.json b/crates/fhir/tests/data/json/R4B/cm-document-reference-status-v3.json similarity index 100% rename from crates/fhir/tests/data/R4B/cm-document-reference-status-v3.json rename to crates/fhir/tests/data/json/R4B/cm-document-reference-status-v3.json diff --git a/crates/fhir/tests/data/R4B/cm-name-use-v2.json b/crates/fhir/tests/data/json/R4B/cm-name-use-v2.json similarity index 100% rename from crates/fhir/tests/data/R4B/cm-name-use-v2.json rename to crates/fhir/tests/data/json/R4B/cm-name-use-v2.json diff --git a/crates/fhir/tests/data/R4B/cm-name-use-v3.json b/crates/fhir/tests/data/json/R4B/cm-name-use-v3.json similarity index 100% rename from crates/fhir/tests/data/R4B/cm-name-use-v3.json rename to crates/fhir/tests/data/json/R4B/cm-name-use-v3.json diff --git a/crates/fhir/tests/data/R4B/code.profile.json b/crates/fhir/tests/data/json/R4B/code.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/code.profile.json rename to crates/fhir/tests/data/json/R4B/code.profile.json diff --git a/crates/fhir/tests/data/R4B/codeableconcept.profile.json b/crates/fhir/tests/data/json/R4B/codeableconcept.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/codeableconcept.profile.json rename to crates/fhir/tests/data/json/R4B/codeableconcept.profile.json diff --git a/crates/fhir/tests/data/R4B/codeablereference.profile.json b/crates/fhir/tests/data/json/R4B/codeablereference.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/codeablereference.profile.json rename to crates/fhir/tests/data/json/R4B/codeablereference.profile.json diff --git a/crates/fhir/tests/data/R4B/codesystem-FHIR-version.json b/crates/fhir/tests/data/json/R4B/codesystem-FHIR-version.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-FHIR-version.json rename to crates/fhir/tests/data/json/R4B/codesystem-FHIR-version.json diff --git a/crates/fhir/tests/data/R4B/codesystem-abstract-types.json b/crates/fhir/tests/data/json/R4B/codesystem-abstract-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-abstract-types.json rename to crates/fhir/tests/data/json/R4B/codesystem-abstract-types.json diff --git a/crates/fhir/tests/data/R4B/codesystem-account-status.json b/crates/fhir/tests/data/json/R4B/codesystem-account-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-account-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-account-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-action-cardinality-behavior.json b/crates/fhir/tests/data/json/R4B/codesystem-action-cardinality-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-action-cardinality-behavior.json rename to crates/fhir/tests/data/json/R4B/codesystem-action-cardinality-behavior.json diff --git a/crates/fhir/tests/data/R4B/codesystem-action-code.json b/crates/fhir/tests/data/json/R4B/codesystem-action-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-action-code.json rename to crates/fhir/tests/data/json/R4B/codesystem-action-code.json diff --git a/crates/fhir/tests/data/R4B/codesystem-action-condition-kind.json b/crates/fhir/tests/data/json/R4B/codesystem-action-condition-kind.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-action-condition-kind.json rename to crates/fhir/tests/data/json/R4B/codesystem-action-condition-kind.json diff --git a/crates/fhir/tests/data/R4B/codesystem-action-grouping-behavior.json b/crates/fhir/tests/data/json/R4B/codesystem-action-grouping-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-action-grouping-behavior.json rename to crates/fhir/tests/data/json/R4B/codesystem-action-grouping-behavior.json diff --git a/crates/fhir/tests/data/R4B/codesystem-action-participant-type.json b/crates/fhir/tests/data/json/R4B/codesystem-action-participant-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-action-participant-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-action-participant-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-action-precheck-behavior.json b/crates/fhir/tests/data/json/R4B/codesystem-action-precheck-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-action-precheck-behavior.json rename to crates/fhir/tests/data/json/R4B/codesystem-action-precheck-behavior.json diff --git a/crates/fhir/tests/data/R4B/codesystem-action-reason-code.json b/crates/fhir/tests/data/json/R4B/codesystem-action-reason-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-action-reason-code.json rename to crates/fhir/tests/data/json/R4B/codesystem-action-reason-code.json diff --git a/crates/fhir/tests/data/R4B/codesystem-action-relationship-type.json b/crates/fhir/tests/data/json/R4B/codesystem-action-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-action-relationship-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-action-relationship-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-action-required-behavior.json b/crates/fhir/tests/data/json/R4B/codesystem-action-required-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-action-required-behavior.json rename to crates/fhir/tests/data/json/R4B/codesystem-action-required-behavior.json diff --git a/crates/fhir/tests/data/R4B/codesystem-action-selection-behavior.json b/crates/fhir/tests/data/json/R4B/codesystem-action-selection-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-action-selection-behavior.json rename to crates/fhir/tests/data/json/R4B/codesystem-action-selection-behavior.json diff --git a/crates/fhir/tests/data/R4B/codesystem-action-type.json b/crates/fhir/tests/data/json/R4B/codesystem-action-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-action-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-action-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-address-type.json b/crates/fhir/tests/data/json/R4B/codesystem-address-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-address-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-address-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-address-use.json b/crates/fhir/tests/data/json/R4B/codesystem-address-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-address-use.json rename to crates/fhir/tests/data/json/R4B/codesystem-address-use.json diff --git a/crates/fhir/tests/data/R4B/codesystem-adjudication-error.json b/crates/fhir/tests/data/json/R4B/codesystem-adjudication-error.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-adjudication-error.json rename to crates/fhir/tests/data/json/R4B/codesystem-adjudication-error.json diff --git a/crates/fhir/tests/data/R4B/codesystem-adjudication-reason.json b/crates/fhir/tests/data/json/R4B/codesystem-adjudication-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-adjudication-reason.json rename to crates/fhir/tests/data/json/R4B/codesystem-adjudication-reason.json diff --git a/crates/fhir/tests/data/R4B/codesystem-adjudication.json b/crates/fhir/tests/data/json/R4B/codesystem-adjudication.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-adjudication.json rename to crates/fhir/tests/data/json/R4B/codesystem-adjudication.json diff --git a/crates/fhir/tests/data/R4B/codesystem-administrable-dose-form.json b/crates/fhir/tests/data/json/R4B/codesystem-administrable-dose-form.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-administrable-dose-form.json rename to crates/fhir/tests/data/json/R4B/codesystem-administrable-dose-form.json diff --git a/crates/fhir/tests/data/R4B/codesystem-administrative-gender.json b/crates/fhir/tests/data/json/R4B/codesystem-administrative-gender.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-administrative-gender.json rename to crates/fhir/tests/data/json/R4B/codesystem-administrative-gender.json diff --git a/crates/fhir/tests/data/R4B/codesystem-adverse-event-actuality.json b/crates/fhir/tests/data/json/R4B/codesystem-adverse-event-actuality.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-adverse-event-actuality.json rename to crates/fhir/tests/data/json/R4B/codesystem-adverse-event-actuality.json diff --git a/crates/fhir/tests/data/R4B/codesystem-adverse-event-category.json b/crates/fhir/tests/data/json/R4B/codesystem-adverse-event-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-adverse-event-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-adverse-event-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-adverse-event-causality-assess.json b/crates/fhir/tests/data/json/R4B/codesystem-adverse-event-causality-assess.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-adverse-event-causality-assess.json rename to crates/fhir/tests/data/json/R4B/codesystem-adverse-event-causality-assess.json diff --git a/crates/fhir/tests/data/R4B/codesystem-adverse-event-causality-method.json b/crates/fhir/tests/data/json/R4B/codesystem-adverse-event-causality-method.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-adverse-event-causality-method.json rename to crates/fhir/tests/data/json/R4B/codesystem-adverse-event-causality-method.json diff --git a/crates/fhir/tests/data/R4B/codesystem-adverse-event-outcome.json b/crates/fhir/tests/data/json/R4B/codesystem-adverse-event-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-adverse-event-outcome.json rename to crates/fhir/tests/data/json/R4B/codesystem-adverse-event-outcome.json diff --git a/crates/fhir/tests/data/R4B/codesystem-adverse-event-seriousness.json b/crates/fhir/tests/data/json/R4B/codesystem-adverse-event-seriousness.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-adverse-event-seriousness.json rename to crates/fhir/tests/data/json/R4B/codesystem-adverse-event-seriousness.json diff --git a/crates/fhir/tests/data/R4B/codesystem-adverse-event-severity.json b/crates/fhir/tests/data/json/R4B/codesystem-adverse-event-severity.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-adverse-event-severity.json rename to crates/fhir/tests/data/json/R4B/codesystem-adverse-event-severity.json diff --git a/crates/fhir/tests/data/R4B/codesystem-allergy-intolerance-category.json b/crates/fhir/tests/data/json/R4B/codesystem-allergy-intolerance-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-allergy-intolerance-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-allergy-intolerance-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-allergy-intolerance-criticality.json b/crates/fhir/tests/data/json/R4B/codesystem-allergy-intolerance-criticality.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-allergy-intolerance-criticality.json rename to crates/fhir/tests/data/json/R4B/codesystem-allergy-intolerance-criticality.json diff --git a/crates/fhir/tests/data/R4B/codesystem-allergy-intolerance-type.json b/crates/fhir/tests/data/json/R4B/codesystem-allergy-intolerance-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-allergy-intolerance-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-allergy-intolerance-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-allergyintolerance-clinical.json b/crates/fhir/tests/data/json/R4B/codesystem-allergyintolerance-clinical.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-allergyintolerance-clinical.json rename to crates/fhir/tests/data/json/R4B/codesystem-allergyintolerance-clinical.json diff --git a/crates/fhir/tests/data/R4B/codesystem-allergyintolerance-verification.json b/crates/fhir/tests/data/json/R4B/codesystem-allergyintolerance-verification.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-allergyintolerance-verification.json rename to crates/fhir/tests/data/json/R4B/codesystem-allergyintolerance-verification.json diff --git a/crates/fhir/tests/data/R4B/codesystem-animal-genderstatus.json b/crates/fhir/tests/data/json/R4B/codesystem-animal-genderstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-animal-genderstatus.json rename to crates/fhir/tests/data/json/R4B/codesystem-animal-genderstatus.json diff --git a/crates/fhir/tests/data/R4B/codesystem-animal-species.json b/crates/fhir/tests/data/json/R4B/codesystem-animal-species.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-animal-species.json rename to crates/fhir/tests/data/json/R4B/codesystem-animal-species.json diff --git a/crates/fhir/tests/data/R4B/codesystem-animal-tissue-type.json b/crates/fhir/tests/data/json/R4B/codesystem-animal-tissue-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-animal-tissue-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-animal-tissue-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-appointment-cancellation-reason.json b/crates/fhir/tests/data/json/R4B/codesystem-appointment-cancellation-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-appointment-cancellation-reason.json rename to crates/fhir/tests/data/json/R4B/codesystem-appointment-cancellation-reason.json diff --git a/crates/fhir/tests/data/R4B/codesystem-appointmentstatus.json b/crates/fhir/tests/data/json/R4B/codesystem-appointmentstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-appointmentstatus.json rename to crates/fhir/tests/data/json/R4B/codesystem-appointmentstatus.json diff --git a/crates/fhir/tests/data/R4B/codesystem-article-url-type.json b/crates/fhir/tests/data/json/R4B/codesystem-article-url-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-article-url-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-article-url-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-artifact-contribution-instance-type.json b/crates/fhir/tests/data/json/R4B/codesystem-artifact-contribution-instance-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-artifact-contribution-instance-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-artifact-contribution-instance-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-artifact-contribution-type.json b/crates/fhir/tests/data/json/R4B/codesystem-artifact-contribution-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-artifact-contribution-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-artifact-contribution-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-artifact-relationship-type.json b/crates/fhir/tests/data/json/R4B/codesystem-artifact-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-artifact-relationship-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-artifact-relationship-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-assert-direction-codes.json b/crates/fhir/tests/data/json/R4B/codesystem-assert-direction-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-assert-direction-codes.json rename to crates/fhir/tests/data/json/R4B/codesystem-assert-direction-codes.json diff --git a/crates/fhir/tests/data/R4B/codesystem-assert-operator-codes.json b/crates/fhir/tests/data/json/R4B/codesystem-assert-operator-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-assert-operator-codes.json rename to crates/fhir/tests/data/json/R4B/codesystem-assert-operator-codes.json diff --git a/crates/fhir/tests/data/R4B/codesystem-assert-response-code-types.json b/crates/fhir/tests/data/json/R4B/codesystem-assert-response-code-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-assert-response-code-types.json rename to crates/fhir/tests/data/json/R4B/codesystem-assert-response-code-types.json diff --git a/crates/fhir/tests/data/R4B/codesystem-asset-availability.json b/crates/fhir/tests/data/json/R4B/codesystem-asset-availability.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-asset-availability.json rename to crates/fhir/tests/data/json/R4B/codesystem-asset-availability.json diff --git a/crates/fhir/tests/data/R4B/codesystem-attribute-estimate-type.json b/crates/fhir/tests/data/json/R4B/codesystem-attribute-estimate-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-attribute-estimate-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-attribute-estimate-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-audit-entity-type.json b/crates/fhir/tests/data/json/R4B/codesystem-audit-entity-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-audit-entity-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-audit-entity-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-audit-event-action.json b/crates/fhir/tests/data/json/R4B/codesystem-audit-event-action.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-audit-event-action.json rename to crates/fhir/tests/data/json/R4B/codesystem-audit-event-action.json diff --git a/crates/fhir/tests/data/R4B/codesystem-audit-event-outcome.json b/crates/fhir/tests/data/json/R4B/codesystem-audit-event-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-audit-event-outcome.json rename to crates/fhir/tests/data/json/R4B/codesystem-audit-event-outcome.json diff --git a/crates/fhir/tests/data/R4B/codesystem-audit-event-type.json b/crates/fhir/tests/data/json/R4B/codesystem-audit-event-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-audit-event-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-audit-event-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-audit-source-type.json b/crates/fhir/tests/data/json/R4B/codesystem-audit-source-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-audit-source-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-audit-source-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-basic-resource-type.json b/crates/fhir/tests/data/json/R4B/codesystem-basic-resource-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-basic-resource-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-basic-resource-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-benefit-network.json b/crates/fhir/tests/data/json/R4B/codesystem-benefit-network.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-benefit-network.json rename to crates/fhir/tests/data/json/R4B/codesystem-benefit-network.json diff --git a/crates/fhir/tests/data/R4B/codesystem-benefit-term.json b/crates/fhir/tests/data/json/R4B/codesystem-benefit-term.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-benefit-term.json rename to crates/fhir/tests/data/json/R4B/codesystem-benefit-term.json diff --git a/crates/fhir/tests/data/R4B/codesystem-benefit-type.json b/crates/fhir/tests/data/json/R4B/codesystem-benefit-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-benefit-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-benefit-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-benefit-unit.json b/crates/fhir/tests/data/json/R4B/codesystem-benefit-unit.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-benefit-unit.json rename to crates/fhir/tests/data/json/R4B/codesystem-benefit-unit.json diff --git a/crates/fhir/tests/data/R4B/codesystem-binding-strength.json b/crates/fhir/tests/data/json/R4B/codesystem-binding-strength.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-binding-strength.json rename to crates/fhir/tests/data/json/R4B/codesystem-binding-strength.json diff --git a/crates/fhir/tests/data/R4B/codesystem-bundle-type.json b/crates/fhir/tests/data/json/R4B/codesystem-bundle-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-bundle-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-bundle-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-capability-statement-kind.json b/crates/fhir/tests/data/json/R4B/codesystem-capability-statement-kind.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-capability-statement-kind.json rename to crates/fhir/tests/data/json/R4B/codesystem-capability-statement-kind.json diff --git a/crates/fhir/tests/data/R4B/codesystem-care-plan-activity-status.json b/crates/fhir/tests/data/json/R4B/codesystem-care-plan-activity-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-care-plan-activity-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-care-plan-activity-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-care-team-status.json b/crates/fhir/tests/data/json/R4B/codesystem-care-team-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-care-team-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-care-team-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-catalogType.json b/crates/fhir/tests/data/json/R4B/codesystem-catalogType.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-catalogType.json rename to crates/fhir/tests/data/json/R4B/codesystem-catalogType.json diff --git a/crates/fhir/tests/data/R4B/codesystem-cdshooks-indicator.json b/crates/fhir/tests/data/json/R4B/codesystem-cdshooks-indicator.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-cdshooks-indicator.json rename to crates/fhir/tests/data/json/R4B/codesystem-cdshooks-indicator.json diff --git a/crates/fhir/tests/data/R4B/codesystem-certainty-rating.json b/crates/fhir/tests/data/json/R4B/codesystem-certainty-rating.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-certainty-rating.json rename to crates/fhir/tests/data/json/R4B/codesystem-certainty-rating.json diff --git a/crates/fhir/tests/data/R4B/codesystem-certainty-type.json b/crates/fhir/tests/data/json/R4B/codesystem-certainty-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-certainty-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-certainty-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-characteristic-combination.json b/crates/fhir/tests/data/json/R4B/codesystem-characteristic-combination.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-characteristic-combination.json rename to crates/fhir/tests/data/json/R4B/codesystem-characteristic-combination.json diff --git a/crates/fhir/tests/data/R4B/codesystem-characteristic-method.json b/crates/fhir/tests/data/json/R4B/codesystem-characteristic-method.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-characteristic-method.json rename to crates/fhir/tests/data/json/R4B/codesystem-characteristic-method.json diff --git a/crates/fhir/tests/data/R4B/codesystem-chargeitem-billingcodes.json b/crates/fhir/tests/data/json/R4B/codesystem-chargeitem-billingcodes.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-chargeitem-billingcodes.json rename to crates/fhir/tests/data/json/R4B/codesystem-chargeitem-billingcodes.json diff --git a/crates/fhir/tests/data/R4B/codesystem-chargeitem-status.json b/crates/fhir/tests/data/json/R4B/codesystem-chargeitem-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-chargeitem-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-chargeitem-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-chromosome-human.json b/crates/fhir/tests/data/json/R4B/codesystem-chromosome-human.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-chromosome-human.json rename to crates/fhir/tests/data/json/R4B/codesystem-chromosome-human.json diff --git a/crates/fhir/tests/data/R4B/codesystem-citation-artifact-classifier.json b/crates/fhir/tests/data/json/R4B/codesystem-citation-artifact-classifier.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-citation-artifact-classifier.json rename to crates/fhir/tests/data/json/R4B/codesystem-citation-artifact-classifier.json diff --git a/crates/fhir/tests/data/R4B/codesystem-citation-classification-type.json b/crates/fhir/tests/data/json/R4B/codesystem-citation-classification-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-citation-classification-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-citation-classification-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-citation-status-type.json b/crates/fhir/tests/data/json/R4B/codesystem-citation-status-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-citation-status-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-citation-status-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-citation-summary-style.json b/crates/fhir/tests/data/json/R4B/codesystem-citation-summary-style.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-citation-summary-style.json rename to crates/fhir/tests/data/json/R4B/codesystem-citation-summary-style.json diff --git a/crates/fhir/tests/data/R4B/codesystem-cited-artifact-abstract-type.json b/crates/fhir/tests/data/json/R4B/codesystem-cited-artifact-abstract-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-cited-artifact-abstract-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-cited-artifact-abstract-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-cited-artifact-classification-type.json b/crates/fhir/tests/data/json/R4B/codesystem-cited-artifact-classification-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-cited-artifact-classification-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-cited-artifact-classification-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-cited-artifact-part-type.json b/crates/fhir/tests/data/json/R4B/codesystem-cited-artifact-part-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-cited-artifact-part-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-cited-artifact-part-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-cited-artifact-status-type.json b/crates/fhir/tests/data/json/R4B/codesystem-cited-artifact-status-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-cited-artifact-status-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-cited-artifact-status-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-cited-medium.json b/crates/fhir/tests/data/json/R4B/codesystem-cited-medium.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-cited-medium.json rename to crates/fhir/tests/data/json/R4B/codesystem-cited-medium.json diff --git a/crates/fhir/tests/data/R4B/codesystem-claim-careteamrole.json b/crates/fhir/tests/data/json/R4B/codesystem-claim-careteamrole.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-claim-careteamrole.json rename to crates/fhir/tests/data/json/R4B/codesystem-claim-careteamrole.json diff --git a/crates/fhir/tests/data/R4B/codesystem-claim-exception.json b/crates/fhir/tests/data/json/R4B/codesystem-claim-exception.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-claim-exception.json rename to crates/fhir/tests/data/json/R4B/codesystem-claim-exception.json diff --git a/crates/fhir/tests/data/R4B/codesystem-claim-informationcategory.json b/crates/fhir/tests/data/json/R4B/codesystem-claim-informationcategory.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-claim-informationcategory.json rename to crates/fhir/tests/data/json/R4B/codesystem-claim-informationcategory.json diff --git a/crates/fhir/tests/data/R4B/codesystem-claim-modifiers.json b/crates/fhir/tests/data/json/R4B/codesystem-claim-modifiers.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-claim-modifiers.json rename to crates/fhir/tests/data/json/R4B/codesystem-claim-modifiers.json diff --git a/crates/fhir/tests/data/R4B/codesystem-claim-subtype.json b/crates/fhir/tests/data/json/R4B/codesystem-claim-subtype.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-claim-subtype.json rename to crates/fhir/tests/data/json/R4B/codesystem-claim-subtype.json diff --git a/crates/fhir/tests/data/R4B/codesystem-claim-type.json b/crates/fhir/tests/data/json/R4B/codesystem-claim-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-claim-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-claim-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-claim-use.json b/crates/fhir/tests/data/json/R4B/codesystem-claim-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-claim-use.json rename to crates/fhir/tests/data/json/R4B/codesystem-claim-use.json diff --git a/crates/fhir/tests/data/R4B/codesystem-clinical-use-definition-category.json b/crates/fhir/tests/data/json/R4B/codesystem-clinical-use-definition-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-clinical-use-definition-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-clinical-use-definition-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-clinical-use-definition-type.json b/crates/fhir/tests/data/json/R4B/codesystem-clinical-use-definition-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-clinical-use-definition-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-clinical-use-definition-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-code-search-support.json b/crates/fhir/tests/data/json/R4B/codesystem-code-search-support.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-code-search-support.json rename to crates/fhir/tests/data/json/R4B/codesystem-code-search-support.json diff --git a/crates/fhir/tests/data/R4B/codesystem-codesystem-content-mode.json b/crates/fhir/tests/data/json/R4B/codesystem-codesystem-content-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-codesystem-content-mode.json rename to crates/fhir/tests/data/json/R4B/codesystem-codesystem-content-mode.json diff --git a/crates/fhir/tests/data/R4B/codesystem-codesystem-hierarchy-meaning.json b/crates/fhir/tests/data/json/R4B/codesystem-codesystem-hierarchy-meaning.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-codesystem-hierarchy-meaning.json rename to crates/fhir/tests/data/json/R4B/codesystem-codesystem-hierarchy-meaning.json diff --git a/crates/fhir/tests/data/R4B/codesystem-combined-dose-form.json b/crates/fhir/tests/data/json/R4B/codesystem-combined-dose-form.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-combined-dose-form.json rename to crates/fhir/tests/data/json/R4B/codesystem-combined-dose-form.json diff --git a/crates/fhir/tests/data/R4B/codesystem-common-tags.json b/crates/fhir/tests/data/json/R4B/codesystem-common-tags.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-common-tags.json rename to crates/fhir/tests/data/json/R4B/codesystem-common-tags.json diff --git a/crates/fhir/tests/data/R4B/codesystem-communication-category.json b/crates/fhir/tests/data/json/R4B/codesystem-communication-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-communication-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-communication-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-communication-not-done-reason.json b/crates/fhir/tests/data/json/R4B/codesystem-communication-not-done-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-communication-not-done-reason.json rename to crates/fhir/tests/data/json/R4B/codesystem-communication-not-done-reason.json diff --git a/crates/fhir/tests/data/R4B/codesystem-communication-topic.json b/crates/fhir/tests/data/json/R4B/codesystem-communication-topic.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-communication-topic.json rename to crates/fhir/tests/data/json/R4B/codesystem-communication-topic.json diff --git a/crates/fhir/tests/data/R4B/codesystem-compartment-type.json b/crates/fhir/tests/data/json/R4B/codesystem-compartment-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-compartment-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-compartment-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-composite-measure-scoring.json b/crates/fhir/tests/data/json/R4B/codesystem-composite-measure-scoring.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-composite-measure-scoring.json rename to crates/fhir/tests/data/json/R4B/codesystem-composite-measure-scoring.json diff --git a/crates/fhir/tests/data/R4B/codesystem-composition-attestation-mode.json b/crates/fhir/tests/data/json/R4B/codesystem-composition-attestation-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-composition-attestation-mode.json rename to crates/fhir/tests/data/json/R4B/codesystem-composition-attestation-mode.json diff --git a/crates/fhir/tests/data/R4B/codesystem-composition-status.json b/crates/fhir/tests/data/json/R4B/codesystem-composition-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-composition-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-composition-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-concept-map-equivalence.json b/crates/fhir/tests/data/json/R4B/codesystem-concept-map-equivalence.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-concept-map-equivalence.json rename to crates/fhir/tests/data/json/R4B/codesystem-concept-map-equivalence.json diff --git a/crates/fhir/tests/data/R4B/codesystem-concept-properties.json b/crates/fhir/tests/data/json/R4B/codesystem-concept-properties.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-concept-properties.json rename to crates/fhir/tests/data/json/R4B/codesystem-concept-properties.json diff --git a/crates/fhir/tests/data/R4B/codesystem-concept-property-type.json b/crates/fhir/tests/data/json/R4B/codesystem-concept-property-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-concept-property-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-concept-property-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-concept-subsumption-outcome.json b/crates/fhir/tests/data/json/R4B/codesystem-concept-subsumption-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-concept-subsumption-outcome.json rename to crates/fhir/tests/data/json/R4B/codesystem-concept-subsumption-outcome.json diff --git a/crates/fhir/tests/data/R4B/codesystem-conceptmap-unmapped-mode.json b/crates/fhir/tests/data/json/R4B/codesystem-conceptmap-unmapped-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-conceptmap-unmapped-mode.json rename to crates/fhir/tests/data/json/R4B/codesystem-conceptmap-unmapped-mode.json diff --git a/crates/fhir/tests/data/R4B/codesystem-condition-category.json b/crates/fhir/tests/data/json/R4B/codesystem-condition-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-condition-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-condition-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-condition-clinical.json b/crates/fhir/tests/data/json/R4B/codesystem-condition-clinical.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-condition-clinical.json rename to crates/fhir/tests/data/json/R4B/codesystem-condition-clinical.json diff --git a/crates/fhir/tests/data/R4B/codesystem-condition-ver-status.json b/crates/fhir/tests/data/json/R4B/codesystem-condition-ver-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-condition-ver-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-condition-ver-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-conditional-delete-status.json b/crates/fhir/tests/data/json/R4B/codesystem-conditional-delete-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-conditional-delete-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-conditional-delete-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-conditional-read-status.json b/crates/fhir/tests/data/json/R4B/codesystem-conditional-read-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-conditional-read-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-conditional-read-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-consent-action.json b/crates/fhir/tests/data/json/R4B/codesystem-consent-action.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-consent-action.json rename to crates/fhir/tests/data/json/R4B/codesystem-consent-action.json diff --git a/crates/fhir/tests/data/R4B/codesystem-consent-category.json b/crates/fhir/tests/data/json/R4B/codesystem-consent-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-consent-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-consent-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-consent-data-meaning.json b/crates/fhir/tests/data/json/R4B/codesystem-consent-data-meaning.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-consent-data-meaning.json rename to crates/fhir/tests/data/json/R4B/codesystem-consent-data-meaning.json diff --git a/crates/fhir/tests/data/R4B/codesystem-consent-policy.json b/crates/fhir/tests/data/json/R4B/codesystem-consent-policy.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-consent-policy.json rename to crates/fhir/tests/data/json/R4B/codesystem-consent-policy.json diff --git a/crates/fhir/tests/data/R4B/codesystem-consent-provision-type.json b/crates/fhir/tests/data/json/R4B/codesystem-consent-provision-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-consent-provision-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-consent-provision-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-consent-scope.json b/crates/fhir/tests/data/json/R4B/codesystem-consent-scope.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-consent-scope.json rename to crates/fhir/tests/data/json/R4B/codesystem-consent-scope.json diff --git a/crates/fhir/tests/data/R4B/codesystem-consent-state-codes.json b/crates/fhir/tests/data/json/R4B/codesystem-consent-state-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-consent-state-codes.json rename to crates/fhir/tests/data/json/R4B/codesystem-consent-state-codes.json diff --git a/crates/fhir/tests/data/R4B/codesystem-constraint-severity.json b/crates/fhir/tests/data/json/R4B/codesystem-constraint-severity.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-constraint-severity.json rename to crates/fhir/tests/data/json/R4B/codesystem-constraint-severity.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contact-point-system.json b/crates/fhir/tests/data/json/R4B/codesystem-contact-point-system.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contact-point-system.json rename to crates/fhir/tests/data/json/R4B/codesystem-contact-point-system.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contact-point-use.json b/crates/fhir/tests/data/json/R4B/codesystem-contact-point-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contact-point-use.json rename to crates/fhir/tests/data/json/R4B/codesystem-contact-point-use.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contactentity-type.json b/crates/fhir/tests/data/json/R4B/codesystem-contactentity-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contactentity-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-contactentity-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-container-cap.json b/crates/fhir/tests/data/json/R4B/codesystem-container-cap.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-container-cap.json rename to crates/fhir/tests/data/json/R4B/codesystem-container-cap.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-action.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-action.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-action.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-action.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-actionstatus.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-actionstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-actionstatus.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-actionstatus.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-actorrole.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-actorrole.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-actorrole.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-actorrole.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-assetcontext.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-assetcontext.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-assetcontext.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-assetcontext.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-assetscope.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-assetscope.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-assetscope.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-assetscope.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-assetsubtype.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-assetsubtype.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-assetsubtype.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-assetsubtype.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-assettype.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-assettype.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-assettype.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-assettype.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-content-derivative.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-content-derivative.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-content-derivative.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-content-derivative.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-decision-mode.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-decision-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-decision-mode.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-decision-mode.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-definition-subtype.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-definition-subtype.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-definition-subtype.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-definition-subtype.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-definition-type.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-definition-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-definition-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-definition-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-expiration-type.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-expiration-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-expiration-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-expiration-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-legalstate.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-legalstate.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-legalstate.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-legalstate.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-party-role.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-party-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-party-role.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-party-role.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-publicationstatus.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-publicationstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-publicationstatus.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-publicationstatus.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-scope.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-scope.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-scope.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-scope.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-security-category.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-security-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-security-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-security-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-security-classification.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-security-classification.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-security-classification.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-security-classification.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-security-control.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-security-control.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-security-control.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-security-control.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-signer-type.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-signer-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-signer-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-signer-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-status.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-subtype.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-subtype.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-subtype.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-subtype.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-term-subtype.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-term-subtype.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-term-subtype.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-term-subtype.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-term-type.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-term-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-term-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-term-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contract-type.json b/crates/fhir/tests/data/json/R4B/codesystem-contract-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contract-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-contract-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contributor-role.json b/crates/fhir/tests/data/json/R4B/codesystem-contributor-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contributor-role.json rename to crates/fhir/tests/data/json/R4B/codesystem-contributor-role.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contributor-summary-source.json b/crates/fhir/tests/data/json/R4B/codesystem-contributor-summary-source.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contributor-summary-source.json rename to crates/fhir/tests/data/json/R4B/codesystem-contributor-summary-source.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contributor-summary-style.json b/crates/fhir/tests/data/json/R4B/codesystem-contributor-summary-style.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contributor-summary-style.json rename to crates/fhir/tests/data/json/R4B/codesystem-contributor-summary-style.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contributor-summary-type.json b/crates/fhir/tests/data/json/R4B/codesystem-contributor-summary-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contributor-summary-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-contributor-summary-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-contributor-type.json b/crates/fhir/tests/data/json/R4B/codesystem-contributor-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-contributor-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-contributor-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-coverage-class.json b/crates/fhir/tests/data/json/R4B/codesystem-coverage-class.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-coverage-class.json rename to crates/fhir/tests/data/json/R4B/codesystem-coverage-class.json diff --git a/crates/fhir/tests/data/R4B/codesystem-coverage-copay-type.json b/crates/fhir/tests/data/json/R4B/codesystem-coverage-copay-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-coverage-copay-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-coverage-copay-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-coverage-financial-exception.json b/crates/fhir/tests/data/json/R4B/codesystem-coverage-financial-exception.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-coverage-financial-exception.json rename to crates/fhir/tests/data/json/R4B/codesystem-coverage-financial-exception.json diff --git a/crates/fhir/tests/data/R4B/codesystem-coverageeligibilityresponse-ex-auth-support.json b/crates/fhir/tests/data/json/R4B/codesystem-coverageeligibilityresponse-ex-auth-support.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-coverageeligibilityresponse-ex-auth-support.json rename to crates/fhir/tests/data/json/R4B/codesystem-coverageeligibilityresponse-ex-auth-support.json diff --git a/crates/fhir/tests/data/R4B/codesystem-data-absent-reason.json b/crates/fhir/tests/data/json/R4B/codesystem-data-absent-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-data-absent-reason.json rename to crates/fhir/tests/data/json/R4B/codesystem-data-absent-reason.json diff --git a/crates/fhir/tests/data/R4B/codesystem-data-types.json b/crates/fhir/tests/data/json/R4B/codesystem-data-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-data-types.json rename to crates/fhir/tests/data/json/R4B/codesystem-data-types.json diff --git a/crates/fhir/tests/data/R4B/codesystem-days-of-week.json b/crates/fhir/tests/data/json/R4B/codesystem-days-of-week.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-days-of-week.json rename to crates/fhir/tests/data/json/R4B/codesystem-days-of-week.json diff --git a/crates/fhir/tests/data/R4B/codesystem-definition-resource-types.json b/crates/fhir/tests/data/json/R4B/codesystem-definition-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-definition-resource-types.json rename to crates/fhir/tests/data/json/R4B/codesystem-definition-resource-types.json diff --git a/crates/fhir/tests/data/R4B/codesystem-definition-status.json b/crates/fhir/tests/data/json/R4B/codesystem-definition-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-definition-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-definition-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-definition-topic.json b/crates/fhir/tests/data/json/R4B/codesystem-definition-topic.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-definition-topic.json rename to crates/fhir/tests/data/json/R4B/codesystem-definition-topic.json diff --git a/crates/fhir/tests/data/R4B/codesystem-definition-use.json b/crates/fhir/tests/data/json/R4B/codesystem-definition-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-definition-use.json rename to crates/fhir/tests/data/json/R4B/codesystem-definition-use.json diff --git a/crates/fhir/tests/data/R4B/codesystem-detectedissue-severity.json b/crates/fhir/tests/data/json/R4B/codesystem-detectedissue-severity.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-detectedissue-severity.json rename to crates/fhir/tests/data/json/R4B/codesystem-detectedissue-severity.json diff --git a/crates/fhir/tests/data/R4B/codesystem-device-action.json b/crates/fhir/tests/data/json/R4B/codesystem-device-action.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-device-action.json rename to crates/fhir/tests/data/json/R4B/codesystem-device-action.json diff --git a/crates/fhir/tests/data/R4B/codesystem-device-nametype.json b/crates/fhir/tests/data/json/R4B/codesystem-device-nametype.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-device-nametype.json rename to crates/fhir/tests/data/json/R4B/codesystem-device-nametype.json diff --git a/crates/fhir/tests/data/R4B/codesystem-device-statement-status.json b/crates/fhir/tests/data/json/R4B/codesystem-device-statement-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-device-statement-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-device-statement-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-device-status-reason.json b/crates/fhir/tests/data/json/R4B/codesystem-device-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-device-status-reason.json rename to crates/fhir/tests/data/json/R4B/codesystem-device-status-reason.json diff --git a/crates/fhir/tests/data/R4B/codesystem-device-status.json b/crates/fhir/tests/data/json/R4B/codesystem-device-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-device-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-device-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-diagnosis-role.json b/crates/fhir/tests/data/json/R4B/codesystem-diagnosis-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-diagnosis-role.json rename to crates/fhir/tests/data/json/R4B/codesystem-diagnosis-role.json diff --git a/crates/fhir/tests/data/R4B/codesystem-diagnostic-report-status.json b/crates/fhir/tests/data/json/R4B/codesystem-diagnostic-report-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-diagnostic-report-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-diagnostic-report-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-dicom-audit-lifecycle.json b/crates/fhir/tests/data/json/R4B/codesystem-dicom-audit-lifecycle.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-dicom-audit-lifecycle.json rename to crates/fhir/tests/data/json/R4B/codesystem-dicom-audit-lifecycle.json diff --git a/crates/fhir/tests/data/R4B/codesystem-dicom-dcim.json b/crates/fhir/tests/data/json/R4B/codesystem-dicom-dcim.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-dicom-dcim.json rename to crates/fhir/tests/data/json/R4B/codesystem-dicom-dcim.json diff --git a/crates/fhir/tests/data/R4B/codesystem-directness.json b/crates/fhir/tests/data/json/R4B/codesystem-directness.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-directness.json rename to crates/fhir/tests/data/json/R4B/codesystem-directness.json diff --git a/crates/fhir/tests/data/R4B/codesystem-discriminator-type.json b/crates/fhir/tests/data/json/R4B/codesystem-discriminator-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-discriminator-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-discriminator-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-document-mode.json b/crates/fhir/tests/data/json/R4B/codesystem-document-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-document-mode.json rename to crates/fhir/tests/data/json/R4B/codesystem-document-mode.json diff --git a/crates/fhir/tests/data/R4B/codesystem-document-reference-status.json b/crates/fhir/tests/data/json/R4B/codesystem-document-reference-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-document-reference-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-document-reference-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-document-relationship-type.json b/crates/fhir/tests/data/json/R4B/codesystem-document-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-document-relationship-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-document-relationship-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-dose-rate-type.json b/crates/fhir/tests/data/json/R4B/codesystem-dose-rate-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-dose-rate-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-dose-rate-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-eligibilityrequest-purpose.json b/crates/fhir/tests/data/json/R4B/codesystem-eligibilityrequest-purpose.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-eligibilityrequest-purpose.json rename to crates/fhir/tests/data/json/R4B/codesystem-eligibilityrequest-purpose.json diff --git a/crates/fhir/tests/data/R4B/codesystem-eligibilityresponse-purpose.json b/crates/fhir/tests/data/json/R4B/codesystem-eligibilityresponse-purpose.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-eligibilityresponse-purpose.json rename to crates/fhir/tests/data/json/R4B/codesystem-eligibilityresponse-purpose.json diff --git a/crates/fhir/tests/data/R4B/codesystem-encounter-admit-source.json b/crates/fhir/tests/data/json/R4B/codesystem-encounter-admit-source.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-encounter-admit-source.json rename to crates/fhir/tests/data/json/R4B/codesystem-encounter-admit-source.json diff --git a/crates/fhir/tests/data/R4B/codesystem-encounter-diet.json b/crates/fhir/tests/data/json/R4B/codesystem-encounter-diet.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-encounter-diet.json rename to crates/fhir/tests/data/json/R4B/codesystem-encounter-diet.json diff --git a/crates/fhir/tests/data/R4B/codesystem-encounter-discharge-disposition.json b/crates/fhir/tests/data/json/R4B/codesystem-encounter-discharge-disposition.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-encounter-discharge-disposition.json rename to crates/fhir/tests/data/json/R4B/codesystem-encounter-discharge-disposition.json diff --git a/crates/fhir/tests/data/R4B/codesystem-encounter-location-status.json b/crates/fhir/tests/data/json/R4B/codesystem-encounter-location-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-encounter-location-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-encounter-location-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-encounter-participant-type.json b/crates/fhir/tests/data/json/R4B/codesystem-encounter-participant-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-encounter-participant-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-encounter-participant-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-encounter-special-arrangements.json b/crates/fhir/tests/data/json/R4B/codesystem-encounter-special-arrangements.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-encounter-special-arrangements.json rename to crates/fhir/tests/data/json/R4B/codesystem-encounter-special-arrangements.json diff --git a/crates/fhir/tests/data/R4B/codesystem-encounter-status.json b/crates/fhir/tests/data/json/R4B/codesystem-encounter-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-encounter-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-encounter-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-encounter-type.json b/crates/fhir/tests/data/json/R4B/codesystem-encounter-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-encounter-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-encounter-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-endpoint-connection-type.json b/crates/fhir/tests/data/json/R4B/codesystem-endpoint-connection-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-endpoint-connection-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-endpoint-connection-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-endpoint-payload-type.json b/crates/fhir/tests/data/json/R4B/codesystem-endpoint-payload-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-endpoint-payload-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-endpoint-payload-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-endpoint-status.json b/crates/fhir/tests/data/json/R4B/codesystem-endpoint-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-endpoint-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-endpoint-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-entformula-additive.json b/crates/fhir/tests/data/json/R4B/codesystem-entformula-additive.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-entformula-additive.json rename to crates/fhir/tests/data/json/R4B/codesystem-entformula-additive.json diff --git a/crates/fhir/tests/data/R4B/codesystem-episode-of-care-status.json b/crates/fhir/tests/data/json/R4B/codesystem-episode-of-care-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-episode-of-care-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-episode-of-care-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-episodeofcare-type.json b/crates/fhir/tests/data/json/R4B/codesystem-episodeofcare-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-episodeofcare-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-episodeofcare-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-event-capability-mode.json b/crates/fhir/tests/data/json/R4B/codesystem-event-capability-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-event-capability-mode.json rename to crates/fhir/tests/data/json/R4B/codesystem-event-capability-mode.json diff --git a/crates/fhir/tests/data/R4B/codesystem-event-resource-types.json b/crates/fhir/tests/data/json/R4B/codesystem-event-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-event-resource-types.json rename to crates/fhir/tests/data/json/R4B/codesystem-event-resource-types.json diff --git a/crates/fhir/tests/data/R4B/codesystem-event-status.json b/crates/fhir/tests/data/json/R4B/codesystem-event-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-event-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-event-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-event-timing.json b/crates/fhir/tests/data/json/R4B/codesystem-event-timing.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-event-timing.json rename to crates/fhir/tests/data/json/R4B/codesystem-event-timing.json diff --git a/crates/fhir/tests/data/R4B/codesystem-evidence-classifier-code.json b/crates/fhir/tests/data/json/R4B/codesystem-evidence-classifier-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-evidence-classifier-code.json rename to crates/fhir/tests/data/json/R4B/codesystem-evidence-classifier-code.json diff --git a/crates/fhir/tests/data/R4B/codesystem-evidence-quality.json b/crates/fhir/tests/data/json/R4B/codesystem-evidence-quality.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-evidence-quality.json rename to crates/fhir/tests/data/json/R4B/codesystem-evidence-quality.json diff --git a/crates/fhir/tests/data/R4B/codesystem-evidence-report-section.json b/crates/fhir/tests/data/json/R4B/codesystem-evidence-report-section.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-evidence-report-section.json rename to crates/fhir/tests/data/json/R4B/codesystem-evidence-report-section.json diff --git a/crates/fhir/tests/data/R4B/codesystem-evidence-report-type.json b/crates/fhir/tests/data/json/R4B/codesystem-evidence-report-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-evidence-report-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-evidence-report-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-ex-benefitcategory.json b/crates/fhir/tests/data/json/R4B/codesystem-ex-benefitcategory.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-ex-benefitcategory.json rename to crates/fhir/tests/data/json/R4B/codesystem-ex-benefitcategory.json diff --git a/crates/fhir/tests/data/R4B/codesystem-ex-diagnosis-on-admission.json b/crates/fhir/tests/data/json/R4B/codesystem-ex-diagnosis-on-admission.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-ex-diagnosis-on-admission.json rename to crates/fhir/tests/data/json/R4B/codesystem-ex-diagnosis-on-admission.json diff --git a/crates/fhir/tests/data/R4B/codesystem-ex-diagnosisrelatedgroup.json b/crates/fhir/tests/data/json/R4B/codesystem-ex-diagnosisrelatedgroup.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-ex-diagnosisrelatedgroup.json rename to crates/fhir/tests/data/json/R4B/codesystem-ex-diagnosisrelatedgroup.json diff --git a/crates/fhir/tests/data/R4B/codesystem-ex-diagnosistype.json b/crates/fhir/tests/data/json/R4B/codesystem-ex-diagnosistype.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-ex-diagnosistype.json rename to crates/fhir/tests/data/json/R4B/codesystem-ex-diagnosistype.json diff --git a/crates/fhir/tests/data/R4B/codesystem-ex-paymenttype.json b/crates/fhir/tests/data/json/R4B/codesystem-ex-paymenttype.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-ex-paymenttype.json rename to crates/fhir/tests/data/json/R4B/codesystem-ex-paymenttype.json diff --git a/crates/fhir/tests/data/R4B/codesystem-ex-procedure-type.json b/crates/fhir/tests/data/json/R4B/codesystem-ex-procedure-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-ex-procedure-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-ex-procedure-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-ex-program-code.json b/crates/fhir/tests/data/json/R4B/codesystem-ex-program-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-ex-program-code.json rename to crates/fhir/tests/data/json/R4B/codesystem-ex-program-code.json diff --git a/crates/fhir/tests/data/R4B/codesystem-ex-revenue-center.json b/crates/fhir/tests/data/json/R4B/codesystem-ex-revenue-center.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-ex-revenue-center.json rename to crates/fhir/tests/data/json/R4B/codesystem-ex-revenue-center.json diff --git a/crates/fhir/tests/data/R4B/codesystem-example-summary.json b/crates/fhir/tests/data/json/R4B/codesystem-example-summary.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-example-summary.json rename to crates/fhir/tests/data/json/R4B/codesystem-example-summary.json diff --git a/crates/fhir/tests/data/R4B/codesystem-example-supplement.json b/crates/fhir/tests/data/json/R4B/codesystem-example-supplement.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-example-supplement.json rename to crates/fhir/tests/data/json/R4B/codesystem-example-supplement.json diff --git a/crates/fhir/tests/data/R4B/codesystem-example.json b/crates/fhir/tests/data/json/R4B/codesystem-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-example.json rename to crates/fhir/tests/data/json/R4B/codesystem-example.json diff --git a/crates/fhir/tests/data/R4B/codesystem-examplescenario-actor-type.json b/crates/fhir/tests/data/json/R4B/codesystem-examplescenario-actor-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-examplescenario-actor-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-examplescenario-actor-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-explanationofbenefit-status.json b/crates/fhir/tests/data/json/R4B/codesystem-explanationofbenefit-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-explanationofbenefit-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-explanationofbenefit-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-expression-language.json b/crates/fhir/tests/data/json/R4B/codesystem-expression-language.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-expression-language.json rename to crates/fhir/tests/data/json/R4B/codesystem-expression-language.json diff --git a/crates/fhir/tests/data/R4B/codesystem-extension-context-type.json b/crates/fhir/tests/data/json/R4B/codesystem-extension-context-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-extension-context-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-extension-context-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-extensions-CodeSystem-author.json b/crates/fhir/tests/data/json/R4B/codesystem-extensions-CodeSystem-author.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-extensions-CodeSystem-author.json rename to crates/fhir/tests/data/json/R4B/codesystem-extensions-CodeSystem-author.json diff --git a/crates/fhir/tests/data/R4B/codesystem-extensions-CodeSystem-effective.json b/crates/fhir/tests/data/json/R4B/codesystem-extensions-CodeSystem-effective.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-extensions-CodeSystem-effective.json rename to crates/fhir/tests/data/json/R4B/codesystem-extensions-CodeSystem-effective.json diff --git a/crates/fhir/tests/data/R4B/codesystem-extensions-CodeSystem-end.json b/crates/fhir/tests/data/json/R4B/codesystem-extensions-CodeSystem-end.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-extensions-CodeSystem-end.json rename to crates/fhir/tests/data/json/R4B/codesystem-extensions-CodeSystem-end.json diff --git a/crates/fhir/tests/data/R4B/codesystem-extensions-CodeSystem-keyword.json b/crates/fhir/tests/data/json/R4B/codesystem-extensions-CodeSystem-keyword.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-extensions-CodeSystem-keyword.json rename to crates/fhir/tests/data/json/R4B/codesystem-extensions-CodeSystem-keyword.json diff --git a/crates/fhir/tests/data/R4B/codesystem-extensions-CodeSystem-workflow.json b/crates/fhir/tests/data/json/R4B/codesystem-extensions-CodeSystem-workflow.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-extensions-CodeSystem-workflow.json rename to crates/fhir/tests/data/json/R4B/codesystem-extensions-CodeSystem-workflow.json diff --git a/crates/fhir/tests/data/R4B/codesystem-extra-activity-type.json b/crates/fhir/tests/data/json/R4B/codesystem-extra-activity-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-extra-activity-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-extra-activity-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-extra-security-role-type.json b/crates/fhir/tests/data/json/R4B/codesystem-extra-security-role-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-extra-security-role-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-extra-security-role-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-feeding-device.json b/crates/fhir/tests/data/json/R4B/codesystem-feeding-device.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-feeding-device.json rename to crates/fhir/tests/data/json/R4B/codesystem-feeding-device.json diff --git a/crates/fhir/tests/data/R4B/codesystem-fhirpath-types.json b/crates/fhir/tests/data/json/R4B/codesystem-fhirpath-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-fhirpath-types.json rename to crates/fhir/tests/data/json/R4B/codesystem-fhirpath-types.json diff --git a/crates/fhir/tests/data/R4B/codesystem-filter-operator.json b/crates/fhir/tests/data/json/R4B/codesystem-filter-operator.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-filter-operator.json rename to crates/fhir/tests/data/json/R4B/codesystem-filter-operator.json diff --git a/crates/fhir/tests/data/R4B/codesystem-flag-category.json b/crates/fhir/tests/data/json/R4B/codesystem-flag-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-flag-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-flag-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-flag-priority.json b/crates/fhir/tests/data/json/R4B/codesystem-flag-priority.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-flag-priority.json rename to crates/fhir/tests/data/json/R4B/codesystem-flag-priority.json diff --git a/crates/fhir/tests/data/R4B/codesystem-flag-status.json b/crates/fhir/tests/data/json/R4B/codesystem-flag-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-flag-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-flag-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-fm-status.json b/crates/fhir/tests/data/json/R4B/codesystem-fm-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-fm-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-fm-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-focus-characteristic-code.json b/crates/fhir/tests/data/json/R4B/codesystem-focus-characteristic-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-focus-characteristic-code.json rename to crates/fhir/tests/data/json/R4B/codesystem-focus-characteristic-code.json diff --git a/crates/fhir/tests/data/R4B/codesystem-forms.json b/crates/fhir/tests/data/json/R4B/codesystem-forms.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-forms.json rename to crates/fhir/tests/data/json/R4B/codesystem-forms.json diff --git a/crates/fhir/tests/data/R4B/codesystem-fundsreserve.json b/crates/fhir/tests/data/json/R4B/codesystem-fundsreserve.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-fundsreserve.json rename to crates/fhir/tests/data/json/R4B/codesystem-fundsreserve.json diff --git a/crates/fhir/tests/data/R4B/codesystem-gender-identity.json b/crates/fhir/tests/data/json/R4B/codesystem-gender-identity.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-gender-identity.json rename to crates/fhir/tests/data/json/R4B/codesystem-gender-identity.json diff --git a/crates/fhir/tests/data/R4B/codesystem-goal-achievement.json b/crates/fhir/tests/data/json/R4B/codesystem-goal-achievement.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-goal-achievement.json rename to crates/fhir/tests/data/json/R4B/codesystem-goal-achievement.json diff --git a/crates/fhir/tests/data/R4B/codesystem-goal-category.json b/crates/fhir/tests/data/json/R4B/codesystem-goal-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-goal-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-goal-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-goal-priority.json b/crates/fhir/tests/data/json/R4B/codesystem-goal-priority.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-goal-priority.json rename to crates/fhir/tests/data/json/R4B/codesystem-goal-priority.json diff --git a/crates/fhir/tests/data/R4B/codesystem-goal-status.json b/crates/fhir/tests/data/json/R4B/codesystem-goal-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-goal-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-goal-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-graph-compartment-rule.json b/crates/fhir/tests/data/json/R4B/codesystem-graph-compartment-rule.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-graph-compartment-rule.json rename to crates/fhir/tests/data/json/R4B/codesystem-graph-compartment-rule.json diff --git a/crates/fhir/tests/data/R4B/codesystem-graph-compartment-use.json b/crates/fhir/tests/data/json/R4B/codesystem-graph-compartment-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-graph-compartment-use.json rename to crates/fhir/tests/data/json/R4B/codesystem-graph-compartment-use.json diff --git a/crates/fhir/tests/data/R4B/codesystem-group-measure.json b/crates/fhir/tests/data/json/R4B/codesystem-group-measure.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-group-measure.json rename to crates/fhir/tests/data/json/R4B/codesystem-group-measure.json diff --git a/crates/fhir/tests/data/R4B/codesystem-group-type.json b/crates/fhir/tests/data/json/R4B/codesystem-group-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-group-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-group-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-guidance-response-status.json b/crates/fhir/tests/data/json/R4B/codesystem-guidance-response-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-guidance-response-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-guidance-response-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-guide-page-generation.json b/crates/fhir/tests/data/json/R4B/codesystem-guide-page-generation.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-guide-page-generation.json rename to crates/fhir/tests/data/json/R4B/codesystem-guide-page-generation.json diff --git a/crates/fhir/tests/data/R4B/codesystem-guide-parameter-code.json b/crates/fhir/tests/data/json/R4B/codesystem-guide-parameter-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-guide-parameter-code.json rename to crates/fhir/tests/data/json/R4B/codesystem-guide-parameter-code.json diff --git a/crates/fhir/tests/data/R4B/codesystem-handling-condition.json b/crates/fhir/tests/data/json/R4B/codesystem-handling-condition.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-handling-condition.json rename to crates/fhir/tests/data/json/R4B/codesystem-handling-condition.json diff --git a/crates/fhir/tests/data/R4B/codesystem-history-absent-reason.json b/crates/fhir/tests/data/json/R4B/codesystem-history-absent-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-history-absent-reason.json rename to crates/fhir/tests/data/json/R4B/codesystem-history-absent-reason.json diff --git a/crates/fhir/tests/data/R4B/codesystem-history-status.json b/crates/fhir/tests/data/json/R4B/codesystem-history-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-history-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-history-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-http-operations.json b/crates/fhir/tests/data/json/R4B/codesystem-http-operations.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-http-operations.json rename to crates/fhir/tests/data/json/R4B/codesystem-http-operations.json diff --git a/crates/fhir/tests/data/R4B/codesystem-http-verb.json b/crates/fhir/tests/data/json/R4B/codesystem-http-verb.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-http-verb.json rename to crates/fhir/tests/data/json/R4B/codesystem-http-verb.json diff --git a/crates/fhir/tests/data/R4B/codesystem-icd-10-procedures.json b/crates/fhir/tests/data/json/R4B/codesystem-icd-10-procedures.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-icd-10-procedures.json rename to crates/fhir/tests/data/json/R4B/codesystem-icd-10-procedures.json diff --git a/crates/fhir/tests/data/R4B/codesystem-identifier-use.json b/crates/fhir/tests/data/json/R4B/codesystem-identifier-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-identifier-use.json rename to crates/fhir/tests/data/json/R4B/codesystem-identifier-use.json diff --git a/crates/fhir/tests/data/R4B/codesystem-identity-assuranceLevel.json b/crates/fhir/tests/data/json/R4B/codesystem-identity-assuranceLevel.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-identity-assuranceLevel.json rename to crates/fhir/tests/data/json/R4B/codesystem-identity-assuranceLevel.json diff --git a/crates/fhir/tests/data/R4B/codesystem-imagingstudy-status.json b/crates/fhir/tests/data/json/R4B/codesystem-imagingstudy-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-imagingstudy-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-imagingstudy-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-immunization-evaluation-dose-status-reason.json b/crates/fhir/tests/data/json/R4B/codesystem-immunization-evaluation-dose-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-immunization-evaluation-dose-status-reason.json rename to crates/fhir/tests/data/json/R4B/codesystem-immunization-evaluation-dose-status-reason.json diff --git a/crates/fhir/tests/data/R4B/codesystem-immunization-evaluation-dose-status.json b/crates/fhir/tests/data/json/R4B/codesystem-immunization-evaluation-dose-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-immunization-evaluation-dose-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-immunization-evaluation-dose-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-immunization-funding-source.json b/crates/fhir/tests/data/json/R4B/codesystem-immunization-funding-source.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-immunization-funding-source.json rename to crates/fhir/tests/data/json/R4B/codesystem-immunization-funding-source.json diff --git a/crates/fhir/tests/data/R4B/codesystem-immunization-origin.json b/crates/fhir/tests/data/json/R4B/codesystem-immunization-origin.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-immunization-origin.json rename to crates/fhir/tests/data/json/R4B/codesystem-immunization-origin.json diff --git a/crates/fhir/tests/data/R4B/codesystem-immunization-program-eligibility.json b/crates/fhir/tests/data/json/R4B/codesystem-immunization-program-eligibility.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-immunization-program-eligibility.json rename to crates/fhir/tests/data/json/R4B/codesystem-immunization-program-eligibility.json diff --git a/crates/fhir/tests/data/R4B/codesystem-immunization-recommendation-status.json b/crates/fhir/tests/data/json/R4B/codesystem-immunization-recommendation-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-immunization-recommendation-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-immunization-recommendation-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-immunization-subpotent-reason.json b/crates/fhir/tests/data/json/R4B/codesystem-immunization-subpotent-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-immunization-subpotent-reason.json rename to crates/fhir/tests/data/json/R4B/codesystem-immunization-subpotent-reason.json diff --git a/crates/fhir/tests/data/R4B/codesystem-ingredient-function.json b/crates/fhir/tests/data/json/R4B/codesystem-ingredient-function.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-ingredient-function.json rename to crates/fhir/tests/data/json/R4B/codesystem-ingredient-function.json diff --git a/crates/fhir/tests/data/R4B/codesystem-ingredient-manufacturer-role.json b/crates/fhir/tests/data/json/R4B/codesystem-ingredient-manufacturer-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-ingredient-manufacturer-role.json rename to crates/fhir/tests/data/json/R4B/codesystem-ingredient-manufacturer-role.json diff --git a/crates/fhir/tests/data/R4B/codesystem-ingredient-role.json b/crates/fhir/tests/data/json/R4B/codesystem-ingredient-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-ingredient-role.json rename to crates/fhir/tests/data/json/R4B/codesystem-ingredient-role.json diff --git a/crates/fhir/tests/data/R4B/codesystem-insuranceplan-applicability.json b/crates/fhir/tests/data/json/R4B/codesystem-insuranceplan-applicability.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-insuranceplan-applicability.json rename to crates/fhir/tests/data/json/R4B/codesystem-insuranceplan-applicability.json diff --git a/crates/fhir/tests/data/R4B/codesystem-insuranceplan-type.json b/crates/fhir/tests/data/json/R4B/codesystem-insuranceplan-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-insuranceplan-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-insuranceplan-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-interaction-incidence.json b/crates/fhir/tests/data/json/R4B/codesystem-interaction-incidence.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-interaction-incidence.json rename to crates/fhir/tests/data/json/R4B/codesystem-interaction-incidence.json diff --git a/crates/fhir/tests/data/R4B/codesystem-interaction-type.json b/crates/fhir/tests/data/json/R4B/codesystem-interaction-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-interaction-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-interaction-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-invoice-priceComponentType.json b/crates/fhir/tests/data/json/R4B/codesystem-invoice-priceComponentType.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-invoice-priceComponentType.json rename to crates/fhir/tests/data/json/R4B/codesystem-invoice-priceComponentType.json diff --git a/crates/fhir/tests/data/R4B/codesystem-invoice-status.json b/crates/fhir/tests/data/json/R4B/codesystem-invoice-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-invoice-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-invoice-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-iso-21089-lifecycle.json b/crates/fhir/tests/data/json/R4B/codesystem-iso-21089-lifecycle.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-iso-21089-lifecycle.json rename to crates/fhir/tests/data/json/R4B/codesystem-iso-21089-lifecycle.json diff --git a/crates/fhir/tests/data/R4B/codesystem-issue-severity.json b/crates/fhir/tests/data/json/R4B/codesystem-issue-severity.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-issue-severity.json rename to crates/fhir/tests/data/json/R4B/codesystem-issue-severity.json diff --git a/crates/fhir/tests/data/R4B/codesystem-issue-type.json b/crates/fhir/tests/data/json/R4B/codesystem-issue-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-issue-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-issue-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-item-type.json b/crates/fhir/tests/data/json/R4B/codesystem-item-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-item-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-item-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-knowledge-resource-types.json b/crates/fhir/tests/data/json/R4B/codesystem-knowledge-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-knowledge-resource-types.json rename to crates/fhir/tests/data/json/R4B/codesystem-knowledge-resource-types.json diff --git a/crates/fhir/tests/data/R4B/codesystem-language-preference-type.json b/crates/fhir/tests/data/json/R4B/codesystem-language-preference-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-language-preference-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-language-preference-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-legal-status-of-supply.json b/crates/fhir/tests/data/json/R4B/codesystem-legal-status-of-supply.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-legal-status-of-supply.json rename to crates/fhir/tests/data/json/R4B/codesystem-legal-status-of-supply.json diff --git a/crates/fhir/tests/data/R4B/codesystem-library-type.json b/crates/fhir/tests/data/json/R4B/codesystem-library-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-library-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-library-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-link-type.json b/crates/fhir/tests/data/json/R4B/codesystem-link-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-link-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-link-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-linkage-type.json b/crates/fhir/tests/data/json/R4B/codesystem-linkage-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-linkage-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-linkage-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-list-empty-reason.json b/crates/fhir/tests/data/json/R4B/codesystem-list-empty-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-list-empty-reason.json rename to crates/fhir/tests/data/json/R4B/codesystem-list-empty-reason.json diff --git a/crates/fhir/tests/data/R4B/codesystem-list-example-codes.json b/crates/fhir/tests/data/json/R4B/codesystem-list-example-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-list-example-codes.json rename to crates/fhir/tests/data/json/R4B/codesystem-list-example-codes.json diff --git a/crates/fhir/tests/data/R4B/codesystem-list-item-flag.json b/crates/fhir/tests/data/json/R4B/codesystem-list-item-flag.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-list-item-flag.json rename to crates/fhir/tests/data/json/R4B/codesystem-list-item-flag.json diff --git a/crates/fhir/tests/data/R4B/codesystem-list-mode.json b/crates/fhir/tests/data/json/R4B/codesystem-list-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-list-mode.json rename to crates/fhir/tests/data/json/R4B/codesystem-list-mode.json diff --git a/crates/fhir/tests/data/R4B/codesystem-list-order.json b/crates/fhir/tests/data/json/R4B/codesystem-list-order.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-list-order.json rename to crates/fhir/tests/data/json/R4B/codesystem-list-order.json diff --git a/crates/fhir/tests/data/R4B/codesystem-list-status.json b/crates/fhir/tests/data/json/R4B/codesystem-list-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-list-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-list-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-location-mode.json b/crates/fhir/tests/data/json/R4B/codesystem-location-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-location-mode.json rename to crates/fhir/tests/data/json/R4B/codesystem-location-mode.json diff --git a/crates/fhir/tests/data/R4B/codesystem-location-physical-type.json b/crates/fhir/tests/data/json/R4B/codesystem-location-physical-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-location-physical-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-location-physical-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-location-status.json b/crates/fhir/tests/data/json/R4B/codesystem-location-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-location-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-location-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-manufactured-dose-form.json b/crates/fhir/tests/data/json/R4B/codesystem-manufactured-dose-form.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-manufactured-dose-form.json rename to crates/fhir/tests/data/json/R4B/codesystem-manufactured-dose-form.json diff --git a/crates/fhir/tests/data/R4B/codesystem-map-context-type.json b/crates/fhir/tests/data/json/R4B/codesystem-map-context-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-map-context-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-map-context-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-map-group-type-mode.json b/crates/fhir/tests/data/json/R4B/codesystem-map-group-type-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-map-group-type-mode.json rename to crates/fhir/tests/data/json/R4B/codesystem-map-group-type-mode.json diff --git a/crates/fhir/tests/data/R4B/codesystem-map-input-mode.json b/crates/fhir/tests/data/json/R4B/codesystem-map-input-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-map-input-mode.json rename to crates/fhir/tests/data/json/R4B/codesystem-map-input-mode.json diff --git a/crates/fhir/tests/data/R4B/codesystem-map-model-mode.json b/crates/fhir/tests/data/json/R4B/codesystem-map-model-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-map-model-mode.json rename to crates/fhir/tests/data/json/R4B/codesystem-map-model-mode.json diff --git a/crates/fhir/tests/data/R4B/codesystem-map-source-list-mode.json b/crates/fhir/tests/data/json/R4B/codesystem-map-source-list-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-map-source-list-mode.json rename to crates/fhir/tests/data/json/R4B/codesystem-map-source-list-mode.json diff --git a/crates/fhir/tests/data/R4B/codesystem-map-target-list-mode.json b/crates/fhir/tests/data/json/R4B/codesystem-map-target-list-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-map-target-list-mode.json rename to crates/fhir/tests/data/json/R4B/codesystem-map-target-list-mode.json diff --git a/crates/fhir/tests/data/R4B/codesystem-map-transform.json b/crates/fhir/tests/data/json/R4B/codesystem-map-transform.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-map-transform.json rename to crates/fhir/tests/data/json/R4B/codesystem-map-transform.json diff --git a/crates/fhir/tests/data/R4B/codesystem-measure-data-usage.json b/crates/fhir/tests/data/json/R4B/codesystem-measure-data-usage.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-measure-data-usage.json rename to crates/fhir/tests/data/json/R4B/codesystem-measure-data-usage.json diff --git a/crates/fhir/tests/data/R4B/codesystem-measure-group-example.json b/crates/fhir/tests/data/json/R4B/codesystem-measure-group-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-measure-group-example.json rename to crates/fhir/tests/data/json/R4B/codesystem-measure-group-example.json diff --git a/crates/fhir/tests/data/R4B/codesystem-measure-improvement-notation.json b/crates/fhir/tests/data/json/R4B/codesystem-measure-improvement-notation.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-measure-improvement-notation.json rename to crates/fhir/tests/data/json/R4B/codesystem-measure-improvement-notation.json diff --git a/crates/fhir/tests/data/R4B/codesystem-measure-population.json b/crates/fhir/tests/data/json/R4B/codesystem-measure-population.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-measure-population.json rename to crates/fhir/tests/data/json/R4B/codesystem-measure-population.json diff --git a/crates/fhir/tests/data/R4B/codesystem-measure-report-status.json b/crates/fhir/tests/data/json/R4B/codesystem-measure-report-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-measure-report-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-measure-report-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-measure-report-type.json b/crates/fhir/tests/data/json/R4B/codesystem-measure-report-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-measure-report-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-measure-report-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-measure-scoring.json b/crates/fhir/tests/data/json/R4B/codesystem-measure-scoring.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-measure-scoring.json rename to crates/fhir/tests/data/json/R4B/codesystem-measure-scoring.json diff --git a/crates/fhir/tests/data/R4B/codesystem-measure-stratifier-example.json b/crates/fhir/tests/data/json/R4B/codesystem-measure-stratifier-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-measure-stratifier-example.json rename to crates/fhir/tests/data/json/R4B/codesystem-measure-stratifier-example.json diff --git a/crates/fhir/tests/data/R4B/codesystem-measure-supplemental-data-example.json b/crates/fhir/tests/data/json/R4B/codesystem-measure-supplemental-data-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-measure-supplemental-data-example.json rename to crates/fhir/tests/data/json/R4B/codesystem-measure-supplemental-data-example.json diff --git a/crates/fhir/tests/data/R4B/codesystem-measure-type.json b/crates/fhir/tests/data/json/R4B/codesystem-measure-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-measure-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-measure-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-measurereport-stratifier-value-example.json b/crates/fhir/tests/data/json/R4B/codesystem-measurereport-stratifier-value-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-measurereport-stratifier-value-example.json rename to crates/fhir/tests/data/json/R4B/codesystem-measurereport-stratifier-value-example.json diff --git a/crates/fhir/tests/data/R4B/codesystem-med-admin-perform-function.json b/crates/fhir/tests/data/json/R4B/codesystem-med-admin-perform-function.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-med-admin-perform-function.json rename to crates/fhir/tests/data/json/R4B/codesystem-med-admin-perform-function.json diff --git a/crates/fhir/tests/data/R4B/codesystem-media-modality.json b/crates/fhir/tests/data/json/R4B/codesystem-media-modality.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-media-modality.json rename to crates/fhir/tests/data/json/R4B/codesystem-media-modality.json diff --git a/crates/fhir/tests/data/R4B/codesystem-media-type.json b/crates/fhir/tests/data/json/R4B/codesystem-media-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-media-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-media-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medication-admin-category.json b/crates/fhir/tests/data/json/R4B/codesystem-medication-admin-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medication-admin-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-medication-admin-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medication-admin-status.json b/crates/fhir/tests/data/json/R4B/codesystem-medication-admin-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medication-admin-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-medication-admin-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medication-statement-category.json b/crates/fhir/tests/data/json/R4B/codesystem-medication-statement-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medication-statement-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-medication-statement-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medication-statement-status.json b/crates/fhir/tests/data/json/R4B/codesystem-medication-statement-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medication-statement-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-medication-statement-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medication-status.json b/crates/fhir/tests/data/json/R4B/codesystem-medication-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medication-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-medication-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicationdispense-category.json b/crates/fhir/tests/data/json/R4B/codesystem-medicationdispense-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicationdispense-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicationdispense-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicationdispense-performer-function.json b/crates/fhir/tests/data/json/R4B/codesystem-medicationdispense-performer-function.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicationdispense-performer-function.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicationdispense-performer-function.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicationdispense-status-reason.json b/crates/fhir/tests/data/json/R4B/codesystem-medicationdispense-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicationdispense-status-reason.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicationdispense-status-reason.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicationdispense-status.json b/crates/fhir/tests/data/json/R4B/codesystem-medicationdispense-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicationdispense-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicationdispense-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicationknowledge-characteristic.json b/crates/fhir/tests/data/json/R4B/codesystem-medicationknowledge-characteristic.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicationknowledge-characteristic.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicationknowledge-characteristic.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicationknowledge-package-type.json b/crates/fhir/tests/data/json/R4B/codesystem-medicationknowledge-package-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicationknowledge-package-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicationknowledge-package-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicationknowledge-status.json b/crates/fhir/tests/data/json/R4B/codesystem-medicationknowledge-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicationknowledge-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicationknowledge-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicationrequest-category.json b/crates/fhir/tests/data/json/R4B/codesystem-medicationrequest-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicationrequest-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicationrequest-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicationrequest-course-of-therapy.json b/crates/fhir/tests/data/json/R4B/codesystem-medicationrequest-course-of-therapy.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicationrequest-course-of-therapy.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicationrequest-course-of-therapy.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicationrequest-intent.json b/crates/fhir/tests/data/json/R4B/codesystem-medicationrequest-intent.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicationrequest-intent.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicationrequest-intent.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicationrequest-status-reason.json b/crates/fhir/tests/data/json/R4B/codesystem-medicationrequest-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicationrequest-status-reason.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicationrequest-status-reason.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicationrequest-status.json b/crates/fhir/tests/data/json/R4B/codesystem-medicationrequest-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicationrequest-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicationrequest-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicinal-product-additional-monitoring.json b/crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-additional-monitoring.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicinal-product-additional-monitoring.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-additional-monitoring.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicinal-product-confidentiality.json b/crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-confidentiality.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicinal-product-confidentiality.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-confidentiality.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicinal-product-contact-type.json b/crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-contact-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicinal-product-contact-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-contact-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicinal-product-cross-reference-type.json b/crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-cross-reference-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicinal-product-cross-reference-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-cross-reference-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicinal-product-domain.json b/crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-domain.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicinal-product-domain.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-domain.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicinal-product-name-part-type.json b/crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-name-part-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicinal-product-name-part-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-name-part-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicinal-product-name-type.json b/crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-name-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicinal-product-name-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-name-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicinal-product-package-type.json b/crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-package-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicinal-product-package-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-package-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicinal-product-pediatric-use.json b/crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-pediatric-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicinal-product-pediatric-use.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-pediatric-use.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicinal-product-special-measures.json b/crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-special-measures.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicinal-product-special-measures.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-special-measures.json diff --git a/crates/fhir/tests/data/R4B/codesystem-medicinal-product-type.json b/crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-medicinal-product-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-medicinal-product-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-message-events.json b/crates/fhir/tests/data/json/R4B/codesystem-message-events.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-message-events.json rename to crates/fhir/tests/data/json/R4B/codesystem-message-events.json diff --git a/crates/fhir/tests/data/R4B/codesystem-message-reason-encounter.json b/crates/fhir/tests/data/json/R4B/codesystem-message-reason-encounter.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-message-reason-encounter.json rename to crates/fhir/tests/data/json/R4B/codesystem-message-reason-encounter.json diff --git a/crates/fhir/tests/data/R4B/codesystem-message-significance-category.json b/crates/fhir/tests/data/json/R4B/codesystem-message-significance-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-message-significance-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-message-significance-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-message-transport.json b/crates/fhir/tests/data/json/R4B/codesystem-message-transport.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-message-transport.json rename to crates/fhir/tests/data/json/R4B/codesystem-message-transport.json diff --git a/crates/fhir/tests/data/R4B/codesystem-messageheader-response-request.json b/crates/fhir/tests/data/json/R4B/codesystem-messageheader-response-request.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-messageheader-response-request.json rename to crates/fhir/tests/data/json/R4B/codesystem-messageheader-response-request.json diff --git a/crates/fhir/tests/data/R4B/codesystem-metric-calibration-state.json b/crates/fhir/tests/data/json/R4B/codesystem-metric-calibration-state.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-metric-calibration-state.json rename to crates/fhir/tests/data/json/R4B/codesystem-metric-calibration-state.json diff --git a/crates/fhir/tests/data/R4B/codesystem-metric-calibration-type.json b/crates/fhir/tests/data/json/R4B/codesystem-metric-calibration-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-metric-calibration-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-metric-calibration-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-metric-category.json b/crates/fhir/tests/data/json/R4B/codesystem-metric-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-metric-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-metric-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-metric-color.json b/crates/fhir/tests/data/json/R4B/codesystem-metric-color.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-metric-color.json rename to crates/fhir/tests/data/json/R4B/codesystem-metric-color.json diff --git a/crates/fhir/tests/data/R4B/codesystem-metric-operational-status.json b/crates/fhir/tests/data/json/R4B/codesystem-metric-operational-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-metric-operational-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-metric-operational-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-missing-tooth-reason.json b/crates/fhir/tests/data/json/R4B/codesystem-missing-tooth-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-missing-tooth-reason.json rename to crates/fhir/tests/data/json/R4B/codesystem-missing-tooth-reason.json diff --git a/crates/fhir/tests/data/R4B/codesystem-name-assembly-order.json b/crates/fhir/tests/data/json/R4B/codesystem-name-assembly-order.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-name-assembly-order.json rename to crates/fhir/tests/data/json/R4B/codesystem-name-assembly-order.json diff --git a/crates/fhir/tests/data/R4B/codesystem-name-use.json b/crates/fhir/tests/data/json/R4B/codesystem-name-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-name-use.json rename to crates/fhir/tests/data/json/R4B/codesystem-name-use.json diff --git a/crates/fhir/tests/data/R4B/codesystem-namingsystem-identifier-type.json b/crates/fhir/tests/data/json/R4B/codesystem-namingsystem-identifier-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-namingsystem-identifier-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-namingsystem-identifier-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-namingsystem-type.json b/crates/fhir/tests/data/json/R4B/codesystem-namingsystem-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-namingsystem-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-namingsystem-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-narrative-status.json b/crates/fhir/tests/data/json/R4B/codesystem-narrative-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-narrative-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-narrative-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-network-type.json b/crates/fhir/tests/data/json/R4B/codesystem-network-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-network-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-network-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-nhin-purposeofuse.json b/crates/fhir/tests/data/json/R4B/codesystem-nhin-purposeofuse.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-nhin-purposeofuse.json rename to crates/fhir/tests/data/json/R4B/codesystem-nhin-purposeofuse.json diff --git a/crates/fhir/tests/data/R4B/codesystem-note-type.json b/crates/fhir/tests/data/json/R4B/codesystem-note-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-note-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-note-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-nutritionproduct-status.json b/crates/fhir/tests/data/json/R4B/codesystem-nutritionproduct-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-nutritionproduct-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-nutritionproduct-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-object-role.json b/crates/fhir/tests/data/json/R4B/codesystem-object-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-object-role.json rename to crates/fhir/tests/data/json/R4B/codesystem-object-role.json diff --git a/crates/fhir/tests/data/R4B/codesystem-observation-category.json b/crates/fhir/tests/data/json/R4B/codesystem-observation-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-observation-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-observation-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-observation-range-category.json b/crates/fhir/tests/data/json/R4B/codesystem-observation-range-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-observation-range-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-observation-range-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-observation-statistics.json b/crates/fhir/tests/data/json/R4B/codesystem-observation-statistics.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-observation-statistics.json rename to crates/fhir/tests/data/json/R4B/codesystem-observation-statistics.json diff --git a/crates/fhir/tests/data/R4B/codesystem-observation-status.json b/crates/fhir/tests/data/json/R4B/codesystem-observation-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-observation-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-observation-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-operation-kind.json b/crates/fhir/tests/data/json/R4B/codesystem-operation-kind.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-operation-kind.json rename to crates/fhir/tests/data/json/R4B/codesystem-operation-kind.json diff --git a/crates/fhir/tests/data/R4B/codesystem-operation-parameter-use.json b/crates/fhir/tests/data/json/R4B/codesystem-operation-parameter-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-operation-parameter-use.json rename to crates/fhir/tests/data/json/R4B/codesystem-operation-parameter-use.json diff --git a/crates/fhir/tests/data/R4B/codesystem-organization-role.json b/crates/fhir/tests/data/json/R4B/codesystem-organization-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-organization-role.json rename to crates/fhir/tests/data/json/R4B/codesystem-organization-role.json diff --git a/crates/fhir/tests/data/R4B/codesystem-organization-type.json b/crates/fhir/tests/data/json/R4B/codesystem-organization-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-organization-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-organization-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-orientation-type.json b/crates/fhir/tests/data/json/R4B/codesystem-orientation-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-orientation-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-orientation-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-package-characteristic.json b/crates/fhir/tests/data/json/R4B/codesystem-package-characteristic.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-package-characteristic.json rename to crates/fhir/tests/data/json/R4B/codesystem-package-characteristic.json diff --git a/crates/fhir/tests/data/R4B/codesystem-package-material.json b/crates/fhir/tests/data/json/R4B/codesystem-package-material.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-package-material.json rename to crates/fhir/tests/data/json/R4B/codesystem-package-material.json diff --git a/crates/fhir/tests/data/R4B/codesystem-package-type.json b/crates/fhir/tests/data/json/R4B/codesystem-package-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-package-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-package-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-packaging-type.json b/crates/fhir/tests/data/json/R4B/codesystem-packaging-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-packaging-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-packaging-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-participantrequired.json b/crates/fhir/tests/data/json/R4B/codesystem-participantrequired.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-participantrequired.json rename to crates/fhir/tests/data/json/R4B/codesystem-participantrequired.json diff --git a/crates/fhir/tests/data/R4B/codesystem-participationstatus.json b/crates/fhir/tests/data/json/R4B/codesystem-participationstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-participationstatus.json rename to crates/fhir/tests/data/json/R4B/codesystem-participationstatus.json diff --git a/crates/fhir/tests/data/R4B/codesystem-payeetype.json b/crates/fhir/tests/data/json/R4B/codesystem-payeetype.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-payeetype.json rename to crates/fhir/tests/data/json/R4B/codesystem-payeetype.json diff --git a/crates/fhir/tests/data/R4B/codesystem-payment-adjustment-reason.json b/crates/fhir/tests/data/json/R4B/codesystem-payment-adjustment-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-payment-adjustment-reason.json rename to crates/fhir/tests/data/json/R4B/codesystem-payment-adjustment-reason.json diff --git a/crates/fhir/tests/data/R4B/codesystem-payment-status.json b/crates/fhir/tests/data/json/R4B/codesystem-payment-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-payment-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-payment-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-payment-type.json b/crates/fhir/tests/data/json/R4B/codesystem-payment-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-payment-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-payment-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-permitted-data-type.json b/crates/fhir/tests/data/json/R4B/codesystem-permitted-data-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-permitted-data-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-permitted-data-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-plan-definition-type.json b/crates/fhir/tests/data/json/R4B/codesystem-plan-definition-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-plan-definition-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-plan-definition-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-procedure-progress-status-codes.json b/crates/fhir/tests/data/json/R4B/codesystem-procedure-progress-status-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-procedure-progress-status-codes.json rename to crates/fhir/tests/data/json/R4B/codesystem-procedure-progress-status-codes.json diff --git a/crates/fhir/tests/data/R4B/codesystem-process-priority.json b/crates/fhir/tests/data/json/R4B/codesystem-process-priority.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-process-priority.json rename to crates/fhir/tests/data/json/R4B/codesystem-process-priority.json diff --git a/crates/fhir/tests/data/R4B/codesystem-product-category.json b/crates/fhir/tests/data/json/R4B/codesystem-product-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-product-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-product-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-product-intended-use.json b/crates/fhir/tests/data/json/R4B/codesystem-product-intended-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-product-intended-use.json rename to crates/fhir/tests/data/json/R4B/codesystem-product-intended-use.json diff --git a/crates/fhir/tests/data/R4B/codesystem-product-status.json b/crates/fhir/tests/data/json/R4B/codesystem-product-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-product-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-product-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-product-storage-scale.json b/crates/fhir/tests/data/json/R4B/codesystem-product-storage-scale.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-product-storage-scale.json rename to crates/fhir/tests/data/json/R4B/codesystem-product-storage-scale.json diff --git a/crates/fhir/tests/data/R4B/codesystem-program.json b/crates/fhir/tests/data/json/R4B/codesystem-program.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-program.json rename to crates/fhir/tests/data/json/R4B/codesystem-program.json diff --git a/crates/fhir/tests/data/R4B/codesystem-property-representation.json b/crates/fhir/tests/data/json/R4B/codesystem-property-representation.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-property-representation.json rename to crates/fhir/tests/data/json/R4B/codesystem-property-representation.json diff --git a/crates/fhir/tests/data/R4B/codesystem-provenance-agent-type.json b/crates/fhir/tests/data/json/R4B/codesystem-provenance-agent-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-provenance-agent-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-provenance-agent-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-provenance-entity-role.json b/crates/fhir/tests/data/json/R4B/codesystem-provenance-entity-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-provenance-entity-role.json rename to crates/fhir/tests/data/json/R4B/codesystem-provenance-entity-role.json diff --git a/crates/fhir/tests/data/R4B/codesystem-provenance-participant-role.json b/crates/fhir/tests/data/json/R4B/codesystem-provenance-participant-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-provenance-participant-role.json rename to crates/fhir/tests/data/json/R4B/codesystem-provenance-participant-role.json diff --git a/crates/fhir/tests/data/R4B/codesystem-provider-qualification.json b/crates/fhir/tests/data/json/R4B/codesystem-provider-qualification.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-provider-qualification.json rename to crates/fhir/tests/data/json/R4B/codesystem-provider-qualification.json diff --git a/crates/fhir/tests/data/R4B/codesystem-publication-status.json b/crates/fhir/tests/data/json/R4B/codesystem-publication-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-publication-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-publication-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-published-in-type.json b/crates/fhir/tests/data/json/R4B/codesystem-published-in-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-published-in-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-published-in-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-quality-type.json b/crates/fhir/tests/data/json/R4B/codesystem-quality-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-quality-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-quality-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-quantity-comparator.json b/crates/fhir/tests/data/json/R4B/codesystem-quantity-comparator.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-quantity-comparator.json rename to crates/fhir/tests/data/json/R4B/codesystem-quantity-comparator.json diff --git a/crates/fhir/tests/data/R4B/codesystem-questionnaire-answers-status.json b/crates/fhir/tests/data/json/R4B/codesystem-questionnaire-answers-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-questionnaire-answers-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-questionnaire-answers-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-questionnaire-display-category.json b/crates/fhir/tests/data/json/R4B/codesystem-questionnaire-display-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-questionnaire-display-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-questionnaire-display-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-questionnaire-enable-behavior.json b/crates/fhir/tests/data/json/R4B/codesystem-questionnaire-enable-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-questionnaire-enable-behavior.json rename to crates/fhir/tests/data/json/R4B/codesystem-questionnaire-enable-behavior.json diff --git a/crates/fhir/tests/data/R4B/codesystem-questionnaire-enable-operator.json b/crates/fhir/tests/data/json/R4B/codesystem-questionnaire-enable-operator.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-questionnaire-enable-operator.json rename to crates/fhir/tests/data/json/R4B/codesystem-questionnaire-enable-operator.json diff --git a/crates/fhir/tests/data/R4B/codesystem-questionnaire-item-control.json b/crates/fhir/tests/data/json/R4B/codesystem-questionnaire-item-control.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-questionnaire-item-control.json rename to crates/fhir/tests/data/json/R4B/codesystem-questionnaire-item-control.json diff --git a/crates/fhir/tests/data/R4B/codesystem-questionnaire.json b/crates/fhir/tests/data/json/R4B/codesystem-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-questionnaire.json rename to crates/fhir/tests/data/json/R4B/codesystem-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/codesystem-reaction-event-certainty.json b/crates/fhir/tests/data/json/R4B/codesystem-reaction-event-certainty.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-reaction-event-certainty.json rename to crates/fhir/tests/data/json/R4B/codesystem-reaction-event-certainty.json diff --git a/crates/fhir/tests/data/R4B/codesystem-reaction-event-severity.json b/crates/fhir/tests/data/json/R4B/codesystem-reaction-event-severity.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-reaction-event-severity.json rename to crates/fhir/tests/data/json/R4B/codesystem-reaction-event-severity.json diff --git a/crates/fhir/tests/data/R4B/codesystem-reason-medication-given-codes.json b/crates/fhir/tests/data/json/R4B/codesystem-reason-medication-given-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-reason-medication-given-codes.json rename to crates/fhir/tests/data/json/R4B/codesystem-reason-medication-given-codes.json diff --git a/crates/fhir/tests/data/R4B/codesystem-reason-medication-not-given-codes.json b/crates/fhir/tests/data/json/R4B/codesystem-reason-medication-not-given-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-reason-medication-not-given-codes.json rename to crates/fhir/tests/data/json/R4B/codesystem-reason-medication-not-given-codes.json diff --git a/crates/fhir/tests/data/R4B/codesystem-recommendation-strength.json b/crates/fhir/tests/data/json/R4B/codesystem-recommendation-strength.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-recommendation-strength.json rename to crates/fhir/tests/data/json/R4B/codesystem-recommendation-strength.json diff --git a/crates/fhir/tests/data/R4B/codesystem-reference-handling-policy.json b/crates/fhir/tests/data/json/R4B/codesystem-reference-handling-policy.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-reference-handling-policy.json rename to crates/fhir/tests/data/json/R4B/codesystem-reference-handling-policy.json diff --git a/crates/fhir/tests/data/R4B/codesystem-reference-version-rules.json b/crates/fhir/tests/data/json/R4B/codesystem-reference-version-rules.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-reference-version-rules.json rename to crates/fhir/tests/data/json/R4B/codesystem-reference-version-rules.json diff --git a/crates/fhir/tests/data/R4B/codesystem-referencerange-meaning.json b/crates/fhir/tests/data/json/R4B/codesystem-referencerange-meaning.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-referencerange-meaning.json rename to crates/fhir/tests/data/json/R4B/codesystem-referencerange-meaning.json diff --git a/crates/fhir/tests/data/R4B/codesystem-regulated-authorization-basis.json b/crates/fhir/tests/data/json/R4B/codesystem-regulated-authorization-basis.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-regulated-authorization-basis.json rename to crates/fhir/tests/data/json/R4B/codesystem-regulated-authorization-basis.json diff --git a/crates/fhir/tests/data/R4B/codesystem-regulated-authorization-case-type.json b/crates/fhir/tests/data/json/R4B/codesystem-regulated-authorization-case-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-regulated-authorization-case-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-regulated-authorization-case-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-regulated-authorization-type.json b/crates/fhir/tests/data/json/R4B/codesystem-regulated-authorization-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-regulated-authorization-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-regulated-authorization-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-rejection-criteria.json b/crates/fhir/tests/data/json/R4B/codesystem-rejection-criteria.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-rejection-criteria.json rename to crates/fhir/tests/data/json/R4B/codesystem-rejection-criteria.json diff --git a/crates/fhir/tests/data/R4B/codesystem-related-artifact-type.json b/crates/fhir/tests/data/json/R4B/codesystem-related-artifact-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-related-artifact-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-related-artifact-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-related-claim-relationship.json b/crates/fhir/tests/data/json/R4B/codesystem-related-claim-relationship.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-related-claim-relationship.json rename to crates/fhir/tests/data/json/R4B/codesystem-related-claim-relationship.json diff --git a/crates/fhir/tests/data/R4B/codesystem-relation-type.json b/crates/fhir/tests/data/json/R4B/codesystem-relation-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-relation-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-relation-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-relationship.json b/crates/fhir/tests/data/json/R4B/codesystem-relationship.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-relationship.json rename to crates/fhir/tests/data/json/R4B/codesystem-relationship.json diff --git a/crates/fhir/tests/data/R4B/codesystem-remittance-outcome.json b/crates/fhir/tests/data/json/R4B/codesystem-remittance-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-remittance-outcome.json rename to crates/fhir/tests/data/json/R4B/codesystem-remittance-outcome.json diff --git a/crates/fhir/tests/data/R4B/codesystem-report-action-result-codes.json b/crates/fhir/tests/data/json/R4B/codesystem-report-action-result-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-report-action-result-codes.json rename to crates/fhir/tests/data/json/R4B/codesystem-report-action-result-codes.json diff --git a/crates/fhir/tests/data/R4B/codesystem-report-participant-type.json b/crates/fhir/tests/data/json/R4B/codesystem-report-participant-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-report-participant-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-report-participant-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-report-relation-type.json b/crates/fhir/tests/data/json/R4B/codesystem-report-relation-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-report-relation-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-report-relation-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-report-result-codes.json b/crates/fhir/tests/data/json/R4B/codesystem-report-result-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-report-result-codes.json rename to crates/fhir/tests/data/json/R4B/codesystem-report-result-codes.json diff --git a/crates/fhir/tests/data/R4B/codesystem-report-status-codes.json b/crates/fhir/tests/data/json/R4B/codesystem-report-status-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-report-status-codes.json rename to crates/fhir/tests/data/json/R4B/codesystem-report-status-codes.json diff --git a/crates/fhir/tests/data/R4B/codesystem-repository-type.json b/crates/fhir/tests/data/json/R4B/codesystem-repository-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-repository-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-repository-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-request-intent.json b/crates/fhir/tests/data/json/R4B/codesystem-request-intent.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-request-intent.json rename to crates/fhir/tests/data/json/R4B/codesystem-request-intent.json diff --git a/crates/fhir/tests/data/R4B/codesystem-request-priority.json b/crates/fhir/tests/data/json/R4B/codesystem-request-priority.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-request-priority.json rename to crates/fhir/tests/data/json/R4B/codesystem-request-priority.json diff --git a/crates/fhir/tests/data/R4B/codesystem-request-resource-types.json b/crates/fhir/tests/data/json/R4B/codesystem-request-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-request-resource-types.json rename to crates/fhir/tests/data/json/R4B/codesystem-request-resource-types.json diff --git a/crates/fhir/tests/data/R4B/codesystem-request-status.json b/crates/fhir/tests/data/json/R4B/codesystem-request-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-request-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-request-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-research-element-type.json b/crates/fhir/tests/data/json/R4B/codesystem-research-element-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-research-element-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-research-element-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-research-study-objective-type.json b/crates/fhir/tests/data/json/R4B/codesystem-research-study-objective-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-research-study-objective-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-research-study-objective-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-research-study-phase.json b/crates/fhir/tests/data/json/R4B/codesystem-research-study-phase.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-research-study-phase.json rename to crates/fhir/tests/data/json/R4B/codesystem-research-study-phase.json diff --git a/crates/fhir/tests/data/R4B/codesystem-research-study-prim-purp-type.json b/crates/fhir/tests/data/json/R4B/codesystem-research-study-prim-purp-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-research-study-prim-purp-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-research-study-prim-purp-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-research-study-reason-stopped.json b/crates/fhir/tests/data/json/R4B/codesystem-research-study-reason-stopped.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-research-study-reason-stopped.json rename to crates/fhir/tests/data/json/R4B/codesystem-research-study-reason-stopped.json diff --git a/crates/fhir/tests/data/R4B/codesystem-research-study-status.json b/crates/fhir/tests/data/json/R4B/codesystem-research-study-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-research-study-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-research-study-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-research-subject-status.json b/crates/fhir/tests/data/json/R4B/codesystem-research-subject-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-research-subject-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-research-subject-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-resource-aggregation-mode.json b/crates/fhir/tests/data/json/R4B/codesystem-resource-aggregation-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-resource-aggregation-mode.json rename to crates/fhir/tests/data/json/R4B/codesystem-resource-aggregation-mode.json diff --git a/crates/fhir/tests/data/R4B/codesystem-resource-security-category.json b/crates/fhir/tests/data/json/R4B/codesystem-resource-security-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-resource-security-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-resource-security-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-resource-slicing-rules.json b/crates/fhir/tests/data/json/R4B/codesystem-resource-slicing-rules.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-resource-slicing-rules.json rename to crates/fhir/tests/data/json/R4B/codesystem-resource-slicing-rules.json diff --git a/crates/fhir/tests/data/R4B/codesystem-resource-status.json b/crates/fhir/tests/data/json/R4B/codesystem-resource-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-resource-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-resource-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-resource-types.json b/crates/fhir/tests/data/json/R4B/codesystem-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-resource-types.json rename to crates/fhir/tests/data/json/R4B/codesystem-resource-types.json diff --git a/crates/fhir/tests/data/R4B/codesystem-resource-validation-mode.json b/crates/fhir/tests/data/json/R4B/codesystem-resource-validation-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-resource-validation-mode.json rename to crates/fhir/tests/data/json/R4B/codesystem-resource-validation-mode.json diff --git a/crates/fhir/tests/data/R4B/codesystem-response-code.json b/crates/fhir/tests/data/json/R4B/codesystem-response-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-response-code.json rename to crates/fhir/tests/data/json/R4B/codesystem-response-code.json diff --git a/crates/fhir/tests/data/R4B/codesystem-restful-capability-mode.json b/crates/fhir/tests/data/json/R4B/codesystem-restful-capability-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-restful-capability-mode.json rename to crates/fhir/tests/data/json/R4B/codesystem-restful-capability-mode.json diff --git a/crates/fhir/tests/data/R4B/codesystem-restful-interaction.json b/crates/fhir/tests/data/json/R4B/codesystem-restful-interaction.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-restful-interaction.json rename to crates/fhir/tests/data/json/R4B/codesystem-restful-interaction.json diff --git a/crates/fhir/tests/data/R4B/codesystem-restful-security-service.json b/crates/fhir/tests/data/json/R4B/codesystem-restful-security-service.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-restful-security-service.json rename to crates/fhir/tests/data/json/R4B/codesystem-restful-security-service.json diff --git a/crates/fhir/tests/data/R4B/codesystem-risk-probability.json b/crates/fhir/tests/data/json/R4B/codesystem-risk-probability.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-risk-probability.json rename to crates/fhir/tests/data/json/R4B/codesystem-risk-probability.json diff --git a/crates/fhir/tests/data/R4B/codesystem-search-comparator.json b/crates/fhir/tests/data/json/R4B/codesystem-search-comparator.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-search-comparator.json rename to crates/fhir/tests/data/json/R4B/codesystem-search-comparator.json diff --git a/crates/fhir/tests/data/R4B/codesystem-search-entry-mode.json b/crates/fhir/tests/data/json/R4B/codesystem-search-entry-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-search-entry-mode.json rename to crates/fhir/tests/data/json/R4B/codesystem-search-entry-mode.json diff --git a/crates/fhir/tests/data/R4B/codesystem-search-modifier-code.json b/crates/fhir/tests/data/json/R4B/codesystem-search-modifier-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-search-modifier-code.json rename to crates/fhir/tests/data/json/R4B/codesystem-search-modifier-code.json diff --git a/crates/fhir/tests/data/R4B/codesystem-search-param-type.json b/crates/fhir/tests/data/json/R4B/codesystem-search-param-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-search-param-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-search-param-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-search-xpath-usage.json b/crates/fhir/tests/data/json/R4B/codesystem-search-xpath-usage.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-search-xpath-usage.json rename to crates/fhir/tests/data/json/R4B/codesystem-search-xpath-usage.json diff --git a/crates/fhir/tests/data/R4B/codesystem-secondary-finding.json b/crates/fhir/tests/data/json/R4B/codesystem-secondary-finding.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-secondary-finding.json rename to crates/fhir/tests/data/json/R4B/codesystem-secondary-finding.json diff --git a/crates/fhir/tests/data/R4B/codesystem-sequence-type.json b/crates/fhir/tests/data/json/R4B/codesystem-sequence-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-sequence-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-sequence-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-service-category.json b/crates/fhir/tests/data/json/R4B/codesystem-service-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-service-category.json rename to crates/fhir/tests/data/json/R4B/codesystem-service-category.json diff --git a/crates/fhir/tests/data/R4B/codesystem-service-place.json b/crates/fhir/tests/data/json/R4B/codesystem-service-place.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-service-place.json rename to crates/fhir/tests/data/json/R4B/codesystem-service-place.json diff --git a/crates/fhir/tests/data/R4B/codesystem-service-provision-conditions.json b/crates/fhir/tests/data/json/R4B/codesystem-service-provision-conditions.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-service-provision-conditions.json rename to crates/fhir/tests/data/json/R4B/codesystem-service-provision-conditions.json diff --git a/crates/fhir/tests/data/R4B/codesystem-service-referral-method.json b/crates/fhir/tests/data/json/R4B/codesystem-service-referral-method.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-service-referral-method.json rename to crates/fhir/tests/data/json/R4B/codesystem-service-referral-method.json diff --git a/crates/fhir/tests/data/R4B/codesystem-service-type.json b/crates/fhir/tests/data/json/R4B/codesystem-service-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-service-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-service-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-service-uscls.json b/crates/fhir/tests/data/json/R4B/codesystem-service-uscls.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-service-uscls.json rename to crates/fhir/tests/data/json/R4B/codesystem-service-uscls.json diff --git a/crates/fhir/tests/data/R4B/codesystem-signature-type.json b/crates/fhir/tests/data/json/R4B/codesystem-signature-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-signature-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-signature-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-slotstatus.json b/crates/fhir/tests/data/json/R4B/codesystem-slotstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-slotstatus.json rename to crates/fhir/tests/data/json/R4B/codesystem-slotstatus.json diff --git a/crates/fhir/tests/data/R4B/codesystem-smart-capabilities.json b/crates/fhir/tests/data/json/R4B/codesystem-smart-capabilities.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-smart-capabilities.json rename to crates/fhir/tests/data/json/R4B/codesystem-smart-capabilities.json diff --git a/crates/fhir/tests/data/R4B/codesystem-snomedct.json b/crates/fhir/tests/data/json/R4B/codesystem-snomedct.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-snomedct.json rename to crates/fhir/tests/data/json/R4B/codesystem-snomedct.json diff --git a/crates/fhir/tests/data/R4B/codesystem-sort-direction.json b/crates/fhir/tests/data/json/R4B/codesystem-sort-direction.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-sort-direction.json rename to crates/fhir/tests/data/json/R4B/codesystem-sort-direction.json diff --git a/crates/fhir/tests/data/R4B/codesystem-spdx-license.json b/crates/fhir/tests/data/json/R4B/codesystem-spdx-license.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-spdx-license.json rename to crates/fhir/tests/data/json/R4B/codesystem-spdx-license.json diff --git a/crates/fhir/tests/data/R4B/codesystem-special-values.json b/crates/fhir/tests/data/json/R4B/codesystem-special-values.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-special-values.json rename to crates/fhir/tests/data/json/R4B/codesystem-special-values.json diff --git a/crates/fhir/tests/data/R4B/codesystem-specimen-contained-preference.json b/crates/fhir/tests/data/json/R4B/codesystem-specimen-contained-preference.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-specimen-contained-preference.json rename to crates/fhir/tests/data/json/R4B/codesystem-specimen-contained-preference.json diff --git a/crates/fhir/tests/data/R4B/codesystem-specimen-status.json b/crates/fhir/tests/data/json/R4B/codesystem-specimen-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-specimen-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-specimen-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-standards-status.json b/crates/fhir/tests/data/json/R4B/codesystem-standards-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-standards-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-standards-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-statistic-model-code.json b/crates/fhir/tests/data/json/R4B/codesystem-statistic-model-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-statistic-model-code.json rename to crates/fhir/tests/data/json/R4B/codesystem-statistic-model-code.json diff --git a/crates/fhir/tests/data/R4B/codesystem-statistic-type.json b/crates/fhir/tests/data/json/R4B/codesystem-statistic-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-statistic-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-statistic-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-strand-type.json b/crates/fhir/tests/data/json/R4B/codesystem-strand-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-strand-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-strand-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-structure-definition-kind.json b/crates/fhir/tests/data/json/R4B/codesystem-structure-definition-kind.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-structure-definition-kind.json rename to crates/fhir/tests/data/json/R4B/codesystem-structure-definition-kind.json diff --git a/crates/fhir/tests/data/R4B/codesystem-study-type.json b/crates/fhir/tests/data/json/R4B/codesystem-study-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-study-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-study-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-subscriber-relationship.json b/crates/fhir/tests/data/json/R4B/codesystem-subscriber-relationship.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-subscriber-relationship.json rename to crates/fhir/tests/data/json/R4B/codesystem-subscriber-relationship.json diff --git a/crates/fhir/tests/data/R4B/codesystem-subscription-channel-type.json b/crates/fhir/tests/data/json/R4B/codesystem-subscription-channel-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-subscription-channel-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-subscription-channel-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-subscription-notification-type.json b/crates/fhir/tests/data/json/R4B/codesystem-subscription-notification-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-subscription-notification-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-subscription-notification-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-subscription-search-modifier.json b/crates/fhir/tests/data/json/R4B/codesystem-subscription-search-modifier.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-subscription-search-modifier.json rename to crates/fhir/tests/data/json/R4B/codesystem-subscription-search-modifier.json diff --git a/crates/fhir/tests/data/R4B/codesystem-subscription-status.json b/crates/fhir/tests/data/json/R4B/codesystem-subscription-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-subscription-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-subscription-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-subscriptiontopic-cr-behavior.json b/crates/fhir/tests/data/json/R4B/codesystem-subscriptiontopic-cr-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-subscriptiontopic-cr-behavior.json rename to crates/fhir/tests/data/json/R4B/codesystem-subscriptiontopic-cr-behavior.json diff --git a/crates/fhir/tests/data/R4B/codesystem-substance-amount-type.json b/crates/fhir/tests/data/json/R4B/codesystem-substance-amount-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-substance-amount-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-substance-amount-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-substance-grade.json b/crates/fhir/tests/data/json/R4B/codesystem-substance-grade.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-substance-grade.json rename to crates/fhir/tests/data/json/R4B/codesystem-substance-grade.json diff --git a/crates/fhir/tests/data/R4B/codesystem-substance-name-authority.json b/crates/fhir/tests/data/json/R4B/codesystem-substance-name-authority.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-substance-name-authority.json rename to crates/fhir/tests/data/json/R4B/codesystem-substance-name-authority.json diff --git a/crates/fhir/tests/data/R4B/codesystem-substance-name-domain.json b/crates/fhir/tests/data/json/R4B/codesystem-substance-name-domain.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-substance-name-domain.json rename to crates/fhir/tests/data/json/R4B/codesystem-substance-name-domain.json diff --git a/crates/fhir/tests/data/R4B/codesystem-substance-name-type.json b/crates/fhir/tests/data/json/R4B/codesystem-substance-name-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-substance-name-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-substance-name-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-substance-optical-activity.json b/crates/fhir/tests/data/json/R4B/codesystem-substance-optical-activity.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-substance-optical-activity.json rename to crates/fhir/tests/data/json/R4B/codesystem-substance-optical-activity.json diff --git a/crates/fhir/tests/data/R4B/codesystem-substance-relationship-type.json b/crates/fhir/tests/data/json/R4B/codesystem-substance-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-substance-relationship-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-substance-relationship-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-substance-representation-format.json b/crates/fhir/tests/data/json/R4B/codesystem-substance-representation-format.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-substance-representation-format.json rename to crates/fhir/tests/data/json/R4B/codesystem-substance-representation-format.json diff --git a/crates/fhir/tests/data/R4B/codesystem-substance-representation-type.json b/crates/fhir/tests/data/json/R4B/codesystem-substance-representation-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-substance-representation-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-substance-representation-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-substance-source-material-genus.json b/crates/fhir/tests/data/json/R4B/codesystem-substance-source-material-genus.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-substance-source-material-genus.json rename to crates/fhir/tests/data/json/R4B/codesystem-substance-source-material-genus.json diff --git a/crates/fhir/tests/data/R4B/codesystem-substance-source-material-part.json b/crates/fhir/tests/data/json/R4B/codesystem-substance-source-material-part.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-substance-source-material-part.json rename to crates/fhir/tests/data/json/R4B/codesystem-substance-source-material-part.json diff --git a/crates/fhir/tests/data/R4B/codesystem-substance-source-material-species.json b/crates/fhir/tests/data/json/R4B/codesystem-substance-source-material-species.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-substance-source-material-species.json rename to crates/fhir/tests/data/json/R4B/codesystem-substance-source-material-species.json diff --git a/crates/fhir/tests/data/R4B/codesystem-substance-source-material-type.json b/crates/fhir/tests/data/json/R4B/codesystem-substance-source-material-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-substance-source-material-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-substance-source-material-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-substance-status.json b/crates/fhir/tests/data/json/R4B/codesystem-substance-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-substance-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-substance-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-substance-stereochemistry.json b/crates/fhir/tests/data/json/R4B/codesystem-substance-stereochemistry.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-substance-stereochemistry.json rename to crates/fhir/tests/data/json/R4B/codesystem-substance-stereochemistry.json diff --git a/crates/fhir/tests/data/R4B/codesystem-substance-structure-technique.json b/crates/fhir/tests/data/json/R4B/codesystem-substance-structure-technique.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-substance-structure-technique.json rename to crates/fhir/tests/data/json/R4B/codesystem-substance-structure-technique.json diff --git a/crates/fhir/tests/data/R4B/codesystem-substance-weight-method.json b/crates/fhir/tests/data/json/R4B/codesystem-substance-weight-method.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-substance-weight-method.json rename to crates/fhir/tests/data/json/R4B/codesystem-substance-weight-method.json diff --git a/crates/fhir/tests/data/R4B/codesystem-substance-weight-type.json b/crates/fhir/tests/data/json/R4B/codesystem-substance-weight-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-substance-weight-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-substance-weight-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-supplydelivery-status.json b/crates/fhir/tests/data/json/R4B/codesystem-supplydelivery-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-supplydelivery-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-supplydelivery-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-supplydelivery-type.json b/crates/fhir/tests/data/json/R4B/codesystem-supplydelivery-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-supplydelivery-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-supplydelivery-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-supplyrequest-kind.json b/crates/fhir/tests/data/json/R4B/codesystem-supplyrequest-kind.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-supplyrequest-kind.json rename to crates/fhir/tests/data/json/R4B/codesystem-supplyrequest-kind.json diff --git a/crates/fhir/tests/data/R4B/codesystem-supplyrequest-reason.json b/crates/fhir/tests/data/json/R4B/codesystem-supplyrequest-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-supplyrequest-reason.json rename to crates/fhir/tests/data/json/R4B/codesystem-supplyrequest-reason.json diff --git a/crates/fhir/tests/data/R4B/codesystem-supplyrequest-status.json b/crates/fhir/tests/data/json/R4B/codesystem-supplyrequest-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-supplyrequest-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-supplyrequest-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-surface.json b/crates/fhir/tests/data/json/R4B/codesystem-surface.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-surface.json rename to crates/fhir/tests/data/json/R4B/codesystem-surface.json diff --git a/crates/fhir/tests/data/R4B/codesystem-synthesis-type.json b/crates/fhir/tests/data/json/R4B/codesystem-synthesis-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-synthesis-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-synthesis-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-target-species.json b/crates/fhir/tests/data/json/R4B/codesystem-target-species.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-target-species.json rename to crates/fhir/tests/data/json/R4B/codesystem-target-species.json diff --git a/crates/fhir/tests/data/R4B/codesystem-task-code.json b/crates/fhir/tests/data/json/R4B/codesystem-task-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-task-code.json rename to crates/fhir/tests/data/json/R4B/codesystem-task-code.json diff --git a/crates/fhir/tests/data/R4B/codesystem-task-intent.json b/crates/fhir/tests/data/json/R4B/codesystem-task-intent.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-task-intent.json rename to crates/fhir/tests/data/json/R4B/codesystem-task-intent.json diff --git a/crates/fhir/tests/data/R4B/codesystem-task-status.json b/crates/fhir/tests/data/json/R4B/codesystem-task-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-task-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-task-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-template-status-code.json b/crates/fhir/tests/data/json/R4B/codesystem-template-status-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-template-status-code.json rename to crates/fhir/tests/data/json/R4B/codesystem-template-status-code.json diff --git a/crates/fhir/tests/data/R4B/codesystem-testscript-operation-codes.json b/crates/fhir/tests/data/json/R4B/codesystem-testscript-operation-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-testscript-operation-codes.json rename to crates/fhir/tests/data/json/R4B/codesystem-testscript-operation-codes.json diff --git a/crates/fhir/tests/data/R4B/codesystem-testscript-profile-destination-types.json b/crates/fhir/tests/data/json/R4B/codesystem-testscript-profile-destination-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-testscript-profile-destination-types.json rename to crates/fhir/tests/data/json/R4B/codesystem-testscript-profile-destination-types.json diff --git a/crates/fhir/tests/data/R4B/codesystem-testscript-profile-origin-types.json b/crates/fhir/tests/data/json/R4B/codesystem-testscript-profile-origin-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-testscript-profile-origin-types.json rename to crates/fhir/tests/data/json/R4B/codesystem-testscript-profile-origin-types.json diff --git a/crates/fhir/tests/data/R4B/codesystem-therapy-relationship-type.json b/crates/fhir/tests/data/json/R4B/codesystem-therapy-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-therapy-relationship-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-therapy-relationship-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-title-type.json b/crates/fhir/tests/data/json/R4B/codesystem-title-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-title-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-title-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-tldc.json b/crates/fhir/tests/data/json/R4B/codesystem-tldc.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-tldc.json rename to crates/fhir/tests/data/json/R4B/codesystem-tldc.json diff --git a/crates/fhir/tests/data/R4B/codesystem-tooth.json b/crates/fhir/tests/data/json/R4B/codesystem-tooth.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-tooth.json rename to crates/fhir/tests/data/json/R4B/codesystem-tooth.json diff --git a/crates/fhir/tests/data/R4B/codesystem-trigger-type.json b/crates/fhir/tests/data/json/R4B/codesystem-trigger-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-trigger-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-trigger-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-type-derivation-rule.json b/crates/fhir/tests/data/json/R4B/codesystem-type-derivation-rule.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-type-derivation-rule.json rename to crates/fhir/tests/data/json/R4B/codesystem-type-derivation-rule.json diff --git a/crates/fhir/tests/data/R4B/codesystem-udi-entry-type.json b/crates/fhir/tests/data/json/R4B/codesystem-udi-entry-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-udi-entry-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-udi-entry-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-undesirable-effect-frequency.json b/crates/fhir/tests/data/json/R4B/codesystem-undesirable-effect-frequency.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-undesirable-effect-frequency.json rename to crates/fhir/tests/data/json/R4B/codesystem-undesirable-effect-frequency.json diff --git a/crates/fhir/tests/data/R4B/codesystem-unit-of-presentation.json b/crates/fhir/tests/data/json/R4B/codesystem-unit-of-presentation.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-unit-of-presentation.json rename to crates/fhir/tests/data/json/R4B/codesystem-unit-of-presentation.json diff --git a/crates/fhir/tests/data/R4B/codesystem-usage-context-type.json b/crates/fhir/tests/data/json/R4B/codesystem-usage-context-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-usage-context-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-usage-context-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-variable-handling.json b/crates/fhir/tests/data/json/R4B/codesystem-variable-handling.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-variable-handling.json rename to crates/fhir/tests/data/json/R4B/codesystem-variable-handling.json diff --git a/crates/fhir/tests/data/R4B/codesystem-variable-role.json b/crates/fhir/tests/data/json/R4B/codesystem-variable-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-variable-role.json rename to crates/fhir/tests/data/json/R4B/codesystem-variable-role.json diff --git a/crates/fhir/tests/data/R4B/codesystem-variable-type.json b/crates/fhir/tests/data/json/R4B/codesystem-variable-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-variable-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-variable-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-verificationresult-can-push-updates.json b/crates/fhir/tests/data/json/R4B/codesystem-verificationresult-can-push-updates.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-verificationresult-can-push-updates.json rename to crates/fhir/tests/data/json/R4B/codesystem-verificationresult-can-push-updates.json diff --git a/crates/fhir/tests/data/R4B/codesystem-verificationresult-communication-method.json b/crates/fhir/tests/data/json/R4B/codesystem-verificationresult-communication-method.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-verificationresult-communication-method.json rename to crates/fhir/tests/data/json/R4B/codesystem-verificationresult-communication-method.json diff --git a/crates/fhir/tests/data/R4B/codesystem-verificationresult-failure-action.json b/crates/fhir/tests/data/json/R4B/codesystem-verificationresult-failure-action.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-verificationresult-failure-action.json rename to crates/fhir/tests/data/json/R4B/codesystem-verificationresult-failure-action.json diff --git a/crates/fhir/tests/data/R4B/codesystem-verificationresult-need.json b/crates/fhir/tests/data/json/R4B/codesystem-verificationresult-need.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-verificationresult-need.json rename to crates/fhir/tests/data/json/R4B/codesystem-verificationresult-need.json diff --git a/crates/fhir/tests/data/R4B/codesystem-verificationresult-primary-source-type.json b/crates/fhir/tests/data/json/R4B/codesystem-verificationresult-primary-source-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-verificationresult-primary-source-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-verificationresult-primary-source-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-verificationresult-push-type-available.json b/crates/fhir/tests/data/json/R4B/codesystem-verificationresult-push-type-available.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-verificationresult-push-type-available.json rename to crates/fhir/tests/data/json/R4B/codesystem-verificationresult-push-type-available.json diff --git a/crates/fhir/tests/data/R4B/codesystem-verificationresult-status.json b/crates/fhir/tests/data/json/R4B/codesystem-verificationresult-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-verificationresult-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-verificationresult-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-verificationresult-validation-process.json b/crates/fhir/tests/data/json/R4B/codesystem-verificationresult-validation-process.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-verificationresult-validation-process.json rename to crates/fhir/tests/data/json/R4B/codesystem-verificationresult-validation-process.json diff --git a/crates/fhir/tests/data/R4B/codesystem-verificationresult-validation-status.json b/crates/fhir/tests/data/json/R4B/codesystem-verificationresult-validation-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-verificationresult-validation-status.json rename to crates/fhir/tests/data/json/R4B/codesystem-verificationresult-validation-status.json diff --git a/crates/fhir/tests/data/R4B/codesystem-verificationresult-validation-type.json b/crates/fhir/tests/data/json/R4B/codesystem-verificationresult-validation-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-verificationresult-validation-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-verificationresult-validation-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-versioning-policy.json b/crates/fhir/tests/data/json/R4B/codesystem-versioning-policy.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-versioning-policy.json rename to crates/fhir/tests/data/json/R4B/codesystem-versioning-policy.json diff --git a/crates/fhir/tests/data/R4B/codesystem-vision-base-codes.json b/crates/fhir/tests/data/json/R4B/codesystem-vision-base-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-vision-base-codes.json rename to crates/fhir/tests/data/json/R4B/codesystem-vision-base-codes.json diff --git a/crates/fhir/tests/data/R4B/codesystem-vision-eye-codes.json b/crates/fhir/tests/data/json/R4B/codesystem-vision-eye-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-vision-eye-codes.json rename to crates/fhir/tests/data/json/R4B/codesystem-vision-eye-codes.json diff --git a/crates/fhir/tests/data/R4B/codesystem-vision-product.json b/crates/fhir/tests/data/json/R4B/codesystem-vision-product.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-vision-product.json rename to crates/fhir/tests/data/json/R4B/codesystem-vision-product.json diff --git a/crates/fhir/tests/data/R4B/codesystem-w3c-provenance-activity-type.json b/crates/fhir/tests/data/json/R4B/codesystem-w3c-provenance-activity-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-w3c-provenance-activity-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-w3c-provenance-activity-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem-warning-type.json b/crates/fhir/tests/data/json/R4B/codesystem-warning-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem-warning-type.json rename to crates/fhir/tests/data/json/R4B/codesystem-warning-type.json diff --git a/crates/fhir/tests/data/R4B/codesystem.profile.json b/crates/fhir/tests/data/json/R4B/codesystem.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/codesystem.profile.json rename to crates/fhir/tests/data/json/R4B/codesystem.profile.json diff --git a/crates/fhir/tests/data/R4B/coding.profile.json b/crates/fhir/tests/data/json/R4B/coding.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/coding.profile.json rename to crates/fhir/tests/data/json/R4B/coding.profile.json diff --git a/crates/fhir/tests/data/R4B/communication-example-fm-attachment.json b/crates/fhir/tests/data/json/R4B/communication-example-fm-attachment.json similarity index 100% rename from crates/fhir/tests/data/R4B/communication-example-fm-attachment.json rename to crates/fhir/tests/data/json/R4B/communication-example-fm-attachment.json diff --git a/crates/fhir/tests/data/R4B/communication-example-fm-solicited-attachment.json b/crates/fhir/tests/data/json/R4B/communication-example-fm-solicited-attachment.json similarity index 100% rename from crates/fhir/tests/data/R4B/communication-example-fm-solicited-attachment.json rename to crates/fhir/tests/data/json/R4B/communication-example-fm-solicited-attachment.json diff --git a/crates/fhir/tests/data/R4B/communication-example.json b/crates/fhir/tests/data/json/R4B/communication-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/communication-example.json rename to crates/fhir/tests/data/json/R4B/communication-example.json diff --git a/crates/fhir/tests/data/R4B/communication-questionnaire.json b/crates/fhir/tests/data/json/R4B/communication-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/communication-questionnaire.json rename to crates/fhir/tests/data/json/R4B/communication-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/communication.profile.json b/crates/fhir/tests/data/json/R4B/communication.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/communication.profile.json rename to crates/fhir/tests/data/json/R4B/communication.profile.json diff --git a/crates/fhir/tests/data/R4B/communicationrequest-example-fm-solicit-attachment.json b/crates/fhir/tests/data/json/R4B/communicationrequest-example-fm-solicit-attachment.json similarity index 100% rename from crates/fhir/tests/data/R4B/communicationrequest-example-fm-solicit-attachment.json rename to crates/fhir/tests/data/json/R4B/communicationrequest-example-fm-solicit-attachment.json diff --git a/crates/fhir/tests/data/R4B/communicationrequest-example.json b/crates/fhir/tests/data/json/R4B/communicationrequest-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/communicationrequest-example.json rename to crates/fhir/tests/data/json/R4B/communicationrequest-example.json diff --git a/crates/fhir/tests/data/R4B/communicationrequest-questionnaire.json b/crates/fhir/tests/data/json/R4B/communicationrequest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/communicationrequest-questionnaire.json rename to crates/fhir/tests/data/json/R4B/communicationrequest-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/communicationrequest.profile.json b/crates/fhir/tests/data/json/R4B/communicationrequest.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/communicationrequest.profile.json rename to crates/fhir/tests/data/json/R4B/communicationrequest.profile.json diff --git a/crates/fhir/tests/data/R4B/compartmentdefinition-device.json b/crates/fhir/tests/data/json/R4B/compartmentdefinition-device.json similarity index 100% rename from crates/fhir/tests/data/R4B/compartmentdefinition-device.json rename to crates/fhir/tests/data/json/R4B/compartmentdefinition-device.json diff --git a/crates/fhir/tests/data/R4B/compartmentdefinition-encounter.json b/crates/fhir/tests/data/json/R4B/compartmentdefinition-encounter.json similarity index 100% rename from crates/fhir/tests/data/R4B/compartmentdefinition-encounter.json rename to crates/fhir/tests/data/json/R4B/compartmentdefinition-encounter.json diff --git a/crates/fhir/tests/data/R4B/compartmentdefinition-example.json b/crates/fhir/tests/data/json/R4B/compartmentdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/compartmentdefinition-example.json rename to crates/fhir/tests/data/json/R4B/compartmentdefinition-example.json diff --git a/crates/fhir/tests/data/R4B/compartmentdefinition-patient.json b/crates/fhir/tests/data/json/R4B/compartmentdefinition-patient.json similarity index 100% rename from crates/fhir/tests/data/R4B/compartmentdefinition-patient.json rename to crates/fhir/tests/data/json/R4B/compartmentdefinition-patient.json diff --git a/crates/fhir/tests/data/R4B/compartmentdefinition-practitioner.json b/crates/fhir/tests/data/json/R4B/compartmentdefinition-practitioner.json similarity index 100% rename from crates/fhir/tests/data/R4B/compartmentdefinition-practitioner.json rename to crates/fhir/tests/data/json/R4B/compartmentdefinition-practitioner.json diff --git a/crates/fhir/tests/data/R4B/compartmentdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/compartmentdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/compartmentdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/compartmentdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/compartmentdefinition-relatedperson.json b/crates/fhir/tests/data/json/R4B/compartmentdefinition-relatedperson.json similarity index 100% rename from crates/fhir/tests/data/R4B/compartmentdefinition-relatedperson.json rename to crates/fhir/tests/data/json/R4B/compartmentdefinition-relatedperson.json diff --git a/crates/fhir/tests/data/R4B/compartmentdefinition.profile.json b/crates/fhir/tests/data/json/R4B/compartmentdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/compartmentdefinition.profile.json rename to crates/fhir/tests/data/json/R4B/compartmentdefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/composition-example-mixed.json b/crates/fhir/tests/data/json/R4B/composition-example-mixed.json similarity index 100% rename from crates/fhir/tests/data/R4B/composition-example-mixed.json rename to crates/fhir/tests/data/json/R4B/composition-example-mixed.json diff --git a/crates/fhir/tests/data/R4B/composition-example.json b/crates/fhir/tests/data/json/R4B/composition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/composition-example.json rename to crates/fhir/tests/data/json/R4B/composition-example.json diff --git a/crates/fhir/tests/data/R4B/composition-questionnaire.json b/crates/fhir/tests/data/json/R4B/composition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/composition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/composition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/composition.profile.json b/crates/fhir/tests/data/json/R4B/composition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/composition.profile.json rename to crates/fhir/tests/data/json/R4B/composition.profile.json diff --git a/crates/fhir/tests/data/R4B/computableplandefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/computableplandefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/computableplandefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/computableplandefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/computableplandefinition.profile.json b/crates/fhir/tests/data/json/R4B/computableplandefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/computableplandefinition.profile.json rename to crates/fhir/tests/data/json/R4B/computableplandefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/conceptmap-103.json b/crates/fhir/tests/data/json/R4B/conceptmap-103.json similarity index 100% rename from crates/fhir/tests/data/R4B/conceptmap-103.json rename to crates/fhir/tests/data/json/R4B/conceptmap-103.json diff --git a/crates/fhir/tests/data/R4B/conceptmap-cdshooks-indicator.json b/crates/fhir/tests/data/json/R4B/conceptmap-cdshooks-indicator.json similarity index 100% rename from crates/fhir/tests/data/R4B/conceptmap-cdshooks-indicator.json rename to crates/fhir/tests/data/json/R4B/conceptmap-cdshooks-indicator.json diff --git a/crates/fhir/tests/data/R4B/conceptmap-example-2.json b/crates/fhir/tests/data/json/R4B/conceptmap-example-2.json similarity index 100% rename from crates/fhir/tests/data/R4B/conceptmap-example-2.json rename to crates/fhir/tests/data/json/R4B/conceptmap-example-2.json diff --git a/crates/fhir/tests/data/R4B/conceptmap-example-specimen-type.json b/crates/fhir/tests/data/json/R4B/conceptmap-example-specimen-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/conceptmap-example-specimen-type.json rename to crates/fhir/tests/data/json/R4B/conceptmap-example-specimen-type.json diff --git a/crates/fhir/tests/data/R4B/conceptmap-example.json b/crates/fhir/tests/data/json/R4B/conceptmap-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/conceptmap-example.json rename to crates/fhir/tests/data/json/R4B/conceptmap-example.json diff --git a/crates/fhir/tests/data/R4B/conceptmap-questionnaire.json b/crates/fhir/tests/data/json/R4B/conceptmap-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/conceptmap-questionnaire.json rename to crates/fhir/tests/data/json/R4B/conceptmap-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/conceptmap.profile.json b/crates/fhir/tests/data/json/R4B/conceptmap.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/conceptmap.profile.json rename to crates/fhir/tests/data/json/R4B/conceptmap.profile.json diff --git a/crates/fhir/tests/data/R4B/conceptmaps.json b/crates/fhir/tests/data/json/R4B/conceptmaps.json similarity index 100% rename from crates/fhir/tests/data/R4B/conceptmaps.json rename to crates/fhir/tests/data/json/R4B/conceptmaps.json diff --git a/crates/fhir/tests/data/R4B/condition-example-f001-heart.json b/crates/fhir/tests/data/json/R4B/condition-example-f001-heart.json similarity index 100% rename from crates/fhir/tests/data/R4B/condition-example-f001-heart.json rename to crates/fhir/tests/data/json/R4B/condition-example-f001-heart.json diff --git a/crates/fhir/tests/data/R4B/condition-example-f002-lung.json b/crates/fhir/tests/data/json/R4B/condition-example-f002-lung.json similarity index 100% rename from crates/fhir/tests/data/R4B/condition-example-f002-lung.json rename to crates/fhir/tests/data/json/R4B/condition-example-f002-lung.json diff --git a/crates/fhir/tests/data/R4B/condition-example-f003-abscess.json b/crates/fhir/tests/data/json/R4B/condition-example-f003-abscess.json similarity index 100% rename from crates/fhir/tests/data/R4B/condition-example-f003-abscess.json rename to crates/fhir/tests/data/json/R4B/condition-example-f003-abscess.json diff --git a/crates/fhir/tests/data/R4B/condition-example-f201-fever.json b/crates/fhir/tests/data/json/R4B/condition-example-f201-fever.json similarity index 100% rename from crates/fhir/tests/data/R4B/condition-example-f201-fever.json rename to crates/fhir/tests/data/json/R4B/condition-example-f201-fever.json diff --git a/crates/fhir/tests/data/R4B/condition-example-f202-malignancy.json b/crates/fhir/tests/data/json/R4B/condition-example-f202-malignancy.json similarity index 100% rename from crates/fhir/tests/data/R4B/condition-example-f202-malignancy.json rename to crates/fhir/tests/data/json/R4B/condition-example-f202-malignancy.json diff --git a/crates/fhir/tests/data/R4B/condition-example-f203-sepsis.json b/crates/fhir/tests/data/json/R4B/condition-example-f203-sepsis.json similarity index 100% rename from crates/fhir/tests/data/R4B/condition-example-f203-sepsis.json rename to crates/fhir/tests/data/json/R4B/condition-example-f203-sepsis.json diff --git a/crates/fhir/tests/data/R4B/condition-example-f204-renal.json b/crates/fhir/tests/data/json/R4B/condition-example-f204-renal.json similarity index 100% rename from crates/fhir/tests/data/R4B/condition-example-f204-renal.json rename to crates/fhir/tests/data/json/R4B/condition-example-f204-renal.json diff --git a/crates/fhir/tests/data/R4B/condition-example-f205-infection.json b/crates/fhir/tests/data/json/R4B/condition-example-f205-infection.json similarity index 100% rename from crates/fhir/tests/data/R4B/condition-example-f205-infection.json rename to crates/fhir/tests/data/json/R4B/condition-example-f205-infection.json diff --git a/crates/fhir/tests/data/R4B/condition-example-family-history.json b/crates/fhir/tests/data/json/R4B/condition-example-family-history.json similarity index 100% rename from crates/fhir/tests/data/R4B/condition-example-family-history.json rename to crates/fhir/tests/data/json/R4B/condition-example-family-history.json diff --git a/crates/fhir/tests/data/R4B/condition-example-stroke.json b/crates/fhir/tests/data/json/R4B/condition-example-stroke.json similarity index 100% rename from crates/fhir/tests/data/R4B/condition-example-stroke.json rename to crates/fhir/tests/data/json/R4B/condition-example-stroke.json diff --git a/crates/fhir/tests/data/R4B/condition-example.json b/crates/fhir/tests/data/json/R4B/condition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/condition-example.json rename to crates/fhir/tests/data/json/R4B/condition-example.json diff --git a/crates/fhir/tests/data/R4B/condition-example2.json b/crates/fhir/tests/data/json/R4B/condition-example2.json similarity index 100% rename from crates/fhir/tests/data/R4B/condition-example2.json rename to crates/fhir/tests/data/json/R4B/condition-example2.json diff --git a/crates/fhir/tests/data/R4B/condition-questionnaire.json b/crates/fhir/tests/data/json/R4B/condition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/condition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/condition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/condition.profile.json b/crates/fhir/tests/data/json/R4B/condition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/condition.profile.json rename to crates/fhir/tests/data/json/R4B/condition.profile.json diff --git a/crates/fhir/tests/data/R4B/consent-example-Emergency.json b/crates/fhir/tests/data/json/R4B/consent-example-Emergency.json similarity index 100% rename from crates/fhir/tests/data/R4B/consent-example-Emergency.json rename to crates/fhir/tests/data/json/R4B/consent-example-Emergency.json diff --git a/crates/fhir/tests/data/R4B/consent-example-Out.json b/crates/fhir/tests/data/json/R4B/consent-example-Out.json similarity index 100% rename from crates/fhir/tests/data/R4B/consent-example-Out.json rename to crates/fhir/tests/data/json/R4B/consent-example-Out.json diff --git a/crates/fhir/tests/data/R4B/consent-example-grantor.json b/crates/fhir/tests/data/json/R4B/consent-example-grantor.json similarity index 100% rename from crates/fhir/tests/data/R4B/consent-example-grantor.json rename to crates/fhir/tests/data/json/R4B/consent-example-grantor.json diff --git a/crates/fhir/tests/data/R4B/consent-example-notAuthor.json b/crates/fhir/tests/data/json/R4B/consent-example-notAuthor.json similarity index 100% rename from crates/fhir/tests/data/R4B/consent-example-notAuthor.json rename to crates/fhir/tests/data/json/R4B/consent-example-notAuthor.json diff --git a/crates/fhir/tests/data/R4B/consent-example-notOrg.json b/crates/fhir/tests/data/json/R4B/consent-example-notOrg.json similarity index 100% rename from crates/fhir/tests/data/R4B/consent-example-notOrg.json rename to crates/fhir/tests/data/json/R4B/consent-example-notOrg.json diff --git a/crates/fhir/tests/data/R4B/consent-example-notThem.json b/crates/fhir/tests/data/json/R4B/consent-example-notThem.json similarity index 100% rename from crates/fhir/tests/data/R4B/consent-example-notThem.json rename to crates/fhir/tests/data/json/R4B/consent-example-notThem.json diff --git a/crates/fhir/tests/data/R4B/consent-example-notThis.json b/crates/fhir/tests/data/json/R4B/consent-example-notThis.json similarity index 100% rename from crates/fhir/tests/data/R4B/consent-example-notThis.json rename to crates/fhir/tests/data/json/R4B/consent-example-notThis.json diff --git a/crates/fhir/tests/data/R4B/consent-example-notTime.json b/crates/fhir/tests/data/json/R4B/consent-example-notTime.json similarity index 100% rename from crates/fhir/tests/data/R4B/consent-example-notTime.json rename to crates/fhir/tests/data/json/R4B/consent-example-notTime.json diff --git a/crates/fhir/tests/data/R4B/consent-example-pkb.json b/crates/fhir/tests/data/json/R4B/consent-example-pkb.json similarity index 100% rename from crates/fhir/tests/data/R4B/consent-example-pkb.json rename to crates/fhir/tests/data/json/R4B/consent-example-pkb.json diff --git a/crates/fhir/tests/data/R4B/consent-example-signature.json b/crates/fhir/tests/data/json/R4B/consent-example-signature.json similarity index 100% rename from crates/fhir/tests/data/R4B/consent-example-signature.json rename to crates/fhir/tests/data/json/R4B/consent-example-signature.json diff --git a/crates/fhir/tests/data/R4B/consent-example-smartonfhir.json b/crates/fhir/tests/data/json/R4B/consent-example-smartonfhir.json similarity index 100% rename from crates/fhir/tests/data/R4B/consent-example-smartonfhir.json rename to crates/fhir/tests/data/json/R4B/consent-example-smartonfhir.json diff --git a/crates/fhir/tests/data/R4B/consent-example.json b/crates/fhir/tests/data/json/R4B/consent-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/consent-example.json rename to crates/fhir/tests/data/json/R4B/consent-example.json diff --git a/crates/fhir/tests/data/R4B/consent-questionnaire.json b/crates/fhir/tests/data/json/R4B/consent-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/consent-questionnaire.json rename to crates/fhir/tests/data/json/R4B/consent-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/consent.profile.json b/crates/fhir/tests/data/json/R4B/consent.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/consent.profile.json rename to crates/fhir/tests/data/json/R4B/consent.profile.json diff --git a/crates/fhir/tests/data/R4B/contactdetail.profile.json b/crates/fhir/tests/data/json/R4B/contactdetail.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/contactdetail.profile.json rename to crates/fhir/tests/data/json/R4B/contactdetail.profile.json diff --git a/crates/fhir/tests/data/R4B/contactpoint.profile.json b/crates/fhir/tests/data/json/R4B/contactpoint.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/contactpoint.profile.json rename to crates/fhir/tests/data/json/R4B/contactpoint.profile.json diff --git a/crates/fhir/tests/data/R4B/contract-example-42cfr-part2.json b/crates/fhir/tests/data/json/R4B/contract-example-42cfr-part2.json similarity index 100% rename from crates/fhir/tests/data/R4B/contract-example-42cfr-part2.json rename to crates/fhir/tests/data/json/R4B/contract-example-42cfr-part2.json diff --git a/crates/fhir/tests/data/R4B/contract-example-ins-policy.json b/crates/fhir/tests/data/json/R4B/contract-example-ins-policy.json similarity index 100% rename from crates/fhir/tests/data/R4B/contract-example-ins-policy.json rename to crates/fhir/tests/data/json/R4B/contract-example-ins-policy.json diff --git a/crates/fhir/tests/data/R4B/contract-example.json b/crates/fhir/tests/data/json/R4B/contract-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/contract-example.json rename to crates/fhir/tests/data/json/R4B/contract-example.json diff --git a/crates/fhir/tests/data/R4B/contract-questionnaire.json b/crates/fhir/tests/data/json/R4B/contract-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/contract-questionnaire.json rename to crates/fhir/tests/data/json/R4B/contract-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/contract.profile.json b/crates/fhir/tests/data/json/R4B/contract.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/contract.profile.json rename to crates/fhir/tests/data/json/R4B/contract.profile.json diff --git a/crates/fhir/tests/data/R4B/contributor.profile.json b/crates/fhir/tests/data/json/R4B/contributor.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/contributor.profile.json rename to crates/fhir/tests/data/json/R4B/contributor.profile.json diff --git a/crates/fhir/tests/data/R4B/coord-0base-example.json b/crates/fhir/tests/data/json/R4B/coord-0base-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/coord-0base-example.json rename to crates/fhir/tests/data/json/R4B/coord-0base-example.json diff --git a/crates/fhir/tests/data/R4B/coord-1base-example.json b/crates/fhir/tests/data/json/R4B/coord-1base-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/coord-1base-example.json rename to crates/fhir/tests/data/json/R4B/coord-1base-example.json diff --git a/crates/fhir/tests/data/R4B/count.profile.json b/crates/fhir/tests/data/json/R4B/count.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/count.profile.json rename to crates/fhir/tests/data/json/R4B/count.profile.json diff --git a/crates/fhir/tests/data/R4B/coverage-example-2.json b/crates/fhir/tests/data/json/R4B/coverage-example-2.json similarity index 100% rename from crates/fhir/tests/data/R4B/coverage-example-2.json rename to crates/fhir/tests/data/json/R4B/coverage-example-2.json diff --git a/crates/fhir/tests/data/R4B/coverage-example-ehic.json b/crates/fhir/tests/data/json/R4B/coverage-example-ehic.json similarity index 100% rename from crates/fhir/tests/data/R4B/coverage-example-ehic.json rename to crates/fhir/tests/data/json/R4B/coverage-example-ehic.json diff --git a/crates/fhir/tests/data/R4B/coverage-example-selfpay.json b/crates/fhir/tests/data/json/R4B/coverage-example-selfpay.json similarity index 100% rename from crates/fhir/tests/data/R4B/coverage-example-selfpay.json rename to crates/fhir/tests/data/json/R4B/coverage-example-selfpay.json diff --git a/crates/fhir/tests/data/R4B/coverage-example.json b/crates/fhir/tests/data/json/R4B/coverage-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/coverage-example.json rename to crates/fhir/tests/data/json/R4B/coverage-example.json diff --git a/crates/fhir/tests/data/R4B/coverage-questionnaire.json b/crates/fhir/tests/data/json/R4B/coverage-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/coverage-questionnaire.json rename to crates/fhir/tests/data/json/R4B/coverage-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/coverage.profile.json b/crates/fhir/tests/data/json/R4B/coverage.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/coverage.profile.json rename to crates/fhir/tests/data/json/R4B/coverage.profile.json diff --git a/crates/fhir/tests/data/R4B/coverageeligibilityrequest-example-2.json b/crates/fhir/tests/data/json/R4B/coverageeligibilityrequest-example-2.json similarity index 100% rename from crates/fhir/tests/data/R4B/coverageeligibilityrequest-example-2.json rename to crates/fhir/tests/data/json/R4B/coverageeligibilityrequest-example-2.json diff --git a/crates/fhir/tests/data/R4B/coverageeligibilityrequest-example.json b/crates/fhir/tests/data/json/R4B/coverageeligibilityrequest-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/coverageeligibilityrequest-example.json rename to crates/fhir/tests/data/json/R4B/coverageeligibilityrequest-example.json diff --git a/crates/fhir/tests/data/R4B/coverageeligibilityrequest-questionnaire.json b/crates/fhir/tests/data/json/R4B/coverageeligibilityrequest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/coverageeligibilityrequest-questionnaire.json rename to crates/fhir/tests/data/json/R4B/coverageeligibilityrequest-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/coverageeligibilityrequest.profile.json b/crates/fhir/tests/data/json/R4B/coverageeligibilityrequest.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/coverageeligibilityrequest.profile.json rename to crates/fhir/tests/data/json/R4B/coverageeligibilityrequest.profile.json diff --git a/crates/fhir/tests/data/R4B/coverageeligibilityresponse-example-benefits-2.json b/crates/fhir/tests/data/json/R4B/coverageeligibilityresponse-example-benefits-2.json similarity index 100% rename from crates/fhir/tests/data/R4B/coverageeligibilityresponse-example-benefits-2.json rename to crates/fhir/tests/data/json/R4B/coverageeligibilityresponse-example-benefits-2.json diff --git a/crates/fhir/tests/data/R4B/coverageeligibilityresponse-example-benefits.json b/crates/fhir/tests/data/json/R4B/coverageeligibilityresponse-example-benefits.json similarity index 100% rename from crates/fhir/tests/data/R4B/coverageeligibilityresponse-example-benefits.json rename to crates/fhir/tests/data/json/R4B/coverageeligibilityresponse-example-benefits.json diff --git a/crates/fhir/tests/data/R4B/coverageeligibilityresponse-example-error.json b/crates/fhir/tests/data/json/R4B/coverageeligibilityresponse-example-error.json similarity index 100% rename from crates/fhir/tests/data/R4B/coverageeligibilityresponse-example-error.json rename to crates/fhir/tests/data/json/R4B/coverageeligibilityresponse-example-error.json diff --git a/crates/fhir/tests/data/R4B/coverageeligibilityresponse-example.json b/crates/fhir/tests/data/json/R4B/coverageeligibilityresponse-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/coverageeligibilityresponse-example.json rename to crates/fhir/tests/data/json/R4B/coverageeligibilityresponse-example.json diff --git a/crates/fhir/tests/data/R4B/coverageeligibilityresponse-questionnaire.json b/crates/fhir/tests/data/json/R4B/coverageeligibilityresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/coverageeligibilityresponse-questionnaire.json rename to crates/fhir/tests/data/json/R4B/coverageeligibilityresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/coverageeligibilityresponse.profile.json b/crates/fhir/tests/data/json/R4B/coverageeligibilityresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/coverageeligibilityresponse.profile.json rename to crates/fhir/tests/data/json/R4B/coverageeligibilityresponse.profile.json diff --git a/crates/fhir/tests/data/R4B/cqf-questionnaire-questionnaire.json b/crates/fhir/tests/data/json/R4B/cqf-questionnaire-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/cqf-questionnaire-questionnaire.json rename to crates/fhir/tests/data/json/R4B/cqf-questionnaire-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/cqf-questionnaire.profile.json b/crates/fhir/tests/data/json/R4B/cqf-questionnaire.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/cqf-questionnaire.profile.json rename to crates/fhir/tests/data/json/R4B/cqf-questionnaire.profile.json diff --git a/crates/fhir/tests/data/R4B/cqllibrary-questionnaire.json b/crates/fhir/tests/data/json/R4B/cqllibrary-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/cqllibrary-questionnaire.json rename to crates/fhir/tests/data/json/R4B/cqllibrary-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/cqllibrary.profile.json b/crates/fhir/tests/data/json/R4B/cqllibrary.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/cqllibrary.profile.json rename to crates/fhir/tests/data/json/R4B/cqllibrary.profile.json diff --git a/crates/fhir/tests/data/R4B/dataelements.json b/crates/fhir/tests/data/json/R4B/dataelements.json similarity index 100% rename from crates/fhir/tests/data/R4B/dataelements.json rename to crates/fhir/tests/data/json/R4B/dataelements.json diff --git a/crates/fhir/tests/data/R4B/datarequirement.profile.json b/crates/fhir/tests/data/json/R4B/datarequirement.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/datarequirement.profile.json rename to crates/fhir/tests/data/json/R4B/datarequirement.profile.json diff --git a/crates/fhir/tests/data/R4B/datatype.profile.json b/crates/fhir/tests/data/json/R4B/datatype.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/datatype.profile.json rename to crates/fhir/tests/data/json/R4B/datatype.profile.json diff --git a/crates/fhir/tests/data/R4B/date.profile.json b/crates/fhir/tests/data/json/R4B/date.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/date.profile.json rename to crates/fhir/tests/data/json/R4B/date.profile.json diff --git a/crates/fhir/tests/data/R4B/datetime.profile.json b/crates/fhir/tests/data/json/R4B/datetime.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/datetime.profile.json rename to crates/fhir/tests/data/json/R4B/datetime.profile.json diff --git a/crates/fhir/tests/data/R4B/decimal.profile.json b/crates/fhir/tests/data/json/R4B/decimal.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/decimal.profile.json rename to crates/fhir/tests/data/json/R4B/decimal.profile.json diff --git a/crates/fhir/tests/data/R4B/definition.json b/crates/fhir/tests/data/json/R4B/definition.json similarity index 100% rename from crates/fhir/tests/data/R4B/definition.json rename to crates/fhir/tests/data/json/R4B/definition.json diff --git a/crates/fhir/tests/data/R4B/detectedissue-example-allergy.json b/crates/fhir/tests/data/json/R4B/detectedissue-example-allergy.json similarity index 100% rename from crates/fhir/tests/data/R4B/detectedissue-example-allergy.json rename to crates/fhir/tests/data/json/R4B/detectedissue-example-allergy.json diff --git a/crates/fhir/tests/data/R4B/detectedissue-example-dup.json b/crates/fhir/tests/data/json/R4B/detectedissue-example-dup.json similarity index 100% rename from crates/fhir/tests/data/R4B/detectedissue-example-dup.json rename to crates/fhir/tests/data/json/R4B/detectedissue-example-dup.json diff --git a/crates/fhir/tests/data/R4B/detectedissue-example-lab.json b/crates/fhir/tests/data/json/R4B/detectedissue-example-lab.json similarity index 100% rename from crates/fhir/tests/data/R4B/detectedissue-example-lab.json rename to crates/fhir/tests/data/json/R4B/detectedissue-example-lab.json diff --git a/crates/fhir/tests/data/R4B/detectedissue-example.json b/crates/fhir/tests/data/json/R4B/detectedissue-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/detectedissue-example.json rename to crates/fhir/tests/data/json/R4B/detectedissue-example.json diff --git a/crates/fhir/tests/data/R4B/detectedissue-questionnaire.json b/crates/fhir/tests/data/json/R4B/detectedissue-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/detectedissue-questionnaire.json rename to crates/fhir/tests/data/json/R4B/detectedissue-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/detectedissue.profile.json b/crates/fhir/tests/data/json/R4B/detectedissue.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/detectedissue.profile.json rename to crates/fhir/tests/data/json/R4B/detectedissue.profile.json diff --git a/crates/fhir/tests/data/R4B/device-example-f001-feedingtube.json b/crates/fhir/tests/data/json/R4B/device-example-f001-feedingtube.json similarity index 100% rename from crates/fhir/tests/data/R4B/device-example-f001-feedingtube.json rename to crates/fhir/tests/data/json/R4B/device-example-f001-feedingtube.json diff --git a/crates/fhir/tests/data/R4B/device-example.json b/crates/fhir/tests/data/json/R4B/device-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/device-example.json rename to crates/fhir/tests/data/json/R4B/device-example.json diff --git a/crates/fhir/tests/data/R4B/device-extensions-Device-din.json b/crates/fhir/tests/data/json/R4B/device-extensions-Device-din.json similarity index 100% rename from crates/fhir/tests/data/R4B/device-extensions-Device-din.json rename to crates/fhir/tests/data/json/R4B/device-extensions-Device-din.json diff --git a/crates/fhir/tests/data/R4B/device-questionnaire.json b/crates/fhir/tests/data/json/R4B/device-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/device-questionnaire.json rename to crates/fhir/tests/data/json/R4B/device-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/device.profile.json b/crates/fhir/tests/data/json/R4B/device.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/device.profile.json rename to crates/fhir/tests/data/json/R4B/device.profile.json diff --git a/crates/fhir/tests/data/R4B/devicedefinition-example.json b/crates/fhir/tests/data/json/R4B/devicedefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/devicedefinition-example.json rename to crates/fhir/tests/data/json/R4B/devicedefinition-example.json diff --git a/crates/fhir/tests/data/R4B/devicedefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/devicedefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/devicedefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/devicedefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/devicedefinition.profile.json b/crates/fhir/tests/data/json/R4B/devicedefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/devicedefinition.profile.json rename to crates/fhir/tests/data/json/R4B/devicedefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/devicemetric-example.json b/crates/fhir/tests/data/json/R4B/devicemetric-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/devicemetric-example.json rename to crates/fhir/tests/data/json/R4B/devicemetric-example.json diff --git a/crates/fhir/tests/data/R4B/devicemetric-questionnaire.json b/crates/fhir/tests/data/json/R4B/devicemetric-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/devicemetric-questionnaire.json rename to crates/fhir/tests/data/json/R4B/devicemetric-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/devicemetric.profile.json b/crates/fhir/tests/data/json/R4B/devicemetric.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/devicemetric.profile.json rename to crates/fhir/tests/data/json/R4B/devicemetric.profile.json diff --git a/crates/fhir/tests/data/R4B/devicemetricobservation-questionnaire.json b/crates/fhir/tests/data/json/R4B/devicemetricobservation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/devicemetricobservation-questionnaire.json rename to crates/fhir/tests/data/json/R4B/devicemetricobservation-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/devicemetricobservation.profile.json b/crates/fhir/tests/data/json/R4B/devicemetricobservation.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/devicemetricobservation.profile.json rename to crates/fhir/tests/data/json/R4B/devicemetricobservation.profile.json diff --git a/crates/fhir/tests/data/R4B/devicerequest-example-insulinpump.json b/crates/fhir/tests/data/json/R4B/devicerequest-example-insulinpump.json similarity index 100% rename from crates/fhir/tests/data/R4B/devicerequest-example-insulinpump.json rename to crates/fhir/tests/data/json/R4B/devicerequest-example-insulinpump.json diff --git a/crates/fhir/tests/data/R4B/devicerequest-example.json b/crates/fhir/tests/data/json/R4B/devicerequest-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/devicerequest-example.json rename to crates/fhir/tests/data/json/R4B/devicerequest-example.json diff --git a/crates/fhir/tests/data/R4B/devicerequest-left-lens.json b/crates/fhir/tests/data/json/R4B/devicerequest-left-lens.json similarity index 100% rename from crates/fhir/tests/data/R4B/devicerequest-left-lens.json rename to crates/fhir/tests/data/json/R4B/devicerequest-left-lens.json diff --git a/crates/fhir/tests/data/R4B/devicerequest-questionnaire.json b/crates/fhir/tests/data/json/R4B/devicerequest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/devicerequest-questionnaire.json rename to crates/fhir/tests/data/json/R4B/devicerequest-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/devicerequest-right-lens.json b/crates/fhir/tests/data/json/R4B/devicerequest-right-lens.json similarity index 100% rename from crates/fhir/tests/data/R4B/devicerequest-right-lens.json rename to crates/fhir/tests/data/json/R4B/devicerequest-right-lens.json diff --git a/crates/fhir/tests/data/R4B/devicerequest.profile.json b/crates/fhir/tests/data/json/R4B/devicerequest.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/devicerequest.profile.json rename to crates/fhir/tests/data/json/R4B/devicerequest.profile.json diff --git a/crates/fhir/tests/data/R4B/deviceusestatement-example.json b/crates/fhir/tests/data/json/R4B/deviceusestatement-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/deviceusestatement-example.json rename to crates/fhir/tests/data/json/R4B/deviceusestatement-example.json diff --git a/crates/fhir/tests/data/R4B/deviceusestatement-questionnaire.json b/crates/fhir/tests/data/json/R4B/deviceusestatement-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/deviceusestatement-questionnaire.json rename to crates/fhir/tests/data/json/R4B/deviceusestatement-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/deviceusestatement.profile.json b/crates/fhir/tests/data/json/R4B/deviceusestatement.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/deviceusestatement.profile.json rename to crates/fhir/tests/data/json/R4B/deviceusestatement.profile.json diff --git a/crates/fhir/tests/data/R4B/diagnosticreport-example-dxa.json b/crates/fhir/tests/data/json/R4B/diagnosticreport-example-dxa.json similarity index 100% rename from crates/fhir/tests/data/R4B/diagnosticreport-example-dxa.json rename to crates/fhir/tests/data/json/R4B/diagnosticreport-example-dxa.json diff --git a/crates/fhir/tests/data/R4B/diagnosticreport-example-f001-bloodexam.json b/crates/fhir/tests/data/json/R4B/diagnosticreport-example-f001-bloodexam.json similarity index 100% rename from crates/fhir/tests/data/R4B/diagnosticreport-example-f001-bloodexam.json rename to crates/fhir/tests/data/json/R4B/diagnosticreport-example-f001-bloodexam.json diff --git a/crates/fhir/tests/data/R4B/diagnosticreport-example-f201-brainct.json b/crates/fhir/tests/data/json/R4B/diagnosticreport-example-f201-brainct.json similarity index 100% rename from crates/fhir/tests/data/R4B/diagnosticreport-example-f201-brainct.json rename to crates/fhir/tests/data/json/R4B/diagnosticreport-example-f201-brainct.json diff --git a/crates/fhir/tests/data/R4B/diagnosticreport-example-f202-bloodculture.json b/crates/fhir/tests/data/json/R4B/diagnosticreport-example-f202-bloodculture.json similarity index 100% rename from crates/fhir/tests/data/R4B/diagnosticreport-example-f202-bloodculture.json rename to crates/fhir/tests/data/json/R4B/diagnosticreport-example-f202-bloodculture.json diff --git a/crates/fhir/tests/data/R4B/diagnosticreport-example-ghp.json b/crates/fhir/tests/data/json/R4B/diagnosticreport-example-ghp.json similarity index 100% rename from crates/fhir/tests/data/R4B/diagnosticreport-example-ghp.json rename to crates/fhir/tests/data/json/R4B/diagnosticreport-example-ghp.json diff --git a/crates/fhir/tests/data/R4B/diagnosticreport-example-gingival-mass.json b/crates/fhir/tests/data/json/R4B/diagnosticreport-example-gingival-mass.json similarity index 100% rename from crates/fhir/tests/data/R4B/diagnosticreport-example-gingival-mass.json rename to crates/fhir/tests/data/json/R4B/diagnosticreport-example-gingival-mass.json diff --git a/crates/fhir/tests/data/R4B/diagnosticreport-example-lri.json b/crates/fhir/tests/data/json/R4B/diagnosticreport-example-lri.json similarity index 100% rename from crates/fhir/tests/data/R4B/diagnosticreport-example-lri.json rename to crates/fhir/tests/data/json/R4B/diagnosticreport-example-lri.json diff --git a/crates/fhir/tests/data/R4B/diagnosticreport-example-papsmear.json b/crates/fhir/tests/data/json/R4B/diagnosticreport-example-papsmear.json similarity index 100% rename from crates/fhir/tests/data/R4B/diagnosticreport-example-papsmear.json rename to crates/fhir/tests/data/json/R4B/diagnosticreport-example-papsmear.json diff --git a/crates/fhir/tests/data/R4B/diagnosticreport-example-pgx.json b/crates/fhir/tests/data/json/R4B/diagnosticreport-example-pgx.json similarity index 100% rename from crates/fhir/tests/data/R4B/diagnosticreport-example-pgx.json rename to crates/fhir/tests/data/json/R4B/diagnosticreport-example-pgx.json diff --git a/crates/fhir/tests/data/R4B/diagnosticreport-example-ultrasound.json b/crates/fhir/tests/data/json/R4B/diagnosticreport-example-ultrasound.json similarity index 100% rename from crates/fhir/tests/data/R4B/diagnosticreport-example-ultrasound.json rename to crates/fhir/tests/data/json/R4B/diagnosticreport-example-ultrasound.json diff --git a/crates/fhir/tests/data/R4B/diagnosticreport-example.json b/crates/fhir/tests/data/json/R4B/diagnosticreport-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/diagnosticreport-example.json rename to crates/fhir/tests/data/json/R4B/diagnosticreport-example.json diff --git a/crates/fhir/tests/data/R4B/diagnosticreport-examples-general.json b/crates/fhir/tests/data/json/R4B/diagnosticreport-examples-general.json similarity index 100% rename from crates/fhir/tests/data/R4B/diagnosticreport-examples-general.json rename to crates/fhir/tests/data/json/R4B/diagnosticreport-examples-general.json diff --git a/crates/fhir/tests/data/R4B/diagnosticreport-genetic-DiagnosticReport-assessed-condition.json b/crates/fhir/tests/data/json/R4B/diagnosticreport-genetic-DiagnosticReport-assessed-condition.json similarity index 100% rename from crates/fhir/tests/data/R4B/diagnosticreport-genetic-DiagnosticReport-assessed-condition.json rename to crates/fhir/tests/data/json/R4B/diagnosticreport-genetic-DiagnosticReport-assessed-condition.json diff --git a/crates/fhir/tests/data/R4B/diagnosticreport-genetics-questionnaire.json b/crates/fhir/tests/data/json/R4B/diagnosticreport-genetics-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/diagnosticreport-genetics-questionnaire.json rename to crates/fhir/tests/data/json/R4B/diagnosticreport-genetics-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/diagnosticreport-genetics.profile.json b/crates/fhir/tests/data/json/R4B/diagnosticreport-genetics.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/diagnosticreport-genetics.profile.json rename to crates/fhir/tests/data/json/R4B/diagnosticreport-genetics.profile.json diff --git a/crates/fhir/tests/data/R4B/diagnosticreport-micro1.json b/crates/fhir/tests/data/json/R4B/diagnosticreport-micro1.json similarity index 100% rename from crates/fhir/tests/data/R4B/diagnosticreport-micro1.json rename to crates/fhir/tests/data/json/R4B/diagnosticreport-micro1.json diff --git a/crates/fhir/tests/data/R4B/diagnosticreport-questionnaire.json b/crates/fhir/tests/data/json/R4B/diagnosticreport-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/diagnosticreport-questionnaire.json rename to crates/fhir/tests/data/json/R4B/diagnosticreport-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/diagnosticreport.profile.json b/crates/fhir/tests/data/json/R4B/diagnosticreport.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/diagnosticreport.profile.json rename to crates/fhir/tests/data/json/R4B/diagnosticreport.profile.json diff --git a/crates/fhir/tests/data/R4B/distance.profile.json b/crates/fhir/tests/data/json/R4B/distance.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/distance.profile.json rename to crates/fhir/tests/data/json/R4B/distance.profile.json diff --git a/crates/fhir/tests/data/R4B/document-example-dischargesummary.json b/crates/fhir/tests/data/json/R4B/document-example-dischargesummary.json similarity index 100% rename from crates/fhir/tests/data/R4B/document-example-dischargesummary.json rename to crates/fhir/tests/data/json/R4B/document-example-dischargesummary.json diff --git a/crates/fhir/tests/data/R4B/documentmanifest-example.json b/crates/fhir/tests/data/json/R4B/documentmanifest-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/documentmanifest-example.json rename to crates/fhir/tests/data/json/R4B/documentmanifest-example.json diff --git a/crates/fhir/tests/data/R4B/documentmanifest-fm-attachment.json b/crates/fhir/tests/data/json/R4B/documentmanifest-fm-attachment.json similarity index 100% rename from crates/fhir/tests/data/R4B/documentmanifest-fm-attachment.json rename to crates/fhir/tests/data/json/R4B/documentmanifest-fm-attachment.json diff --git a/crates/fhir/tests/data/R4B/documentmanifest-questionnaire.json b/crates/fhir/tests/data/json/R4B/documentmanifest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/documentmanifest-questionnaire.json rename to crates/fhir/tests/data/json/R4B/documentmanifest-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/documentmanifest.profile.json b/crates/fhir/tests/data/json/R4B/documentmanifest.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/documentmanifest.profile.json rename to crates/fhir/tests/data/json/R4B/documentmanifest.profile.json diff --git a/crates/fhir/tests/data/R4B/documentreference-example.json b/crates/fhir/tests/data/json/R4B/documentreference-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/documentreference-example.json rename to crates/fhir/tests/data/json/R4B/documentreference-example.json diff --git a/crates/fhir/tests/data/R4B/documentreference-questionnaire.json b/crates/fhir/tests/data/json/R4B/documentreference-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/documentreference-questionnaire.json rename to crates/fhir/tests/data/json/R4B/documentreference-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/documentreference.profile.json b/crates/fhir/tests/data/json/R4B/documentreference.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/documentreference.profile.json rename to crates/fhir/tests/data/json/R4B/documentreference.profile.json diff --git a/crates/fhir/tests/data/R4B/domainresource.profile.json b/crates/fhir/tests/data/json/R4B/domainresource.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/domainresource.profile.json rename to crates/fhir/tests/data/json/R4B/domainresource.profile.json diff --git a/crates/fhir/tests/data/R4B/dosage.profile.json b/crates/fhir/tests/data/json/R4B/dosage.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/dosage.profile.json rename to crates/fhir/tests/data/json/R4B/dosage.profile.json diff --git a/crates/fhir/tests/data/R4B/duration.profile.json b/crates/fhir/tests/data/json/R4B/duration.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/duration.profile.json rename to crates/fhir/tests/data/json/R4B/duration.profile.json diff --git a/crates/fhir/tests/data/R4B/element.profile.json b/crates/fhir/tests/data/json/R4B/element.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/element.profile.json rename to crates/fhir/tests/data/json/R4B/element.profile.json diff --git a/crates/fhir/tests/data/R4B/elementdefinition-de-questionnaire.json b/crates/fhir/tests/data/json/R4B/elementdefinition-de-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/elementdefinition-de-questionnaire.json rename to crates/fhir/tests/data/json/R4B/elementdefinition-de-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/elementdefinition-de.profile.json b/crates/fhir/tests/data/json/R4B/elementdefinition-de.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/elementdefinition-de.profile.json rename to crates/fhir/tests/data/json/R4B/elementdefinition-de.profile.json diff --git a/crates/fhir/tests/data/R4B/elementdefinition.profile.json b/crates/fhir/tests/data/json/R4B/elementdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/elementdefinition.profile.json rename to crates/fhir/tests/data/json/R4B/elementdefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/encounter-example-emerg.json b/crates/fhir/tests/data/json/R4B/encounter-example-emerg.json similarity index 100% rename from crates/fhir/tests/data/R4B/encounter-example-emerg.json rename to crates/fhir/tests/data/json/R4B/encounter-example-emerg.json diff --git a/crates/fhir/tests/data/R4B/encounter-example-f001-heart.json b/crates/fhir/tests/data/json/R4B/encounter-example-f001-heart.json similarity index 100% rename from crates/fhir/tests/data/R4B/encounter-example-f001-heart.json rename to crates/fhir/tests/data/json/R4B/encounter-example-f001-heart.json diff --git a/crates/fhir/tests/data/R4B/encounter-example-f002-lung.json b/crates/fhir/tests/data/json/R4B/encounter-example-f002-lung.json similarity index 100% rename from crates/fhir/tests/data/R4B/encounter-example-f002-lung.json rename to crates/fhir/tests/data/json/R4B/encounter-example-f002-lung.json diff --git a/crates/fhir/tests/data/R4B/encounter-example-f003-abscess.json b/crates/fhir/tests/data/json/R4B/encounter-example-f003-abscess.json similarity index 100% rename from crates/fhir/tests/data/R4B/encounter-example-f003-abscess.json rename to crates/fhir/tests/data/json/R4B/encounter-example-f003-abscess.json diff --git a/crates/fhir/tests/data/R4B/encounter-example-f201-20130404.json b/crates/fhir/tests/data/json/R4B/encounter-example-f201-20130404.json similarity index 100% rename from crates/fhir/tests/data/R4B/encounter-example-f201-20130404.json rename to crates/fhir/tests/data/json/R4B/encounter-example-f201-20130404.json diff --git a/crates/fhir/tests/data/R4B/encounter-example-f202-20130128.json b/crates/fhir/tests/data/json/R4B/encounter-example-f202-20130128.json similarity index 100% rename from crates/fhir/tests/data/R4B/encounter-example-f202-20130128.json rename to crates/fhir/tests/data/json/R4B/encounter-example-f202-20130128.json diff --git a/crates/fhir/tests/data/R4B/encounter-example-f203-20130311.json b/crates/fhir/tests/data/json/R4B/encounter-example-f203-20130311.json similarity index 100% rename from crates/fhir/tests/data/R4B/encounter-example-f203-20130311.json rename to crates/fhir/tests/data/json/R4B/encounter-example-f203-20130311.json diff --git a/crates/fhir/tests/data/R4B/encounter-example-home.json b/crates/fhir/tests/data/json/R4B/encounter-example-home.json similarity index 100% rename from crates/fhir/tests/data/R4B/encounter-example-home.json rename to crates/fhir/tests/data/json/R4B/encounter-example-home.json diff --git a/crates/fhir/tests/data/R4B/encounter-example-xcda.json b/crates/fhir/tests/data/json/R4B/encounter-example-xcda.json similarity index 100% rename from crates/fhir/tests/data/R4B/encounter-example-xcda.json rename to crates/fhir/tests/data/json/R4B/encounter-example-xcda.json diff --git a/crates/fhir/tests/data/R4B/encounter-example.json b/crates/fhir/tests/data/json/R4B/encounter-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/encounter-example.json rename to crates/fhir/tests/data/json/R4B/encounter-example.json diff --git a/crates/fhir/tests/data/R4B/encounter-questionnaire.json b/crates/fhir/tests/data/json/R4B/encounter-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/encounter-questionnaire.json rename to crates/fhir/tests/data/json/R4B/encounter-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/encounter.profile.json b/crates/fhir/tests/data/json/R4B/encounter.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/encounter.profile.json rename to crates/fhir/tests/data/json/R4B/encounter.profile.json diff --git a/crates/fhir/tests/data/R4B/endpoint-example-direct.json b/crates/fhir/tests/data/json/R4B/endpoint-example-direct.json similarity index 100% rename from crates/fhir/tests/data/R4B/endpoint-example-direct.json rename to crates/fhir/tests/data/json/R4B/endpoint-example-direct.json diff --git a/crates/fhir/tests/data/R4B/endpoint-example-iid.json b/crates/fhir/tests/data/json/R4B/endpoint-example-iid.json similarity index 100% rename from crates/fhir/tests/data/R4B/endpoint-example-iid.json rename to crates/fhir/tests/data/json/R4B/endpoint-example-iid.json diff --git a/crates/fhir/tests/data/R4B/endpoint-example-wadors.json b/crates/fhir/tests/data/json/R4B/endpoint-example-wadors.json similarity index 100% rename from crates/fhir/tests/data/R4B/endpoint-example-wadors.json rename to crates/fhir/tests/data/json/R4B/endpoint-example-wadors.json diff --git a/crates/fhir/tests/data/R4B/endpoint-example.json b/crates/fhir/tests/data/json/R4B/endpoint-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/endpoint-example.json rename to crates/fhir/tests/data/json/R4B/endpoint-example.json diff --git a/crates/fhir/tests/data/R4B/endpoint-examples-general-template.json b/crates/fhir/tests/data/json/R4B/endpoint-examples-general-template.json similarity index 100% rename from crates/fhir/tests/data/R4B/endpoint-examples-general-template.json rename to crates/fhir/tests/data/json/R4B/endpoint-examples-general-template.json diff --git a/crates/fhir/tests/data/R4B/endpoint-questionnaire.json b/crates/fhir/tests/data/json/R4B/endpoint-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/endpoint-questionnaire.json rename to crates/fhir/tests/data/json/R4B/endpoint-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/endpoint.profile.json b/crates/fhir/tests/data/json/R4B/endpoint.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/endpoint.profile.json rename to crates/fhir/tests/data/json/R4B/endpoint.profile.json diff --git a/crates/fhir/tests/data/R4B/enrollmentrequest-example.json b/crates/fhir/tests/data/json/R4B/enrollmentrequest-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/enrollmentrequest-example.json rename to crates/fhir/tests/data/json/R4B/enrollmentrequest-example.json diff --git a/crates/fhir/tests/data/R4B/enrollmentrequest-questionnaire.json b/crates/fhir/tests/data/json/R4B/enrollmentrequest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/enrollmentrequest-questionnaire.json rename to crates/fhir/tests/data/json/R4B/enrollmentrequest-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/enrollmentrequest.profile.json b/crates/fhir/tests/data/json/R4B/enrollmentrequest.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/enrollmentrequest.profile.json rename to crates/fhir/tests/data/json/R4B/enrollmentrequest.profile.json diff --git a/crates/fhir/tests/data/R4B/enrollmentresponse-example.json b/crates/fhir/tests/data/json/R4B/enrollmentresponse-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/enrollmentresponse-example.json rename to crates/fhir/tests/data/json/R4B/enrollmentresponse-example.json diff --git a/crates/fhir/tests/data/R4B/enrollmentresponse-questionnaire.json b/crates/fhir/tests/data/json/R4B/enrollmentresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/enrollmentresponse-questionnaire.json rename to crates/fhir/tests/data/json/R4B/enrollmentresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/enrollmentresponse.profile.json b/crates/fhir/tests/data/json/R4B/enrollmentresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/enrollmentresponse.profile.json rename to crates/fhir/tests/data/json/R4B/enrollmentresponse.profile.json diff --git a/crates/fhir/tests/data/R4B/episodeofcare-example.json b/crates/fhir/tests/data/json/R4B/episodeofcare-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/episodeofcare-example.json rename to crates/fhir/tests/data/json/R4B/episodeofcare-example.json diff --git a/crates/fhir/tests/data/R4B/episodeofcare-questionnaire.json b/crates/fhir/tests/data/json/R4B/episodeofcare-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/episodeofcare-questionnaire.json rename to crates/fhir/tests/data/json/R4B/episodeofcare-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/episodeofcare.profile.json b/crates/fhir/tests/data/json/R4B/episodeofcare.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/episodeofcare.profile.json rename to crates/fhir/tests/data/json/R4B/episodeofcare.profile.json diff --git a/crates/fhir/tests/data/R4B/event.json b/crates/fhir/tests/data/json/R4B/event.json similarity index 100% rename from crates/fhir/tests/data/R4B/event.json rename to crates/fhir/tests/data/json/R4B/event.json diff --git a/crates/fhir/tests/data/R4B/eventdefinition-example.json b/crates/fhir/tests/data/json/R4B/eventdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/eventdefinition-example.json rename to crates/fhir/tests/data/json/R4B/eventdefinition-example.json diff --git a/crates/fhir/tests/data/R4B/eventdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/eventdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/eventdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/eventdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/eventdefinition.profile.json b/crates/fhir/tests/data/json/R4B/eventdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/eventdefinition.profile.json rename to crates/fhir/tests/data/json/R4B/eventdefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/evidence-example-ASTRAL-12-alteplase-mRS3-6.json b/crates/fhir/tests/data/json/R4B/evidence-example-ASTRAL-12-alteplase-mRS3-6.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidence-example-ASTRAL-12-alteplase-mRS3-6.json rename to crates/fhir/tests/data/json/R4B/evidence-example-ASTRAL-12-alteplase-mRS3-6.json diff --git a/crates/fhir/tests/data/R4B/evidence-example-stroke-0-3-alteplase-vs-no-alteplase-mRS3-6.json b/crates/fhir/tests/data/json/R4B/evidence-example-stroke-0-3-alteplase-vs-no-alteplase-mRS3-6.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidence-example-stroke-0-3-alteplase-vs-no-alteplase-mRS3-6.json rename to crates/fhir/tests/data/json/R4B/evidence-example-stroke-0-3-alteplase-vs-no-alteplase-mRS3-6.json diff --git a/crates/fhir/tests/data/R4B/evidence-example-stroke-3-4half-alteplase-vs-no-alteplase-mRS0-2.json b/crates/fhir/tests/data/json/R4B/evidence-example-stroke-3-4half-alteplase-vs-no-alteplase-mRS0-2.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidence-example-stroke-3-4half-alteplase-vs-no-alteplase-mRS0-2.json rename to crates/fhir/tests/data/json/R4B/evidence-example-stroke-3-4half-alteplase-vs-no-alteplase-mRS0-2.json diff --git a/crates/fhir/tests/data/R4B/evidence-example-stroke-alteplase-fatalICH.json b/crates/fhir/tests/data/json/R4B/evidence-example-stroke-alteplase-fatalICH.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidence-example-stroke-alteplase-fatalICH.json rename to crates/fhir/tests/data/json/R4B/evidence-example-stroke-alteplase-fatalICH.json diff --git a/crates/fhir/tests/data/R4B/evidence-example-stroke-no-alteplase-fatalICH.json b/crates/fhir/tests/data/json/R4B/evidence-example-stroke-no-alteplase-fatalICH.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidence-example-stroke-no-alteplase-fatalICH.json rename to crates/fhir/tests/data/json/R4B/evidence-example-stroke-no-alteplase-fatalICH.json diff --git a/crates/fhir/tests/data/R4B/evidence-questionnaire.json b/crates/fhir/tests/data/json/R4B/evidence-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidence-questionnaire.json rename to crates/fhir/tests/data/json/R4B/evidence-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/evidence.profile.json b/crates/fhir/tests/data/json/R4B/evidence.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidence.profile.json rename to crates/fhir/tests/data/json/R4B/evidence.profile.json diff --git a/crates/fhir/tests/data/R4B/evidencereport-example.json b/crates/fhir/tests/data/json/R4B/evidencereport-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidencereport-example.json rename to crates/fhir/tests/data/json/R4B/evidencereport-example.json diff --git a/crates/fhir/tests/data/R4B/evidencereport-questionnaire.json b/crates/fhir/tests/data/json/R4B/evidencereport-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidencereport-questionnaire.json rename to crates/fhir/tests/data/json/R4B/evidencereport-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/evidencereport.profile.json b/crates/fhir/tests/data/json/R4B/evidencereport.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidencereport.profile.json rename to crates/fhir/tests/data/json/R4B/evidencereport.profile.json diff --git a/crates/fhir/tests/data/R4B/evidencevariable-example-Stroke-Thrombolysis-Trialists-2014-2016-IPD-MA-Cohort.json b/crates/fhir/tests/data/json/R4B/evidencevariable-example-Stroke-Thrombolysis-Trialists-2014-2016-IPD-MA-Cohort.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidencevariable-example-Stroke-Thrombolysis-Trialists-2014-2016-IPD-MA-Cohort.json rename to crates/fhir/tests/data/json/R4B/evidencevariable-example-Stroke-Thrombolysis-Trialists-2014-2016-IPD-MA-Cohort.json diff --git a/crates/fhir/tests/data/R4B/evidencevariable-example-Wardlaw2014Analysis1.16.3EvidenceSet.json b/crates/fhir/tests/data/json/R4B/evidencevariable-example-Wardlaw2014Analysis1.16.3EvidenceSet.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidencevariable-example-Wardlaw2014Analysis1.16.3EvidenceSet.json rename to crates/fhir/tests/data/json/R4B/evidencevariable-example-Wardlaw2014Analysis1.16.3EvidenceSet.json diff --git a/crates/fhir/tests/data/R4B/evidencevariable-example-alive-independent-90day.json b/crates/fhir/tests/data/json/R4B/evidencevariable-example-alive-independent-90day.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidencevariable-example-alive-independent-90day.json rename to crates/fhir/tests/data/json/R4B/evidencevariable-example-alive-independent-90day.json diff --git a/crates/fhir/tests/data/R4B/evidencevariable-example-alteplase-for-stroke.json b/crates/fhir/tests/data/json/R4B/evidencevariable-example-alteplase-for-stroke.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidencevariable-example-alteplase-for-stroke.json rename to crates/fhir/tests/data/json/R4B/evidencevariable-example-alteplase-for-stroke.json diff --git a/crates/fhir/tests/data/R4B/evidencevariable-example-dead-or-dependent-90day.json b/crates/fhir/tests/data/json/R4B/evidencevariable-example-dead-or-dependent-90day.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidencevariable-example-dead-or-dependent-90day.json rename to crates/fhir/tests/data/json/R4B/evidencevariable-example-dead-or-dependent-90day.json diff --git a/crates/fhir/tests/data/R4B/evidencevariable-example-fatal-ICH-in-7-days.json b/crates/fhir/tests/data/json/R4B/evidencevariable-example-fatal-ICH-in-7-days.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidencevariable-example-fatal-ICH-in-7-days.json rename to crates/fhir/tests/data/json/R4B/evidencevariable-example-fatal-ICH-in-7-days.json diff --git a/crates/fhir/tests/data/R4B/evidencevariable-example-mRS0-2-at-90days.json b/crates/fhir/tests/data/json/R4B/evidencevariable-example-mRS0-2-at-90days.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidencevariable-example-mRS0-2-at-90days.json rename to crates/fhir/tests/data/json/R4B/evidencevariable-example-mRS0-2-at-90days.json diff --git a/crates/fhir/tests/data/R4B/evidencevariable-example-mRS3-6-at-90days.json b/crates/fhir/tests/data/json/R4B/evidencevariable-example-mRS3-6-at-90days.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidencevariable-example-mRS3-6-at-90days.json rename to crates/fhir/tests/data/json/R4B/evidencevariable-example-mRS3-6-at-90days.json diff --git a/crates/fhir/tests/data/R4B/evidencevariable-example-no-alteplase.json b/crates/fhir/tests/data/json/R4B/evidencevariable-example-no-alteplase.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidencevariable-example-no-alteplase.json rename to crates/fhir/tests/data/json/R4B/evidencevariable-example-no-alteplase.json diff --git a/crates/fhir/tests/data/R4B/evidencevariable-example-placebo.json b/crates/fhir/tests/data/json/R4B/evidencevariable-example-placebo.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidencevariable-example-placebo.json rename to crates/fhir/tests/data/json/R4B/evidencevariable-example-placebo.json diff --git a/crates/fhir/tests/data/R4B/evidencevariable-questionnaire.json b/crates/fhir/tests/data/json/R4B/evidencevariable-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidencevariable-questionnaire.json rename to crates/fhir/tests/data/json/R4B/evidencevariable-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/evidencevariable.profile.json b/crates/fhir/tests/data/json/R4B/evidencevariable.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/evidencevariable.profile.json rename to crates/fhir/tests/data/json/R4B/evidencevariable.profile.json diff --git a/crates/fhir/tests/data/R4B/examples.json.zip b/crates/fhir/tests/data/json/R4B/examples.json.zip similarity index 100% rename from crates/fhir/tests/data/R4B/examples.json.zip rename to crates/fhir/tests/data/json/R4B/examples.json.zip diff --git a/crates/fhir/tests/data/R4B/examplescenario-example.json b/crates/fhir/tests/data/json/R4B/examplescenario-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/examplescenario-example.json rename to crates/fhir/tests/data/json/R4B/examplescenario-example.json diff --git a/crates/fhir/tests/data/R4B/examplescenario-questionnaire.json b/crates/fhir/tests/data/json/R4B/examplescenario-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/examplescenario-questionnaire.json rename to crates/fhir/tests/data/json/R4B/examplescenario-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/examplescenario.profile.json b/crates/fhir/tests/data/json/R4B/examplescenario.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/examplescenario.profile.json rename to crates/fhir/tests/data/json/R4B/examplescenario.profile.json diff --git a/crates/fhir/tests/data/R4B/explanationofbenefit-example-2.json b/crates/fhir/tests/data/json/R4B/explanationofbenefit-example-2.json similarity index 100% rename from crates/fhir/tests/data/R4B/explanationofbenefit-example-2.json rename to crates/fhir/tests/data/json/R4B/explanationofbenefit-example-2.json diff --git a/crates/fhir/tests/data/R4B/explanationofbenefit-example.json b/crates/fhir/tests/data/json/R4B/explanationofbenefit-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/explanationofbenefit-example.json rename to crates/fhir/tests/data/json/R4B/explanationofbenefit-example.json diff --git a/crates/fhir/tests/data/R4B/explanationofbenefit-questionnaire.json b/crates/fhir/tests/data/json/R4B/explanationofbenefit-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/explanationofbenefit-questionnaire.json rename to crates/fhir/tests/data/json/R4B/explanationofbenefit-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/explanationofbenefit.profile.json b/crates/fhir/tests/data/json/R4B/explanationofbenefit.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/explanationofbenefit.profile.json rename to crates/fhir/tests/data/json/R4B/explanationofbenefit.profile.json diff --git a/crates/fhir/tests/data/R4B/expression.profile.json b/crates/fhir/tests/data/json/R4B/expression.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/expression.profile.json rename to crates/fhir/tests/data/json/R4B/expression.profile.json diff --git a/crates/fhir/tests/data/R4B/extension-11179-objectclass.json b/crates/fhir/tests/data/json/R4B/extension-11179-objectclass.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-11179-objectclass.json rename to crates/fhir/tests/data/json/R4B/extension-11179-objectclass.json diff --git a/crates/fhir/tests/data/R4B/extension-11179-objectclassproperty.json b/crates/fhir/tests/data/json/R4B/extension-11179-objectclassproperty.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-11179-objectclassproperty.json rename to crates/fhir/tests/data/json/R4B/extension-11179-objectclassproperty.json diff --git a/crates/fhir/tests/data/R4B/extension-11179-permitted-value-conceptmap.json b/crates/fhir/tests/data/json/R4B/extension-11179-permitted-value-conceptmap.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-11179-permitted-value-conceptmap.json rename to crates/fhir/tests/data/json/R4B/extension-11179-permitted-value-conceptmap.json diff --git a/crates/fhir/tests/data/R4B/extension-11179-permitted-value-valueset.json b/crates/fhir/tests/data/json/R4B/extension-11179-permitted-value-valueset.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-11179-permitted-value-valueset.json rename to crates/fhir/tests/data/json/R4B/extension-11179-permitted-value-valueset.json diff --git a/crates/fhir/tests/data/R4B/extension-allergyintolerance-asserteddate.json b/crates/fhir/tests/data/json/R4B/extension-allergyintolerance-asserteddate.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-allergyintolerance-asserteddate.json rename to crates/fhir/tests/data/json/R4B/extension-allergyintolerance-asserteddate.json diff --git a/crates/fhir/tests/data/R4B/extension-allergyintolerance-certainty.json b/crates/fhir/tests/data/json/R4B/extension-allergyintolerance-certainty.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-allergyintolerance-certainty.json rename to crates/fhir/tests/data/json/R4B/extension-allergyintolerance-certainty.json diff --git a/crates/fhir/tests/data/R4B/extension-allergyintolerance-duration.json b/crates/fhir/tests/data/json/R4B/extension-allergyintolerance-duration.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-allergyintolerance-duration.json rename to crates/fhir/tests/data/json/R4B/extension-allergyintolerance-duration.json diff --git a/crates/fhir/tests/data/R4B/extension-allergyintolerance-reasonrefuted.json b/crates/fhir/tests/data/json/R4B/extension-allergyintolerance-reasonrefuted.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-allergyintolerance-reasonrefuted.json rename to crates/fhir/tests/data/json/R4B/extension-allergyintolerance-reasonrefuted.json diff --git a/crates/fhir/tests/data/R4B/extension-allergyintolerance-resolutionage.json b/crates/fhir/tests/data/json/R4B/extension-allergyintolerance-resolutionage.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-allergyintolerance-resolutionage.json rename to crates/fhir/tests/data/json/R4B/extension-allergyintolerance-resolutionage.json diff --git a/crates/fhir/tests/data/R4B/extension-allergyintolerance-substanceexposurerisk.json b/crates/fhir/tests/data/json/R4B/extension-allergyintolerance-substanceexposurerisk.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-allergyintolerance-substanceexposurerisk.json rename to crates/fhir/tests/data/json/R4B/extension-allergyintolerance-substanceexposurerisk.json diff --git a/crates/fhir/tests/data/R4B/extension-auditevent-accession.json b/crates/fhir/tests/data/json/R4B/extension-auditevent-accession.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-auditevent-accession.json rename to crates/fhir/tests/data/json/R4B/extension-auditevent-accession.json diff --git a/crates/fhir/tests/data/R4B/extension-auditevent-anonymized.json b/crates/fhir/tests/data/json/R4B/extension-auditevent-anonymized.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-auditevent-anonymized.json rename to crates/fhir/tests/data/json/R4B/extension-auditevent-anonymized.json diff --git a/crates/fhir/tests/data/R4B/extension-auditevent-encrypted.json b/crates/fhir/tests/data/json/R4B/extension-auditevent-encrypted.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-auditevent-encrypted.json rename to crates/fhir/tests/data/json/R4B/extension-auditevent-encrypted.json diff --git a/crates/fhir/tests/data/R4B/extension-auditevent-instance.json b/crates/fhir/tests/data/json/R4B/extension-auditevent-instance.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-auditevent-instance.json rename to crates/fhir/tests/data/json/R4B/extension-auditevent-instance.json diff --git a/crates/fhir/tests/data/R4B/extension-auditevent-mpps.json b/crates/fhir/tests/data/json/R4B/extension-auditevent-mpps.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-auditevent-mpps.json rename to crates/fhir/tests/data/json/R4B/extension-auditevent-mpps.json diff --git a/crates/fhir/tests/data/R4B/extension-auditevent-numberofinstances.json b/crates/fhir/tests/data/json/R4B/extension-auditevent-numberofinstances.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-auditevent-numberofinstances.json rename to crates/fhir/tests/data/json/R4B/extension-auditevent-numberofinstances.json diff --git a/crates/fhir/tests/data/R4B/extension-auditevent-participantobjectcontainsstudy.json b/crates/fhir/tests/data/json/R4B/extension-auditevent-participantobjectcontainsstudy.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-auditevent-participantobjectcontainsstudy.json rename to crates/fhir/tests/data/json/R4B/extension-auditevent-participantobjectcontainsstudy.json diff --git a/crates/fhir/tests/data/R4B/extension-auditevent-sopclass.json b/crates/fhir/tests/data/json/R4B/extension-auditevent-sopclass.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-auditevent-sopclass.json rename to crates/fhir/tests/data/json/R4B/extension-auditevent-sopclass.json diff --git a/crates/fhir/tests/data/R4B/extension-bodysite.json b/crates/fhir/tests/data/json/R4B/extension-bodysite.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-bodysite.json rename to crates/fhir/tests/data/json/R4B/extension-bodysite.json diff --git a/crates/fhir/tests/data/R4B/extension-capabilities.json b/crates/fhir/tests/data/json/R4B/extension-capabilities.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-capabilities.json rename to crates/fhir/tests/data/json/R4B/extension-capabilities.json diff --git a/crates/fhir/tests/data/R4B/extension-capabilitystatement-expectation.json b/crates/fhir/tests/data/json/R4B/extension-capabilitystatement-expectation.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-capabilitystatement-expectation.json rename to crates/fhir/tests/data/json/R4B/extension-capabilitystatement-expectation.json diff --git a/crates/fhir/tests/data/R4B/extension-capabilitystatement-prohibited.json b/crates/fhir/tests/data/json/R4B/extension-capabilitystatement-prohibited.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-capabilitystatement-prohibited.json rename to crates/fhir/tests/data/json/R4B/extension-capabilitystatement-prohibited.json diff --git a/crates/fhir/tests/data/R4B/extension-capabilitystatement-search-parameter-combination.json b/crates/fhir/tests/data/json/R4B/extension-capabilitystatement-search-parameter-combination.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-capabilitystatement-search-parameter-combination.json rename to crates/fhir/tests/data/json/R4B/extension-capabilitystatement-search-parameter-combination.json diff --git a/crates/fhir/tests/data/R4B/extension-capabilitystatement-supported-system.json b/crates/fhir/tests/data/json/R4B/extension-capabilitystatement-supported-system.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-capabilitystatement-supported-system.json rename to crates/fhir/tests/data/json/R4B/extension-capabilitystatement-supported-system.json diff --git a/crates/fhir/tests/data/R4B/extension-capabilitystatement-websocket.json b/crates/fhir/tests/data/json/R4B/extension-capabilitystatement-websocket.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-capabilitystatement-websocket.json rename to crates/fhir/tests/data/json/R4B/extension-capabilitystatement-websocket.json diff --git a/crates/fhir/tests/data/R4B/extension-careplan-activity-title.json b/crates/fhir/tests/data/json/R4B/extension-careplan-activity-title.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-careplan-activity-title.json rename to crates/fhir/tests/data/json/R4B/extension-careplan-activity-title.json diff --git a/crates/fhir/tests/data/R4B/extension-codesystem-alternate.json b/crates/fhir/tests/data/json/R4B/extension-codesystem-alternate.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-codesystem-alternate.json rename to crates/fhir/tests/data/json/R4B/extension-codesystem-alternate.json diff --git a/crates/fhir/tests/data/R4B/extension-codesystem-author.json b/crates/fhir/tests/data/json/R4B/extension-codesystem-author.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-codesystem-author.json rename to crates/fhir/tests/data/json/R4B/extension-codesystem-author.json diff --git a/crates/fhir/tests/data/R4B/extension-codesystem-concept-comments.json b/crates/fhir/tests/data/json/R4B/extension-codesystem-concept-comments.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-codesystem-concept-comments.json rename to crates/fhir/tests/data/json/R4B/extension-codesystem-concept-comments.json diff --git a/crates/fhir/tests/data/R4B/extension-codesystem-conceptorder.json b/crates/fhir/tests/data/json/R4B/extension-codesystem-conceptorder.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-codesystem-conceptorder.json rename to crates/fhir/tests/data/json/R4B/extension-codesystem-conceptorder.json diff --git a/crates/fhir/tests/data/R4B/extension-codesystem-effectivedate.json b/crates/fhir/tests/data/json/R4B/extension-codesystem-effectivedate.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-codesystem-effectivedate.json rename to crates/fhir/tests/data/json/R4B/extension-codesystem-effectivedate.json diff --git a/crates/fhir/tests/data/R4B/extension-codesystem-expirationdate.json b/crates/fhir/tests/data/json/R4B/extension-codesystem-expirationdate.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-codesystem-expirationdate.json rename to crates/fhir/tests/data/json/R4B/extension-codesystem-expirationdate.json diff --git a/crates/fhir/tests/data/R4B/extension-codesystem-history.json b/crates/fhir/tests/data/json/R4B/extension-codesystem-history.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-codesystem-history.json rename to crates/fhir/tests/data/json/R4B/extension-codesystem-history.json diff --git a/crates/fhir/tests/data/R4B/extension-codesystem-keyword.json b/crates/fhir/tests/data/json/R4B/extension-codesystem-keyword.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-codesystem-keyword.json rename to crates/fhir/tests/data/json/R4B/extension-codesystem-keyword.json diff --git a/crates/fhir/tests/data/R4B/extension-codesystem-label.json b/crates/fhir/tests/data/json/R4B/extension-codesystem-label.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-codesystem-label.json rename to crates/fhir/tests/data/json/R4B/extension-codesystem-label.json diff --git a/crates/fhir/tests/data/R4B/extension-codesystem-map.json b/crates/fhir/tests/data/json/R4B/extension-codesystem-map.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-codesystem-map.json rename to crates/fhir/tests/data/json/R4B/extension-codesystem-map.json diff --git a/crates/fhir/tests/data/R4B/extension-codesystem-othername.json b/crates/fhir/tests/data/json/R4B/extension-codesystem-othername.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-codesystem-othername.json rename to crates/fhir/tests/data/json/R4B/extension-codesystem-othername.json diff --git a/crates/fhir/tests/data/R4B/extension-codesystem-replacedby.json b/crates/fhir/tests/data/json/R4B/extension-codesystem-replacedby.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-codesystem-replacedby.json rename to crates/fhir/tests/data/json/R4B/extension-codesystem-replacedby.json diff --git a/crates/fhir/tests/data/R4B/extension-codesystem-sourcereference.json b/crates/fhir/tests/data/json/R4B/extension-codesystem-sourcereference.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-codesystem-sourcereference.json rename to crates/fhir/tests/data/json/R4B/extension-codesystem-sourcereference.json diff --git a/crates/fhir/tests/data/R4B/extension-codesystem-trusted-expansion.json b/crates/fhir/tests/data/json/R4B/extension-codesystem-trusted-expansion.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-codesystem-trusted-expansion.json rename to crates/fhir/tests/data/json/R4B/extension-codesystem-trusted-expansion.json diff --git a/crates/fhir/tests/data/R4B/extension-codesystem-usage.json b/crates/fhir/tests/data/json/R4B/extension-codesystem-usage.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-codesystem-usage.json rename to crates/fhir/tests/data/json/R4B/extension-codesystem-usage.json diff --git a/crates/fhir/tests/data/R4B/extension-codesystem-warning.json b/crates/fhir/tests/data/json/R4B/extension-codesystem-warning.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-codesystem-warning.json rename to crates/fhir/tests/data/json/R4B/extension-codesystem-warning.json diff --git a/crates/fhir/tests/data/R4B/extension-codesystem-workflowstatus.json b/crates/fhir/tests/data/json/R4B/extension-codesystem-workflowstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-codesystem-workflowstatus.json rename to crates/fhir/tests/data/json/R4B/extension-codesystem-workflowstatus.json diff --git a/crates/fhir/tests/data/R4B/extension-coding-sctdescid.json b/crates/fhir/tests/data/json/R4B/extension-coding-sctdescid.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-coding-sctdescid.json rename to crates/fhir/tests/data/json/R4B/extension-coding-sctdescid.json diff --git a/crates/fhir/tests/data/R4B/extension-communication-media.json b/crates/fhir/tests/data/json/R4B/extension-communication-media.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-communication-media.json rename to crates/fhir/tests/data/json/R4B/extension-communication-media.json diff --git a/crates/fhir/tests/data/R4B/extension-communicationrequest-initiatinglocation.json b/crates/fhir/tests/data/json/R4B/extension-communicationrequest-initiatinglocation.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-communicationrequest-initiatinglocation.json rename to crates/fhir/tests/data/json/R4B/extension-communicationrequest-initiatinglocation.json diff --git a/crates/fhir/tests/data/R4B/extension-composition-clinicaldocument-otherconfidentiality.json b/crates/fhir/tests/data/json/R4B/extension-composition-clinicaldocument-otherconfidentiality.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-composition-clinicaldocument-otherconfidentiality.json rename to crates/fhir/tests/data/json/R4B/extension-composition-clinicaldocument-otherconfidentiality.json diff --git a/crates/fhir/tests/data/R4B/extension-composition-clinicaldocument-versionnumber.json b/crates/fhir/tests/data/json/R4B/extension-composition-clinicaldocument-versionnumber.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-composition-clinicaldocument-versionnumber.json rename to crates/fhir/tests/data/json/R4B/extension-composition-clinicaldocument-versionnumber.json diff --git a/crates/fhir/tests/data/R4B/extension-composition-section-subject.json b/crates/fhir/tests/data/json/R4B/extension-composition-section-subject.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-composition-section-subject.json rename to crates/fhir/tests/data/json/R4B/extension-composition-section-subject.json diff --git a/crates/fhir/tests/data/R4B/extension-concept-bidirectional.json b/crates/fhir/tests/data/json/R4B/extension-concept-bidirectional.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-concept-bidirectional.json rename to crates/fhir/tests/data/json/R4B/extension-concept-bidirectional.json diff --git a/crates/fhir/tests/data/R4B/extension-condition-asserteddate.json b/crates/fhir/tests/data/json/R4B/extension-condition-asserteddate.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-condition-asserteddate.json rename to crates/fhir/tests/data/json/R4B/extension-condition-asserteddate.json diff --git a/crates/fhir/tests/data/R4B/extension-condition-dueto.json b/crates/fhir/tests/data/json/R4B/extension-condition-dueto.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-condition-dueto.json rename to crates/fhir/tests/data/json/R4B/extension-condition-dueto.json diff --git a/crates/fhir/tests/data/R4B/extension-condition-occurredfollowing.json b/crates/fhir/tests/data/json/R4B/extension-condition-occurredfollowing.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-condition-occurredfollowing.json rename to crates/fhir/tests/data/json/R4B/extension-condition-occurredfollowing.json diff --git a/crates/fhir/tests/data/R4B/extension-condition-outcome.json b/crates/fhir/tests/data/json/R4B/extension-condition-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-condition-outcome.json rename to crates/fhir/tests/data/json/R4B/extension-condition-outcome.json diff --git a/crates/fhir/tests/data/R4B/extension-condition-related.json b/crates/fhir/tests/data/json/R4B/extension-condition-related.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-condition-related.json rename to crates/fhir/tests/data/json/R4B/extension-condition-related.json diff --git a/crates/fhir/tests/data/R4B/extension-condition-ruledout.json b/crates/fhir/tests/data/json/R4B/extension-condition-ruledout.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-condition-ruledout.json rename to crates/fhir/tests/data/json/R4B/extension-condition-ruledout.json diff --git a/crates/fhir/tests/data/R4B/extension-consent-location.json b/crates/fhir/tests/data/json/R4B/extension-consent-location.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-consent-location.json rename to crates/fhir/tests/data/json/R4B/extension-consent-location.json diff --git a/crates/fhir/tests/data/R4B/extension-consent-notificationendpoint.json b/crates/fhir/tests/data/json/R4B/extension-consent-notificationendpoint.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-consent-notificationendpoint.json rename to crates/fhir/tests/data/json/R4B/extension-consent-notificationendpoint.json diff --git a/crates/fhir/tests/data/R4B/extension-consent-transcriber.json b/crates/fhir/tests/data/json/R4B/extension-consent-transcriber.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-consent-transcriber.json rename to crates/fhir/tests/data/json/R4B/extension-consent-transcriber.json diff --git a/crates/fhir/tests/data/R4B/extension-consent-witness.json b/crates/fhir/tests/data/json/R4B/extension-consent-witness.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-consent-witness.json rename to crates/fhir/tests/data/json/R4B/extension-consent-witness.json diff --git a/crates/fhir/tests/data/R4B/extension-contactpoint-area.json b/crates/fhir/tests/data/json/R4B/extension-contactpoint-area.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-contactpoint-area.json rename to crates/fhir/tests/data/json/R4B/extension-contactpoint-area.json diff --git a/crates/fhir/tests/data/R4B/extension-contactpoint-country.json b/crates/fhir/tests/data/json/R4B/extension-contactpoint-country.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-contactpoint-country.json rename to crates/fhir/tests/data/json/R4B/extension-contactpoint-country.json diff --git a/crates/fhir/tests/data/R4B/extension-contactpoint-extension.json b/crates/fhir/tests/data/json/R4B/extension-contactpoint-extension.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-contactpoint-extension.json rename to crates/fhir/tests/data/json/R4B/extension-contactpoint-extension.json diff --git a/crates/fhir/tests/data/R4B/extension-contactpoint-local.json b/crates/fhir/tests/data/json/R4B/extension-contactpoint-local.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-contactpoint-local.json rename to crates/fhir/tests/data/json/R4B/extension-contactpoint-local.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-calculatedvalue.json b/crates/fhir/tests/data/json/R4B/extension-cqf-calculatedvalue.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-calculatedvalue.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-calculatedvalue.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-cdshooksendpoint.json b/crates/fhir/tests/data/json/R4B/extension-cqf-cdshooksendpoint.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-cdshooksendpoint.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-cdshooksendpoint.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-certainty.json b/crates/fhir/tests/data/json/R4B/extension-cqf-certainty.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-certainty.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-certainty.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-citation.json b/crates/fhir/tests/data/json/R4B/extension-cqf-citation.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-citation.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-citation.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-contactaddress.json b/crates/fhir/tests/data/json/R4B/extension-cqf-contactaddress.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-contactaddress.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-contactaddress.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-contactreference.json b/crates/fhir/tests/data/json/R4B/extension-cqf-contactreference.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-contactreference.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-contactreference.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-contributiontime.json b/crates/fhir/tests/data/json/R4B/extension-cqf-contributiontime.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-contributiontime.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-contributiontime.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-encounterclass.json b/crates/fhir/tests/data/json/R4B/extension-cqf-encounterclass.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-encounterclass.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-encounterclass.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-encountertype.json b/crates/fhir/tests/data/json/R4B/extension-cqf-encountertype.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-encountertype.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-encountertype.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-expression.json b/crates/fhir/tests/data/json/R4B/extension-cqf-expression.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-expression.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-expression.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-initialvalue.json b/crates/fhir/tests/data/json/R4B/extension-cqf-initialvalue.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-initialvalue.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-initialvalue.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-initiatingorganization.json b/crates/fhir/tests/data/json/R4B/extension-cqf-initiatingorganization.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-initiatingorganization.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-initiatingorganization.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-initiatingperson.json b/crates/fhir/tests/data/json/R4B/extension-cqf-initiatingperson.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-initiatingperson.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-initiatingperson.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-library.json b/crates/fhir/tests/data/json/R4B/extension-cqf-library.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-library.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-library.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-measureinfo.json b/crates/fhir/tests/data/json/R4B/extension-cqf-measureinfo.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-measureinfo.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-measureinfo.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-qualityofevidence.json b/crates/fhir/tests/data/json/R4B/extension-cqf-qualityofevidence.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-qualityofevidence.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-qualityofevidence.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-receivingorganization.json b/crates/fhir/tests/data/json/R4B/extension-cqf-receivingorganization.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-receivingorganization.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-receivingorganization.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-receivingperson.json b/crates/fhir/tests/data/json/R4B/extension-cqf-receivingperson.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-receivingperson.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-receivingperson.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-recipientlanguage.json b/crates/fhir/tests/data/json/R4B/extension-cqf-recipientlanguage.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-recipientlanguage.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-recipientlanguage.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-recipienttype.json b/crates/fhir/tests/data/json/R4B/extension-cqf-recipienttype.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-recipienttype.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-recipienttype.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-relativedatetime.json b/crates/fhir/tests/data/json/R4B/extension-cqf-relativedatetime.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-relativedatetime.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-relativedatetime.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-strengthofrecommendation.json b/crates/fhir/tests/data/json/R4B/extension-cqf-strengthofrecommendation.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-strengthofrecommendation.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-strengthofrecommendation.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-systemuserlanguage.json b/crates/fhir/tests/data/json/R4B/extension-cqf-systemuserlanguage.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-systemuserlanguage.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-systemuserlanguage.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-systemusertaskcontext.json b/crates/fhir/tests/data/json/R4B/extension-cqf-systemusertaskcontext.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-systemusertaskcontext.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-systemusertaskcontext.json diff --git a/crates/fhir/tests/data/R4B/extension-cqf-systemusertype.json b/crates/fhir/tests/data/json/R4B/extension-cqf-systemusertype.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqf-systemusertype.json rename to crates/fhir/tests/data/json/R4B/extension-cqf-systemusertype.json diff --git a/crates/fhir/tests/data/R4B/extension-cqm-validityperiod.json b/crates/fhir/tests/data/json/R4B/extension-cqm-validityperiod.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-cqm-validityperiod.json rename to crates/fhir/tests/data/json/R4B/extension-cqm-validityperiod.json diff --git a/crates/fhir/tests/data/R4B/extension-data-absent-reason.json b/crates/fhir/tests/data/json/R4B/extension-data-absent-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-data-absent-reason.json rename to crates/fhir/tests/data/json/R4B/extension-data-absent-reason.json diff --git a/crates/fhir/tests/data/R4B/extension-definitions.json b/crates/fhir/tests/data/json/R4B/extension-definitions.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-definitions.json rename to crates/fhir/tests/data/json/R4B/extension-definitions.json diff --git a/crates/fhir/tests/data/R4B/extension-designnote.json b/crates/fhir/tests/data/json/R4B/extension-designnote.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-designnote.json rename to crates/fhir/tests/data/json/R4B/extension-designnote.json diff --git a/crates/fhir/tests/data/R4B/extension-device-implantstatus.json b/crates/fhir/tests/data/json/R4B/extension-device-implantstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-device-implantstatus.json rename to crates/fhir/tests/data/json/R4B/extension-device-implantstatus.json diff --git a/crates/fhir/tests/data/R4B/extension-devicerequest-patientinstruction.json b/crates/fhir/tests/data/json/R4B/extension-devicerequest-patientinstruction.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-devicerequest-patientinstruction.json rename to crates/fhir/tests/data/json/R4B/extension-devicerequest-patientinstruction.json diff --git a/crates/fhir/tests/data/R4B/extension-diagnosticreport-addendumof.json b/crates/fhir/tests/data/json/R4B/extension-diagnosticreport-addendumof.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-diagnosticreport-addendumof.json rename to crates/fhir/tests/data/json/R4B/extension-diagnosticreport-addendumof.json diff --git a/crates/fhir/tests/data/R4B/extension-diagnosticreport-extends.json b/crates/fhir/tests/data/json/R4B/extension-diagnosticreport-extends.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-diagnosticreport-extends.json rename to crates/fhir/tests/data/json/R4B/extension-diagnosticreport-extends.json diff --git a/crates/fhir/tests/data/R4B/extension-diagnosticreport-geneticsanalysis.json b/crates/fhir/tests/data/json/R4B/extension-diagnosticreport-geneticsanalysis.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-diagnosticreport-geneticsanalysis.json rename to crates/fhir/tests/data/json/R4B/extension-diagnosticreport-geneticsanalysis.json diff --git a/crates/fhir/tests/data/R4B/extension-diagnosticreport-geneticsassessedcondition.json b/crates/fhir/tests/data/json/R4B/extension-diagnosticreport-geneticsassessedcondition.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-diagnosticreport-geneticsassessedcondition.json rename to crates/fhir/tests/data/json/R4B/extension-diagnosticreport-geneticsassessedcondition.json diff --git a/crates/fhir/tests/data/R4B/extension-diagnosticreport-geneticsfamilymemberhistory.json b/crates/fhir/tests/data/json/R4B/extension-diagnosticreport-geneticsfamilymemberhistory.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-diagnosticreport-geneticsfamilymemberhistory.json rename to crates/fhir/tests/data/json/R4B/extension-diagnosticreport-geneticsfamilymemberhistory.json diff --git a/crates/fhir/tests/data/R4B/extension-diagnosticreport-geneticsreferences.json b/crates/fhir/tests/data/json/R4B/extension-diagnosticreport-geneticsreferences.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-diagnosticreport-geneticsreferences.json rename to crates/fhir/tests/data/json/R4B/extension-diagnosticreport-geneticsreferences.json diff --git a/crates/fhir/tests/data/R4B/extension-diagnosticreport-locationperformed.json b/crates/fhir/tests/data/json/R4B/extension-diagnosticreport-locationperformed.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-diagnosticreport-locationperformed.json rename to crates/fhir/tests/data/json/R4B/extension-diagnosticreport-locationperformed.json diff --git a/crates/fhir/tests/data/R4B/extension-diagnosticreport-replaces.json b/crates/fhir/tests/data/json/R4B/extension-diagnosticreport-replaces.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-diagnosticreport-replaces.json rename to crates/fhir/tests/data/json/R4B/extension-diagnosticreport-replaces.json diff --git a/crates/fhir/tests/data/R4B/extension-diagnosticreport-risk.json b/crates/fhir/tests/data/json/R4B/extension-diagnosticreport-risk.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-diagnosticreport-risk.json rename to crates/fhir/tests/data/json/R4B/extension-diagnosticreport-risk.json diff --git a/crates/fhir/tests/data/R4B/extension-diagnosticreport-summaryof.json b/crates/fhir/tests/data/json/R4B/extension-diagnosticreport-summaryof.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-diagnosticreport-summaryof.json rename to crates/fhir/tests/data/json/R4B/extension-diagnosticreport-summaryof.json diff --git a/crates/fhir/tests/data/R4B/extension-display.json b/crates/fhir/tests/data/json/R4B/extension-display.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-display.json rename to crates/fhir/tests/data/json/R4B/extension-display.json diff --git a/crates/fhir/tests/data/R4B/extension-elementdefinition-allowedunits.json b/crates/fhir/tests/data/json/R4B/extension-elementdefinition-allowedunits.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-elementdefinition-allowedunits.json rename to crates/fhir/tests/data/json/R4B/extension-elementdefinition-allowedunits.json diff --git a/crates/fhir/tests/data/R4B/extension-elementdefinition-bestpractice-explanation.json b/crates/fhir/tests/data/json/R4B/extension-elementdefinition-bestpractice-explanation.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-elementdefinition-bestpractice-explanation.json rename to crates/fhir/tests/data/json/R4B/extension-elementdefinition-bestpractice-explanation.json diff --git a/crates/fhir/tests/data/R4B/extension-elementdefinition-bestpractice.json b/crates/fhir/tests/data/json/R4B/extension-elementdefinition-bestpractice.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-elementdefinition-bestpractice.json rename to crates/fhir/tests/data/json/R4B/extension-elementdefinition-bestpractice.json diff --git a/crates/fhir/tests/data/R4B/extension-elementdefinition-bindingname.json b/crates/fhir/tests/data/json/R4B/extension-elementdefinition-bindingname.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-elementdefinition-bindingname.json rename to crates/fhir/tests/data/json/R4B/extension-elementdefinition-bindingname.json diff --git a/crates/fhir/tests/data/R4B/extension-elementdefinition-equivalence.json b/crates/fhir/tests/data/json/R4B/extension-elementdefinition-equivalence.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-elementdefinition-equivalence.json rename to crates/fhir/tests/data/json/R4B/extension-elementdefinition-equivalence.json diff --git a/crates/fhir/tests/data/R4B/extension-elementdefinition-identifier.json b/crates/fhir/tests/data/json/R4B/extension-elementdefinition-identifier.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-elementdefinition-identifier.json rename to crates/fhir/tests/data/json/R4B/extension-elementdefinition-identifier.json diff --git a/crates/fhir/tests/data/R4B/extension-elementdefinition-inheritedextensiblevalueset.json b/crates/fhir/tests/data/json/R4B/extension-elementdefinition-inheritedextensiblevalueset.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-elementdefinition-inheritedextensiblevalueset.json rename to crates/fhir/tests/data/json/R4B/extension-elementdefinition-inheritedextensiblevalueset.json diff --git a/crates/fhir/tests/data/R4B/extension-elementdefinition-iscommonbinding.json b/crates/fhir/tests/data/json/R4B/extension-elementdefinition-iscommonbinding.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-elementdefinition-iscommonbinding.json rename to crates/fhir/tests/data/json/R4B/extension-elementdefinition-iscommonbinding.json diff --git a/crates/fhir/tests/data/R4B/extension-elementdefinition-maxvalueset.json b/crates/fhir/tests/data/json/R4B/extension-elementdefinition-maxvalueset.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-elementdefinition-maxvalueset.json rename to crates/fhir/tests/data/json/R4B/extension-elementdefinition-maxvalueset.json diff --git a/crates/fhir/tests/data/R4B/extension-elementdefinition-minvalueset.json b/crates/fhir/tests/data/json/R4B/extension-elementdefinition-minvalueset.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-elementdefinition-minvalueset.json rename to crates/fhir/tests/data/json/R4B/extension-elementdefinition-minvalueset.json diff --git a/crates/fhir/tests/data/R4B/extension-elementdefinition-namespace.json b/crates/fhir/tests/data/json/R4B/extension-elementdefinition-namespace.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-elementdefinition-namespace.json rename to crates/fhir/tests/data/json/R4B/extension-elementdefinition-namespace.json diff --git a/crates/fhir/tests/data/R4B/extension-elementdefinition-profile-element.json b/crates/fhir/tests/data/json/R4B/extension-elementdefinition-profile-element.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-elementdefinition-profile-element.json rename to crates/fhir/tests/data/json/R4B/extension-elementdefinition-profile-element.json diff --git a/crates/fhir/tests/data/R4B/extension-elementdefinition-question.json b/crates/fhir/tests/data/json/R4B/extension-elementdefinition-question.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-elementdefinition-question.json rename to crates/fhir/tests/data/json/R4B/extension-elementdefinition-question.json diff --git a/crates/fhir/tests/data/R4B/extension-elementdefinition-selector.json b/crates/fhir/tests/data/json/R4B/extension-elementdefinition-selector.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-elementdefinition-selector.json rename to crates/fhir/tests/data/json/R4B/extension-elementdefinition-selector.json diff --git a/crates/fhir/tests/data/R4B/extension-elementdefinition-translatable.json b/crates/fhir/tests/data/json/R4B/extension-elementdefinition-translatable.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-elementdefinition-translatable.json rename to crates/fhir/tests/data/json/R4B/extension-elementdefinition-translatable.json diff --git a/crates/fhir/tests/data/R4B/extension-encounter-associatedencounter.json b/crates/fhir/tests/data/json/R4B/extension-encounter-associatedencounter.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-encounter-associatedencounter.json rename to crates/fhir/tests/data/json/R4B/extension-encounter-associatedencounter.json diff --git a/crates/fhir/tests/data/R4B/extension-encounter-modeofarrival.json b/crates/fhir/tests/data/json/R4B/extension-encounter-modeofarrival.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-encounter-modeofarrival.json rename to crates/fhir/tests/data/json/R4B/extension-encounter-modeofarrival.json diff --git a/crates/fhir/tests/data/R4B/extension-encounter-reasoncancelled.json b/crates/fhir/tests/data/json/R4B/extension-encounter-reasoncancelled.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-encounter-reasoncancelled.json rename to crates/fhir/tests/data/json/R4B/extension-encounter-reasoncancelled.json diff --git a/crates/fhir/tests/data/R4B/extension-entryformat.json b/crates/fhir/tests/data/json/R4B/extension-entryformat.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-entryformat.json rename to crates/fhir/tests/data/json/R4B/extension-entryformat.json diff --git a/crates/fhir/tests/data/R4B/extension-event-basedon.json b/crates/fhir/tests/data/json/R4B/extension-event-basedon.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-event-basedon.json rename to crates/fhir/tests/data/json/R4B/extension-event-basedon.json diff --git a/crates/fhir/tests/data/R4B/extension-event-eventhistory.json b/crates/fhir/tests/data/json/R4B/extension-event-eventhistory.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-event-eventhistory.json rename to crates/fhir/tests/data/json/R4B/extension-event-eventhistory.json diff --git a/crates/fhir/tests/data/R4B/extension-event-location.json b/crates/fhir/tests/data/json/R4B/extension-event-location.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-event-location.json rename to crates/fhir/tests/data/json/R4B/extension-event-location.json diff --git a/crates/fhir/tests/data/R4B/extension-event-partof.json b/crates/fhir/tests/data/json/R4B/extension-event-partof.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-event-partof.json rename to crates/fhir/tests/data/json/R4B/extension-event-partof.json diff --git a/crates/fhir/tests/data/R4B/extension-event-performerfunction.json b/crates/fhir/tests/data/json/R4B/extension-event-performerfunction.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-event-performerfunction.json rename to crates/fhir/tests/data/json/R4B/extension-event-performerfunction.json diff --git a/crates/fhir/tests/data/R4B/extension-event-statusreason.json b/crates/fhir/tests/data/json/R4B/extension-event-statusreason.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-event-statusreason.json rename to crates/fhir/tests/data/json/R4B/extension-event-statusreason.json diff --git a/crates/fhir/tests/data/R4B/extension-family-member-history-genetics-observation.json b/crates/fhir/tests/data/json/R4B/extension-family-member-history-genetics-observation.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-family-member-history-genetics-observation.json rename to crates/fhir/tests/data/json/R4B/extension-family-member-history-genetics-observation.json diff --git a/crates/fhir/tests/data/R4B/extension-family-member-history-genetics-parent.json b/crates/fhir/tests/data/json/R4B/extension-family-member-history-genetics-parent.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-family-member-history-genetics-parent.json rename to crates/fhir/tests/data/json/R4B/extension-family-member-history-genetics-parent.json diff --git a/crates/fhir/tests/data/R4B/extension-family-member-history-genetics-sibling.json b/crates/fhir/tests/data/json/R4B/extension-family-member-history-genetics-sibling.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-family-member-history-genetics-sibling.json rename to crates/fhir/tests/data/json/R4B/extension-family-member-history-genetics-sibling.json diff --git a/crates/fhir/tests/data/R4B/extension-familymemberhistory-abatement.json b/crates/fhir/tests/data/json/R4B/extension-familymemberhistory-abatement.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-familymemberhistory-abatement.json rename to crates/fhir/tests/data/json/R4B/extension-familymemberhistory-abatement.json diff --git a/crates/fhir/tests/data/R4B/extension-familymemberhistory-patient-record.json b/crates/fhir/tests/data/json/R4B/extension-familymemberhistory-patient-record.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-familymemberhistory-patient-record.json rename to crates/fhir/tests/data/json/R4B/extension-familymemberhistory-patient-record.json diff --git a/crates/fhir/tests/data/R4B/extension-familymemberhistory-severity.json b/crates/fhir/tests/data/json/R4B/extension-familymemberhistory-severity.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-familymemberhistory-severity.json rename to crates/fhir/tests/data/json/R4B/extension-familymemberhistory-severity.json diff --git a/crates/fhir/tests/data/R4B/extension-familymemberhistory-type.json b/crates/fhir/tests/data/json/R4B/extension-familymemberhistory-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-familymemberhistory-type.json rename to crates/fhir/tests/data/json/R4B/extension-familymemberhistory-type.json diff --git a/crates/fhir/tests/data/R4B/extension-flag-detail.json b/crates/fhir/tests/data/json/R4B/extension-flag-detail.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-flag-detail.json rename to crates/fhir/tests/data/json/R4B/extension-flag-detail.json diff --git a/crates/fhir/tests/data/R4B/extension-flag-priority.json b/crates/fhir/tests/data/json/R4B/extension-flag-priority.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-flag-priority.json rename to crates/fhir/tests/data/json/R4B/extension-flag-priority.json diff --git a/crates/fhir/tests/data/R4B/extension-geolocation.json b/crates/fhir/tests/data/json/R4B/extension-geolocation.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-geolocation.json rename to crates/fhir/tests/data/json/R4B/extension-geolocation.json diff --git a/crates/fhir/tests/data/R4B/extension-goal-acceptance.json b/crates/fhir/tests/data/json/R4B/extension-goal-acceptance.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-goal-acceptance.json rename to crates/fhir/tests/data/json/R4B/extension-goal-acceptance.json diff --git a/crates/fhir/tests/data/R4B/extension-goal-reasonrejected.json b/crates/fhir/tests/data/json/R4B/extension-goal-reasonrejected.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-goal-reasonrejected.json rename to crates/fhir/tests/data/json/R4B/extension-goal-reasonrejected.json diff --git a/crates/fhir/tests/data/R4B/extension-goal-relationship.json b/crates/fhir/tests/data/json/R4B/extension-goal-relationship.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-goal-relationship.json rename to crates/fhir/tests/data/json/R4B/extension-goal-relationship.json diff --git a/crates/fhir/tests/data/R4B/extension-hla-genotyping-results-allele-database.json b/crates/fhir/tests/data/json/R4B/extension-hla-genotyping-results-allele-database.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-hla-genotyping-results-allele-database.json rename to crates/fhir/tests/data/json/R4B/extension-hla-genotyping-results-allele-database.json diff --git a/crates/fhir/tests/data/R4B/extension-hla-genotyping-results-glstring.json b/crates/fhir/tests/data/json/R4B/extension-hla-genotyping-results-glstring.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-hla-genotyping-results-glstring.json rename to crates/fhir/tests/data/json/R4B/extension-hla-genotyping-results-glstring.json diff --git a/crates/fhir/tests/data/R4B/extension-hla-genotyping-results-haploid.json b/crates/fhir/tests/data/json/R4B/extension-hla-genotyping-results-haploid.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-hla-genotyping-results-haploid.json rename to crates/fhir/tests/data/json/R4B/extension-hla-genotyping-results-haploid.json diff --git a/crates/fhir/tests/data/R4B/extension-hla-genotyping-results-method.json b/crates/fhir/tests/data/json/R4B/extension-hla-genotyping-results-method.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-hla-genotyping-results-method.json rename to crates/fhir/tests/data/json/R4B/extension-hla-genotyping-results-method.json diff --git a/crates/fhir/tests/data/R4B/extension-http-response-header.json b/crates/fhir/tests/data/json/R4B/extension-http-response-header.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-http-response-header.json rename to crates/fhir/tests/data/json/R4B/extension-http-response-header.json diff --git a/crates/fhir/tests/data/R4B/extension-humanname-assembly-order.json b/crates/fhir/tests/data/json/R4B/extension-humanname-assembly-order.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-humanname-assembly-order.json rename to crates/fhir/tests/data/json/R4B/extension-humanname-assembly-order.json diff --git a/crates/fhir/tests/data/R4B/extension-humanname-fathers-family.json b/crates/fhir/tests/data/json/R4B/extension-humanname-fathers-family.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-humanname-fathers-family.json rename to crates/fhir/tests/data/json/R4B/extension-humanname-fathers-family.json diff --git a/crates/fhir/tests/data/R4B/extension-humanname-mothers-family.json b/crates/fhir/tests/data/json/R4B/extension-humanname-mothers-family.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-humanname-mothers-family.json rename to crates/fhir/tests/data/json/R4B/extension-humanname-mothers-family.json diff --git a/crates/fhir/tests/data/R4B/extension-humanname-own-name.json b/crates/fhir/tests/data/json/R4B/extension-humanname-own-name.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-humanname-own-name.json rename to crates/fhir/tests/data/json/R4B/extension-humanname-own-name.json diff --git a/crates/fhir/tests/data/R4B/extension-humanname-own-prefix.json b/crates/fhir/tests/data/json/R4B/extension-humanname-own-prefix.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-humanname-own-prefix.json rename to crates/fhir/tests/data/json/R4B/extension-humanname-own-prefix.json diff --git a/crates/fhir/tests/data/R4B/extension-humanname-partner-name.json b/crates/fhir/tests/data/json/R4B/extension-humanname-partner-name.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-humanname-partner-name.json rename to crates/fhir/tests/data/json/R4B/extension-humanname-partner-name.json diff --git a/crates/fhir/tests/data/R4B/extension-humanname-partner-prefix.json b/crates/fhir/tests/data/json/R4B/extension-humanname-partner-prefix.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-humanname-partner-prefix.json rename to crates/fhir/tests/data/json/R4B/extension-humanname-partner-prefix.json diff --git a/crates/fhir/tests/data/R4B/extension-identifier-validdate.json b/crates/fhir/tests/data/json/R4B/extension-identifier-validdate.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-identifier-validdate.json rename to crates/fhir/tests/data/json/R4B/extension-identifier-validdate.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-ad-use.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-ad-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-ad-use.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-ad-use.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-additionallocator.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-additionallocator.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-additionallocator.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-additionallocator.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-buildingnumbersuffix.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-buildingnumbersuffix.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-buildingnumbersuffix.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-buildingnumbersuffix.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-careof.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-careof.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-careof.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-careof.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-censustract.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-censustract.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-censustract.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-censustract.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-delimiter.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-delimiter.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-delimiter.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-delimiter.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-deliveryaddressline.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-deliveryaddressline.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-deliveryaddressline.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-deliveryaddressline.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-deliveryinstallationarea.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-deliveryinstallationarea.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-deliveryinstallationarea.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-deliveryinstallationarea.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-deliveryinstallationqualifier.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-deliveryinstallationqualifier.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-deliveryinstallationqualifier.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-deliveryinstallationqualifier.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-deliveryinstallationtype.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-deliveryinstallationtype.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-deliveryinstallationtype.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-deliveryinstallationtype.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-deliverymode.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-deliverymode.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-deliverymode.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-deliverymode.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-deliverymodeidentifier.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-deliverymodeidentifier.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-deliverymodeidentifier.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-deliverymodeidentifier.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-direction.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-direction.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-direction.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-direction.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-housenumber.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-housenumber.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-housenumber.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-housenumber.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-housenumbernumeric.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-housenumbernumeric.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-housenumbernumeric.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-housenumbernumeric.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-postbox.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-postbox.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-postbox.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-postbox.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-precinct.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-precinct.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-precinct.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-precinct.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-streetaddressline.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-streetaddressline.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-streetaddressline.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-streetaddressline.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-streetname.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-streetname.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-streetname.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-streetname.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-streetnamebase.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-streetnamebase.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-streetnamebase.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-streetnamebase.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-streetnametype.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-streetnametype.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-streetnametype.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-streetnametype.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-unitid.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-unitid.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-unitid.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-unitid.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-adxp-unittype.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-unittype.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-adxp-unittype.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-adxp-unittype.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-en-qualifier.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-en-qualifier.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-en-qualifier.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-en-qualifier.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-en-representation.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-en-representation.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-en-representation.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-en-representation.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-en-use.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-en-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-en-use.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-en-use.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-nullflavor.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-nullflavor.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-nullflavor.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-nullflavor.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-pq-translation.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-pq-translation.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-pq-translation.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-pq-translation.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-preferred.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-preferred.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-preferred.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-preferred.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-sc-coding.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-sc-coding.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-sc-coding.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-sc-coding.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-tel-address.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-tel-address.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-tel-address.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-tel-address.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-uncertainty.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-uncertainty.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-uncertainty.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-uncertainty.json diff --git a/crates/fhir/tests/data/R4B/extension-iso21090-uncertaintytype.json b/crates/fhir/tests/data/json/R4B/extension-iso21090-uncertaintytype.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-iso21090-uncertaintytype.json rename to crates/fhir/tests/data/json/R4B/extension-iso21090-uncertaintytype.json diff --git a/crates/fhir/tests/data/R4B/extension-language.json b/crates/fhir/tests/data/json/R4B/extension-language.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-language.json rename to crates/fhir/tests/data/json/R4B/extension-language.json diff --git a/crates/fhir/tests/data/R4B/extension-list-changebase.json b/crates/fhir/tests/data/json/R4B/extension-list-changebase.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-list-changebase.json rename to crates/fhir/tests/data/json/R4B/extension-list-changebase.json diff --git a/crates/fhir/tests/data/R4B/extension-location-boundary-geojson.json b/crates/fhir/tests/data/json/R4B/extension-location-boundary-geojson.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-location-boundary-geojson.json rename to crates/fhir/tests/data/json/R4B/extension-location-boundary-geojson.json diff --git a/crates/fhir/tests/data/R4B/extension-location-distance.json b/crates/fhir/tests/data/json/R4B/extension-location-distance.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-location-distance.json rename to crates/fhir/tests/data/json/R4B/extension-location-distance.json diff --git a/crates/fhir/tests/data/R4B/extension-match-grade.json b/crates/fhir/tests/data/json/R4B/extension-match-grade.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-match-grade.json rename to crates/fhir/tests/data/json/R4B/extension-match-grade.json diff --git a/crates/fhir/tests/data/R4B/extension-maxdecimalplaces.json b/crates/fhir/tests/data/json/R4B/extension-maxdecimalplaces.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-maxdecimalplaces.json rename to crates/fhir/tests/data/json/R4B/extension-maxdecimalplaces.json diff --git a/crates/fhir/tests/data/R4B/extension-maxsize.json b/crates/fhir/tests/data/json/R4B/extension-maxsize.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-maxsize.json rename to crates/fhir/tests/data/json/R4B/extension-maxsize.json diff --git a/crates/fhir/tests/data/R4B/extension-maxvalue.json b/crates/fhir/tests/data/json/R4B/extension-maxvalue.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-maxvalue.json rename to crates/fhir/tests/data/json/R4B/extension-maxvalue.json diff --git a/crates/fhir/tests/data/R4B/extension-messageheader-response-request.json b/crates/fhir/tests/data/json/R4B/extension-messageheader-response-request.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-messageheader-response-request.json rename to crates/fhir/tests/data/json/R4B/extension-messageheader-response-request.json diff --git a/crates/fhir/tests/data/R4B/extension-mimetype.json b/crates/fhir/tests/data/json/R4B/extension-mimetype.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-mimetype.json rename to crates/fhir/tests/data/json/R4B/extension-mimetype.json diff --git a/crates/fhir/tests/data/R4B/extension-minlength.json b/crates/fhir/tests/data/json/R4B/extension-minlength.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-minlength.json rename to crates/fhir/tests/data/json/R4B/extension-minlength.json diff --git a/crates/fhir/tests/data/R4B/extension-minvalue.json b/crates/fhir/tests/data/json/R4B/extension-minvalue.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-minvalue.json rename to crates/fhir/tests/data/json/R4B/extension-minvalue.json diff --git a/crates/fhir/tests/data/R4B/extension-narrativelink.json b/crates/fhir/tests/data/json/R4B/extension-narrativelink.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-narrativelink.json rename to crates/fhir/tests/data/json/R4B/extension-narrativelink.json diff --git a/crates/fhir/tests/data/R4B/extension-no-binding.json b/crates/fhir/tests/data/json/R4B/extension-no-binding.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-no-binding.json rename to crates/fhir/tests/data/json/R4B/extension-no-binding.json diff --git a/crates/fhir/tests/data/R4B/extension-nutritionorder-adaptivefeedingdevice.json b/crates/fhir/tests/data/json/R4B/extension-nutritionorder-adaptivefeedingdevice.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-nutritionorder-adaptivefeedingdevice.json rename to crates/fhir/tests/data/json/R4B/extension-nutritionorder-adaptivefeedingdevice.json diff --git a/crates/fhir/tests/data/R4B/extension-oauth-uris.json b/crates/fhir/tests/data/json/R4B/extension-oauth-uris.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-oauth-uris.json rename to crates/fhir/tests/data/json/R4B/extension-oauth-uris.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-bodyposition.json b/crates/fhir/tests/data/json/R4B/extension-observation-bodyposition.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-bodyposition.json rename to crates/fhir/tests/data/json/R4B/extension-observation-bodyposition.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-delta.json b/crates/fhir/tests/data/json/R4B/extension-observation-delta.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-delta.json rename to crates/fhir/tests/data/json/R4B/extension-observation-delta.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-devicecode.json b/crates/fhir/tests/data/json/R4B/extension-observation-devicecode.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-devicecode.json rename to crates/fhir/tests/data/json/R4B/extension-observation-devicecode.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-focuscode.json b/crates/fhir/tests/data/json/R4B/extension-observation-focuscode.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-focuscode.json rename to crates/fhir/tests/data/json/R4B/extension-observation-focuscode.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-gatewaydevice.json b/crates/fhir/tests/data/json/R4B/extension-observation-gatewaydevice.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-gatewaydevice.json rename to crates/fhir/tests/data/json/R4B/extension-observation-gatewaydevice.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-geneticsallele.json b/crates/fhir/tests/data/json/R4B/extension-observation-geneticsallele.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-geneticsallele.json rename to crates/fhir/tests/data/json/R4B/extension-observation-geneticsallele.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-geneticsaminoacidchange.json b/crates/fhir/tests/data/json/R4B/extension-observation-geneticsaminoacidchange.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-geneticsaminoacidchange.json rename to crates/fhir/tests/data/json/R4B/extension-observation-geneticsaminoacidchange.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-geneticsancestry.json b/crates/fhir/tests/data/json/R4B/extension-observation-geneticsancestry.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-geneticsancestry.json rename to crates/fhir/tests/data/json/R4B/extension-observation-geneticsancestry.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-geneticscopynumberevent.json b/crates/fhir/tests/data/json/R4B/extension-observation-geneticscopynumberevent.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-geneticscopynumberevent.json rename to crates/fhir/tests/data/json/R4B/extension-observation-geneticscopynumberevent.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-geneticsdnaregionname.json b/crates/fhir/tests/data/json/R4B/extension-observation-geneticsdnaregionname.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-geneticsdnaregionname.json rename to crates/fhir/tests/data/json/R4B/extension-observation-geneticsdnaregionname.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-geneticsgene.json b/crates/fhir/tests/data/json/R4B/extension-observation-geneticsgene.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-geneticsgene.json rename to crates/fhir/tests/data/json/R4B/extension-observation-geneticsgene.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-geneticsgenomicsourceclass.json b/crates/fhir/tests/data/json/R4B/extension-observation-geneticsgenomicsourceclass.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-geneticsgenomicsourceclass.json rename to crates/fhir/tests/data/json/R4B/extension-observation-geneticsgenomicsourceclass.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-geneticsinterpretation.json b/crates/fhir/tests/data/json/R4B/extension-observation-geneticsinterpretation.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-geneticsinterpretation.json rename to crates/fhir/tests/data/json/R4B/extension-observation-geneticsinterpretation.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-geneticsphaseset.json b/crates/fhir/tests/data/json/R4B/extension-observation-geneticsphaseset.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-geneticsphaseset.json rename to crates/fhir/tests/data/json/R4B/extension-observation-geneticsphaseset.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-geneticsvariant.json b/crates/fhir/tests/data/json/R4B/extension-observation-geneticsvariant.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-geneticsvariant.json rename to crates/fhir/tests/data/json/R4B/extension-observation-geneticsvariant.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-precondition.json b/crates/fhir/tests/data/json/R4B/extension-observation-precondition.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-precondition.json rename to crates/fhir/tests/data/json/R4B/extension-observation-precondition.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-reagent.json b/crates/fhir/tests/data/json/R4B/extension-observation-reagent.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-reagent.json rename to crates/fhir/tests/data/json/R4B/extension-observation-reagent.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-replaces.json b/crates/fhir/tests/data/json/R4B/extension-observation-replaces.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-replaces.json rename to crates/fhir/tests/data/json/R4B/extension-observation-replaces.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-secondaryfinding.json b/crates/fhir/tests/data/json/R4B/extension-observation-secondaryfinding.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-secondaryfinding.json rename to crates/fhir/tests/data/json/R4B/extension-observation-secondaryfinding.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-sequelto.json b/crates/fhir/tests/data/json/R4B/extension-observation-sequelto.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-sequelto.json rename to crates/fhir/tests/data/json/R4B/extension-observation-sequelto.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-specimencode.json b/crates/fhir/tests/data/json/R4B/extension-observation-specimencode.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-specimencode.json rename to crates/fhir/tests/data/json/R4B/extension-observation-specimencode.json diff --git a/crates/fhir/tests/data/R4B/extension-observation-timeoffset.json b/crates/fhir/tests/data/json/R4B/extension-observation-timeoffset.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-observation-timeoffset.json rename to crates/fhir/tests/data/json/R4B/extension-observation-timeoffset.json diff --git a/crates/fhir/tests/data/R4B/extension-openehr-administration.json b/crates/fhir/tests/data/json/R4B/extension-openehr-administration.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-openehr-administration.json rename to crates/fhir/tests/data/json/R4B/extension-openehr-administration.json diff --git a/crates/fhir/tests/data/R4B/extension-openehr-careplan.json b/crates/fhir/tests/data/json/R4B/extension-openehr-careplan.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-openehr-careplan.json rename to crates/fhir/tests/data/json/R4B/extension-openehr-careplan.json diff --git a/crates/fhir/tests/data/R4B/extension-openehr-exposuredate.json b/crates/fhir/tests/data/json/R4B/extension-openehr-exposuredate.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-openehr-exposuredate.json rename to crates/fhir/tests/data/json/R4B/extension-openehr-exposuredate.json diff --git a/crates/fhir/tests/data/R4B/extension-openehr-exposuredescription.json b/crates/fhir/tests/data/json/R4B/extension-openehr-exposuredescription.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-openehr-exposuredescription.json rename to crates/fhir/tests/data/json/R4B/extension-openehr-exposuredescription.json diff --git a/crates/fhir/tests/data/R4B/extension-openehr-exposureduration.json b/crates/fhir/tests/data/json/R4B/extension-openehr-exposureduration.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-openehr-exposureduration.json rename to crates/fhir/tests/data/json/R4B/extension-openehr-exposureduration.json diff --git a/crates/fhir/tests/data/R4B/extension-openehr-location.json b/crates/fhir/tests/data/json/R4B/extension-openehr-location.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-openehr-location.json rename to crates/fhir/tests/data/json/R4B/extension-openehr-location.json diff --git a/crates/fhir/tests/data/R4B/extension-openehr-management.json b/crates/fhir/tests/data/json/R4B/extension-openehr-management.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-openehr-management.json rename to crates/fhir/tests/data/json/R4B/extension-openehr-management.json diff --git a/crates/fhir/tests/data/R4B/extension-openehr-test.json b/crates/fhir/tests/data/json/R4B/extension-openehr-test.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-openehr-test.json rename to crates/fhir/tests/data/json/R4B/extension-openehr-test.json diff --git a/crates/fhir/tests/data/R4B/extension-operationdefinition-allowed-type.json b/crates/fhir/tests/data/json/R4B/extension-operationdefinition-allowed-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-operationdefinition-allowed-type.json rename to crates/fhir/tests/data/json/R4B/extension-operationdefinition-allowed-type.json diff --git a/crates/fhir/tests/data/R4B/extension-operationdefinition-profile.json b/crates/fhir/tests/data/json/R4B/extension-operationdefinition-profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-operationdefinition-profile.json rename to crates/fhir/tests/data/json/R4B/extension-operationdefinition-profile.json diff --git a/crates/fhir/tests/data/R4B/extension-operationoutcome-authority.json b/crates/fhir/tests/data/json/R4B/extension-operationoutcome-authority.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-operationoutcome-authority.json rename to crates/fhir/tests/data/json/R4B/extension-operationoutcome-authority.json diff --git a/crates/fhir/tests/data/R4B/extension-operationoutcome-detectedissue.json b/crates/fhir/tests/data/json/R4B/extension-operationoutcome-detectedissue.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-operationoutcome-detectedissue.json rename to crates/fhir/tests/data/json/R4B/extension-operationoutcome-detectedissue.json diff --git a/crates/fhir/tests/data/R4B/extension-operationoutcome-issue-source.json b/crates/fhir/tests/data/json/R4B/extension-operationoutcome-issue-source.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-operationoutcome-issue-source.json rename to crates/fhir/tests/data/json/R4B/extension-operationoutcome-issue-source.json diff --git a/crates/fhir/tests/data/R4B/extension-ordinalvalue.json b/crates/fhir/tests/data/json/R4B/extension-ordinalvalue.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-ordinalvalue.json rename to crates/fhir/tests/data/json/R4B/extension-ordinalvalue.json diff --git a/crates/fhir/tests/data/R4B/extension-organization-period.json b/crates/fhir/tests/data/json/R4B/extension-organization-period.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-organization-period.json rename to crates/fhir/tests/data/json/R4B/extension-organization-period.json diff --git a/crates/fhir/tests/data/R4B/extension-organization-preferredcontact.json b/crates/fhir/tests/data/json/R4B/extension-organization-preferredcontact.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-organization-preferredcontact.json rename to crates/fhir/tests/data/json/R4B/extension-organization-preferredcontact.json diff --git a/crates/fhir/tests/data/R4B/extension-organizationaffiliation-primaryind.json b/crates/fhir/tests/data/json/R4B/extension-organizationaffiliation-primaryind.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-organizationaffiliation-primaryind.json rename to crates/fhir/tests/data/json/R4B/extension-organizationaffiliation-primaryind.json diff --git a/crates/fhir/tests/data/R4B/extension-originaltext.json b/crates/fhir/tests/data/json/R4B/extension-originaltext.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-originaltext.json rename to crates/fhir/tests/data/json/R4B/extension-originaltext.json diff --git a/crates/fhir/tests/data/R4B/extension-parameters-fullurl.json b/crates/fhir/tests/data/json/R4B/extension-parameters-fullurl.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-parameters-fullurl.json rename to crates/fhir/tests/data/json/R4B/extension-parameters-fullurl.json diff --git a/crates/fhir/tests/data/R4B/extension-patient-adoptioninfo.json b/crates/fhir/tests/data/json/R4B/extension-patient-adoptioninfo.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-patient-adoptioninfo.json rename to crates/fhir/tests/data/json/R4B/extension-patient-adoptioninfo.json diff --git a/crates/fhir/tests/data/R4B/extension-patient-animal.json b/crates/fhir/tests/data/json/R4B/extension-patient-animal.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-patient-animal.json rename to crates/fhir/tests/data/json/R4B/extension-patient-animal.json diff --git a/crates/fhir/tests/data/R4B/extension-patient-birthplace.json b/crates/fhir/tests/data/json/R4B/extension-patient-birthplace.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-patient-birthplace.json rename to crates/fhir/tests/data/json/R4B/extension-patient-birthplace.json diff --git a/crates/fhir/tests/data/R4B/extension-patient-birthtime.json b/crates/fhir/tests/data/json/R4B/extension-patient-birthtime.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-patient-birthtime.json rename to crates/fhir/tests/data/json/R4B/extension-patient-birthtime.json diff --git a/crates/fhir/tests/data/R4B/extension-patient-cadavericdonor.json b/crates/fhir/tests/data/json/R4B/extension-patient-cadavericdonor.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-patient-cadavericdonor.json rename to crates/fhir/tests/data/json/R4B/extension-patient-cadavericdonor.json diff --git a/crates/fhir/tests/data/R4B/extension-patient-citizenship.json b/crates/fhir/tests/data/json/R4B/extension-patient-citizenship.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-patient-citizenship.json rename to crates/fhir/tests/data/json/R4B/extension-patient-citizenship.json diff --git a/crates/fhir/tests/data/R4B/extension-patient-congregation.json b/crates/fhir/tests/data/json/R4B/extension-patient-congregation.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-patient-congregation.json rename to crates/fhir/tests/data/json/R4B/extension-patient-congregation.json diff --git a/crates/fhir/tests/data/R4B/extension-patient-disability.json b/crates/fhir/tests/data/json/R4B/extension-patient-disability.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-patient-disability.json rename to crates/fhir/tests/data/json/R4B/extension-patient-disability.json diff --git a/crates/fhir/tests/data/R4B/extension-patient-genderidentity.json b/crates/fhir/tests/data/json/R4B/extension-patient-genderidentity.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-patient-genderidentity.json rename to crates/fhir/tests/data/json/R4B/extension-patient-genderidentity.json diff --git a/crates/fhir/tests/data/R4B/extension-patient-importance.json b/crates/fhir/tests/data/json/R4B/extension-patient-importance.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-patient-importance.json rename to crates/fhir/tests/data/json/R4B/extension-patient-importance.json diff --git a/crates/fhir/tests/data/R4B/extension-patient-interpreterrequired.json b/crates/fhir/tests/data/json/R4B/extension-patient-interpreterrequired.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-patient-interpreterrequired.json rename to crates/fhir/tests/data/json/R4B/extension-patient-interpreterrequired.json diff --git a/crates/fhir/tests/data/R4B/extension-patient-mothersmaidenname.json b/crates/fhir/tests/data/json/R4B/extension-patient-mothersmaidenname.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-patient-mothersmaidenname.json rename to crates/fhir/tests/data/json/R4B/extension-patient-mothersmaidenname.json diff --git a/crates/fhir/tests/data/R4B/extension-patient-nationality.json b/crates/fhir/tests/data/json/R4B/extension-patient-nationality.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-patient-nationality.json rename to crates/fhir/tests/data/json/R4B/extension-patient-nationality.json diff --git a/crates/fhir/tests/data/R4B/extension-patient-preferencetype.json b/crates/fhir/tests/data/json/R4B/extension-patient-preferencetype.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-patient-preferencetype.json rename to crates/fhir/tests/data/json/R4B/extension-patient-preferencetype.json diff --git a/crates/fhir/tests/data/R4B/extension-patient-proficiency.json b/crates/fhir/tests/data/json/R4B/extension-patient-proficiency.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-patient-proficiency.json rename to crates/fhir/tests/data/json/R4B/extension-patient-proficiency.json diff --git a/crates/fhir/tests/data/R4B/extension-patient-relatedperson.json b/crates/fhir/tests/data/json/R4B/extension-patient-relatedperson.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-patient-relatedperson.json rename to crates/fhir/tests/data/json/R4B/extension-patient-relatedperson.json diff --git a/crates/fhir/tests/data/R4B/extension-patient-religion.json b/crates/fhir/tests/data/json/R4B/extension-patient-religion.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-patient-religion.json rename to crates/fhir/tests/data/json/R4B/extension-patient-religion.json diff --git a/crates/fhir/tests/data/R4B/extension-practitioner-animalspecies.json b/crates/fhir/tests/data/json/R4B/extension-practitioner-animalspecies.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-practitioner-animalspecies.json rename to crates/fhir/tests/data/json/R4B/extension-practitioner-animalspecies.json diff --git a/crates/fhir/tests/data/R4B/extension-practitionerrole-primaryind.json b/crates/fhir/tests/data/json/R4B/extension-practitionerrole-primaryind.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-practitionerrole-primaryind.json rename to crates/fhir/tests/data/json/R4B/extension-practitionerrole-primaryind.json diff --git a/crates/fhir/tests/data/R4B/extension-procedure-approachbodystructure.json b/crates/fhir/tests/data/json/R4B/extension-procedure-approachbodystructure.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-procedure-approachbodystructure.json rename to crates/fhir/tests/data/json/R4B/extension-procedure-approachbodystructure.json diff --git a/crates/fhir/tests/data/R4B/extension-procedure-causedby.json b/crates/fhir/tests/data/json/R4B/extension-procedure-causedby.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-procedure-causedby.json rename to crates/fhir/tests/data/json/R4B/extension-procedure-causedby.json diff --git a/crates/fhir/tests/data/R4B/extension-procedure-directedby.json b/crates/fhir/tests/data/json/R4B/extension-procedure-directedby.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-procedure-directedby.json rename to crates/fhir/tests/data/json/R4B/extension-procedure-directedby.json diff --git a/crates/fhir/tests/data/R4B/extension-procedure-incisiondatetime.json b/crates/fhir/tests/data/json/R4B/extension-procedure-incisiondatetime.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-procedure-incisiondatetime.json rename to crates/fhir/tests/data/json/R4B/extension-procedure-incisiondatetime.json diff --git a/crates/fhir/tests/data/R4B/extension-procedure-method.json b/crates/fhir/tests/data/json/R4B/extension-procedure-method.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-procedure-method.json rename to crates/fhir/tests/data/json/R4B/extension-procedure-method.json diff --git a/crates/fhir/tests/data/R4B/extension-procedure-progressstatus.json b/crates/fhir/tests/data/json/R4B/extension-procedure-progressstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-procedure-progressstatus.json rename to crates/fhir/tests/data/json/R4B/extension-procedure-progressstatus.json diff --git a/crates/fhir/tests/data/R4B/extension-procedure-schedule.json b/crates/fhir/tests/data/json/R4B/extension-procedure-schedule.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-procedure-schedule.json rename to crates/fhir/tests/data/json/R4B/extension-procedure-schedule.json diff --git a/crates/fhir/tests/data/R4B/extension-procedure-targetbodystructure.json b/crates/fhir/tests/data/json/R4B/extension-procedure-targetbodystructure.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-procedure-targetbodystructure.json rename to crates/fhir/tests/data/json/R4B/extension-procedure-targetbodystructure.json diff --git a/crates/fhir/tests/data/R4B/extension-quantity-precision.json b/crates/fhir/tests/data/json/R4B/extension-quantity-precision.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-quantity-precision.json rename to crates/fhir/tests/data/json/R4B/extension-quantity-precision.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-basetype.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-basetype.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-basetype.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-basetype.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-choiceorientation.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-choiceorientation.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-choiceorientation.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-choiceorientation.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-constraint.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-constraint.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-constraint.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-constraint.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-displaycategory.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-displaycategory.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-displaycategory.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-displaycategory.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-fhirtype.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-fhirtype.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-fhirtype.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-fhirtype.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-hidden.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-hidden.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-hidden.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-hidden.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-itemcontrol.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-itemcontrol.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-itemcontrol.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-itemcontrol.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-maxoccurs.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-maxoccurs.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-maxoccurs.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-maxoccurs.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-minoccurs.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-minoccurs.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-minoccurs.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-minoccurs.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-optionexclusive.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-optionexclusive.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-optionexclusive.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-optionexclusive.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-optionprefix.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-optionprefix.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-optionprefix.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-optionprefix.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-referencefilter.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-referencefilter.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-referencefilter.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-referencefilter.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-referenceprofile.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-referenceprofile.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-referenceprofile.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-referenceprofile.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-referenceresource.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-referenceresource.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-referenceresource.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-referenceresource.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-signaturerequired.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-signaturerequired.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-signaturerequired.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-signaturerequired.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-sliderstepvalue.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-sliderstepvalue.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-sliderstepvalue.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-sliderstepvalue.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-supportlink.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-supportlink.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-supportlink.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-supportlink.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-unit.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-unit.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-unit.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-unit.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-unitoption.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-unitoption.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-unitoption.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-unitoption.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-unitvalueset.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-unitvalueset.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-unitvalueset.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-unitvalueset.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaire-usagemode.json b/crates/fhir/tests/data/json/R4B/extension-questionnaire-usagemode.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaire-usagemode.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaire-usagemode.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaireresponse-author.json b/crates/fhir/tests/data/json/R4B/extension-questionnaireresponse-author.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaireresponse-author.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaireresponse-author.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaireresponse-completionmode.json b/crates/fhir/tests/data/json/R4B/extension-questionnaireresponse-completionmode.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaireresponse-completionmode.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaireresponse-completionmode.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaireresponse-reason.json b/crates/fhir/tests/data/json/R4B/extension-questionnaireresponse-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaireresponse-reason.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaireresponse-reason.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaireresponse-reviewer.json b/crates/fhir/tests/data/json/R4B/extension-questionnaireresponse-reviewer.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaireresponse-reviewer.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaireresponse-reviewer.json diff --git a/crates/fhir/tests/data/R4B/extension-questionnaireresponse-signature.json b/crates/fhir/tests/data/json/R4B/extension-questionnaireresponse-signature.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-questionnaireresponse-signature.json rename to crates/fhir/tests/data/json/R4B/extension-questionnaireresponse-signature.json diff --git a/crates/fhir/tests/data/R4B/extension-regex.json b/crates/fhir/tests/data/json/R4B/extension-regex.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-regex.json rename to crates/fhir/tests/data/json/R4B/extension-regex.json diff --git a/crates/fhir/tests/data/R4B/extension-relative-date.json b/crates/fhir/tests/data/json/R4B/extension-relative-date.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-relative-date.json rename to crates/fhir/tests/data/json/R4B/extension-relative-date.json diff --git a/crates/fhir/tests/data/R4B/extension-rendered-value.json b/crates/fhir/tests/data/json/R4B/extension-rendered-value.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-rendered-value.json rename to crates/fhir/tests/data/json/R4B/extension-rendered-value.json diff --git a/crates/fhir/tests/data/R4B/extension-rendering-markdown.json b/crates/fhir/tests/data/json/R4B/extension-rendering-markdown.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-rendering-markdown.json rename to crates/fhir/tests/data/json/R4B/extension-rendering-markdown.json diff --git a/crates/fhir/tests/data/R4B/extension-rendering-style.json b/crates/fhir/tests/data/json/R4B/extension-rendering-style.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-rendering-style.json rename to crates/fhir/tests/data/json/R4B/extension-rendering-style.json diff --git a/crates/fhir/tests/data/R4B/extension-rendering-stylesensitive.json b/crates/fhir/tests/data/json/R4B/extension-rendering-stylesensitive.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-rendering-stylesensitive.json rename to crates/fhir/tests/data/json/R4B/extension-rendering-stylesensitive.json diff --git a/crates/fhir/tests/data/R4B/extension-rendering-xhtml.json b/crates/fhir/tests/data/json/R4B/extension-rendering-xhtml.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-rendering-xhtml.json rename to crates/fhir/tests/data/json/R4B/extension-rendering-xhtml.json diff --git a/crates/fhir/tests/data/R4B/extension-replaces.json b/crates/fhir/tests/data/json/R4B/extension-replaces.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-replaces.json rename to crates/fhir/tests/data/json/R4B/extension-replaces.json diff --git a/crates/fhir/tests/data/R4B/extension-request-donotperform.json b/crates/fhir/tests/data/json/R4B/extension-request-donotperform.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-request-donotperform.json rename to crates/fhir/tests/data/json/R4B/extension-request-donotperform.json diff --git a/crates/fhir/tests/data/R4B/extension-request-insurance.json b/crates/fhir/tests/data/json/R4B/extension-request-insurance.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-request-insurance.json rename to crates/fhir/tests/data/json/R4B/extension-request-insurance.json diff --git a/crates/fhir/tests/data/R4B/extension-request-performerorder.json b/crates/fhir/tests/data/json/R4B/extension-request-performerorder.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-request-performerorder.json rename to crates/fhir/tests/data/json/R4B/extension-request-performerorder.json diff --git a/crates/fhir/tests/data/R4B/extension-request-relevanthistory.json b/crates/fhir/tests/data/json/R4B/extension-request-relevanthistory.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-request-relevanthistory.json rename to crates/fhir/tests/data/json/R4B/extension-request-relevanthistory.json diff --git a/crates/fhir/tests/data/R4B/extension-request-replaces.json b/crates/fhir/tests/data/json/R4B/extension-request-replaces.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-request-replaces.json rename to crates/fhir/tests/data/json/R4B/extension-request-replaces.json diff --git a/crates/fhir/tests/data/R4B/extension-request-statusreason.json b/crates/fhir/tests/data/json/R4B/extension-request-statusreason.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-request-statusreason.json rename to crates/fhir/tests/data/json/R4B/extension-request-statusreason.json diff --git a/crates/fhir/tests/data/R4B/extension-resource-approvaldate.json b/crates/fhir/tests/data/json/R4B/extension-resource-approvaldate.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-resource-approvaldate.json rename to crates/fhir/tests/data/json/R4B/extension-resource-approvaldate.json diff --git a/crates/fhir/tests/data/R4B/extension-resource-effectiveperiod.json b/crates/fhir/tests/data/json/R4B/extension-resource-effectiveperiod.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-resource-effectiveperiod.json rename to crates/fhir/tests/data/json/R4B/extension-resource-effectiveperiod.json diff --git a/crates/fhir/tests/data/R4B/extension-resource-lastreviewdate.json b/crates/fhir/tests/data/json/R4B/extension-resource-lastreviewdate.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-resource-lastreviewdate.json rename to crates/fhir/tests/data/json/R4B/extension-resource-lastreviewdate.json diff --git a/crates/fhir/tests/data/R4B/extension-resource-pertainstogoal.json b/crates/fhir/tests/data/json/R4B/extension-resource-pertainstogoal.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-resource-pertainstogoal.json rename to crates/fhir/tests/data/json/R4B/extension-resource-pertainstogoal.json diff --git a/crates/fhir/tests/data/R4B/extension-servicerequest-geneticsitem.json b/crates/fhir/tests/data/json/R4B/extension-servicerequest-geneticsitem.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-servicerequest-geneticsitem.json rename to crates/fhir/tests/data/json/R4B/extension-servicerequest-geneticsitem.json diff --git a/crates/fhir/tests/data/R4B/extension-servicerequest-precondition.json b/crates/fhir/tests/data/json/R4B/extension-servicerequest-precondition.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-servicerequest-precondition.json rename to crates/fhir/tests/data/json/R4B/extension-servicerequest-precondition.json diff --git a/crates/fhir/tests/data/R4B/extension-servicerequest-questionnairerequest.json b/crates/fhir/tests/data/json/R4B/extension-servicerequest-questionnairerequest.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-servicerequest-questionnairerequest.json rename to crates/fhir/tests/data/json/R4B/extension-servicerequest-questionnairerequest.json diff --git a/crates/fhir/tests/data/R4B/extension-specimen-collectionpriority.json b/crates/fhir/tests/data/json/R4B/extension-specimen-collectionpriority.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-specimen-collectionpriority.json rename to crates/fhir/tests/data/json/R4B/extension-specimen-collectionpriority.json diff --git a/crates/fhir/tests/data/R4B/extension-specimen-isdryweight.json b/crates/fhir/tests/data/json/R4B/extension-specimen-isdryweight.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-specimen-isdryweight.json rename to crates/fhir/tests/data/json/R4B/extension-specimen-isdryweight.json diff --git a/crates/fhir/tests/data/R4B/extension-specimen-processingtime.json b/crates/fhir/tests/data/json/R4B/extension-specimen-processingtime.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-specimen-processingtime.json rename to crates/fhir/tests/data/json/R4B/extension-specimen-processingtime.json diff --git a/crates/fhir/tests/data/R4B/extension-specimen-sequencenumber.json b/crates/fhir/tests/data/json/R4B/extension-specimen-sequencenumber.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-specimen-sequencenumber.json rename to crates/fhir/tests/data/json/R4B/extension-specimen-sequencenumber.json diff --git a/crates/fhir/tests/data/R4B/extension-specimen-specialhandling.json b/crates/fhir/tests/data/json/R4B/extension-specimen-specialhandling.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-specimen-specialhandling.json rename to crates/fhir/tests/data/json/R4B/extension-specimen-specialhandling.json diff --git a/crates/fhir/tests/data/R4B/extension-structuredefinition-ancestor.json b/crates/fhir/tests/data/json/R4B/extension-structuredefinition-ancestor.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-structuredefinition-ancestor.json rename to crates/fhir/tests/data/json/R4B/extension-structuredefinition-ancestor.json diff --git a/crates/fhir/tests/data/R4B/extension-structuredefinition-applicable-version.json b/crates/fhir/tests/data/json/R4B/extension-structuredefinition-applicable-version.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-structuredefinition-applicable-version.json rename to crates/fhir/tests/data/json/R4B/extension-structuredefinition-applicable-version.json diff --git a/crates/fhir/tests/data/R4B/extension-structuredefinition-category.json b/crates/fhir/tests/data/json/R4B/extension-structuredefinition-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-structuredefinition-category.json rename to crates/fhir/tests/data/json/R4B/extension-structuredefinition-category.json diff --git a/crates/fhir/tests/data/R4B/extension-structuredefinition-codegen-super.json b/crates/fhir/tests/data/json/R4B/extension-structuredefinition-codegen-super.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-structuredefinition-codegen-super.json rename to crates/fhir/tests/data/json/R4B/extension-structuredefinition-codegen-super.json diff --git a/crates/fhir/tests/data/R4B/extension-structuredefinition-dependencies.json b/crates/fhir/tests/data/json/R4B/extension-structuredefinition-dependencies.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-structuredefinition-dependencies.json rename to crates/fhir/tests/data/json/R4B/extension-structuredefinition-dependencies.json diff --git a/crates/fhir/tests/data/R4B/extension-structuredefinition-display-hint.json b/crates/fhir/tests/data/json/R4B/extension-structuredefinition-display-hint.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-structuredefinition-display-hint.json rename to crates/fhir/tests/data/json/R4B/extension-structuredefinition-display-hint.json diff --git a/crates/fhir/tests/data/R4B/extension-structuredefinition-explicit-type-name.json b/crates/fhir/tests/data/json/R4B/extension-structuredefinition-explicit-type-name.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-structuredefinition-explicit-type-name.json rename to crates/fhir/tests/data/json/R4B/extension-structuredefinition-explicit-type-name.json diff --git a/crates/fhir/tests/data/R4B/extension-structuredefinition-fhir-type.json b/crates/fhir/tests/data/json/R4B/extension-structuredefinition-fhir-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-structuredefinition-fhir-type.json rename to crates/fhir/tests/data/json/R4B/extension-structuredefinition-fhir-type.json diff --git a/crates/fhir/tests/data/R4B/extension-structuredefinition-fmm-no-warnings.json b/crates/fhir/tests/data/json/R4B/extension-structuredefinition-fmm-no-warnings.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-structuredefinition-fmm-no-warnings.json rename to crates/fhir/tests/data/json/R4B/extension-structuredefinition-fmm-no-warnings.json diff --git a/crates/fhir/tests/data/R4B/extension-structuredefinition-fmm.json b/crates/fhir/tests/data/json/R4B/extension-structuredefinition-fmm.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-structuredefinition-fmm.json rename to crates/fhir/tests/data/json/R4B/extension-structuredefinition-fmm.json diff --git a/crates/fhir/tests/data/R4B/extension-structuredefinition-hierarchy.json b/crates/fhir/tests/data/json/R4B/extension-structuredefinition-hierarchy.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-structuredefinition-hierarchy.json rename to crates/fhir/tests/data/json/R4B/extension-structuredefinition-hierarchy.json diff --git a/crates/fhir/tests/data/R4B/extension-structuredefinition-normative-version.json b/crates/fhir/tests/data/json/R4B/extension-structuredefinition-normative-version.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-structuredefinition-normative-version.json rename to crates/fhir/tests/data/json/R4B/extension-structuredefinition-normative-version.json diff --git a/crates/fhir/tests/data/R4B/extension-structuredefinition-security-category.json b/crates/fhir/tests/data/json/R4B/extension-structuredefinition-security-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-structuredefinition-security-category.json rename to crates/fhir/tests/data/json/R4B/extension-structuredefinition-security-category.json diff --git a/crates/fhir/tests/data/R4B/extension-structuredefinition-standards-status.json b/crates/fhir/tests/data/json/R4B/extension-structuredefinition-standards-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-structuredefinition-standards-status.json rename to crates/fhir/tests/data/json/R4B/extension-structuredefinition-standards-status.json diff --git a/crates/fhir/tests/data/R4B/extension-structuredefinition-summary.json b/crates/fhir/tests/data/json/R4B/extension-structuredefinition-summary.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-structuredefinition-summary.json rename to crates/fhir/tests/data/json/R4B/extension-structuredefinition-summary.json diff --git a/crates/fhir/tests/data/R4B/extension-structuredefinition-table-name.json b/crates/fhir/tests/data/json/R4B/extension-structuredefinition-table-name.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-structuredefinition-table-name.json rename to crates/fhir/tests/data/json/R4B/extension-structuredefinition-table-name.json diff --git a/crates/fhir/tests/data/R4B/extension-structuredefinition-template-status.json b/crates/fhir/tests/data/json/R4B/extension-structuredefinition-template-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-structuredefinition-template-status.json rename to crates/fhir/tests/data/json/R4B/extension-structuredefinition-template-status.json diff --git a/crates/fhir/tests/data/R4B/extension-structuredefinition-wg.json b/crates/fhir/tests/data/json/R4B/extension-structuredefinition-wg.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-structuredefinition-wg.json rename to crates/fhir/tests/data/json/R4B/extension-structuredefinition-wg.json diff --git a/crates/fhir/tests/data/R4B/extension-structuredefinition-xml-no-order.json b/crates/fhir/tests/data/json/R4B/extension-structuredefinition-xml-no-order.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-structuredefinition-xml-no-order.json rename to crates/fhir/tests/data/json/R4B/extension-structuredefinition-xml-no-order.json diff --git a/crates/fhir/tests/data/R4B/extension-task-candidatelist.json b/crates/fhir/tests/data/json/R4B/extension-task-candidatelist.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-task-candidatelist.json rename to crates/fhir/tests/data/json/R4B/extension-task-candidatelist.json diff --git a/crates/fhir/tests/data/R4B/extension-task-replaces.json b/crates/fhir/tests/data/json/R4B/extension-task-replaces.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-task-replaces.json rename to crates/fhir/tests/data/json/R4B/extension-task-replaces.json diff --git a/crates/fhir/tests/data/R4B/extension-timing-dayofmonth.json b/crates/fhir/tests/data/json/R4B/extension-timing-dayofmonth.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-timing-dayofmonth.json rename to crates/fhir/tests/data/json/R4B/extension-timing-dayofmonth.json diff --git a/crates/fhir/tests/data/R4B/extension-timing-daysofcycle.json b/crates/fhir/tests/data/json/R4B/extension-timing-daysofcycle.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-timing-daysofcycle.json rename to crates/fhir/tests/data/json/R4B/extension-timing-daysofcycle.json diff --git a/crates/fhir/tests/data/R4B/extension-timing-exact.json b/crates/fhir/tests/data/json/R4B/extension-timing-exact.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-timing-exact.json rename to crates/fhir/tests/data/json/R4B/extension-timing-exact.json diff --git a/crates/fhir/tests/data/R4B/extension-translation.json b/crates/fhir/tests/data/json/R4B/extension-translation.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-translation.json rename to crates/fhir/tests/data/json/R4B/extension-translation.json diff --git a/crates/fhir/tests/data/R4B/extension-tz-code.json b/crates/fhir/tests/data/json/R4B/extension-tz-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-tz-code.json rename to crates/fhir/tests/data/json/R4B/extension-tz-code.json diff --git a/crates/fhir/tests/data/R4B/extension-tz-offset.json b/crates/fhir/tests/data/json/R4B/extension-tz-offset.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-tz-offset.json rename to crates/fhir/tests/data/json/R4B/extension-tz-offset.json diff --git a/crates/fhir/tests/data/R4B/extension-usagecontext-group.json b/crates/fhir/tests/data/json/R4B/extension-usagecontext-group.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-usagecontext-group.json rename to crates/fhir/tests/data/json/R4B/extension-usagecontext-group.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-activitystatusdate.json b/crates/fhir/tests/data/json/R4B/extension-valueset-activitystatusdate.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-activitystatusdate.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-activitystatusdate.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-author.json b/crates/fhir/tests/data/json/R4B/extension-valueset-author.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-author.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-author.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-authoritativesource.json b/crates/fhir/tests/data/json/R4B/extension-valueset-authoritativesource.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-authoritativesource.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-authoritativesource.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-casesensitive.json b/crates/fhir/tests/data/json/R4B/extension-valueset-casesensitive.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-casesensitive.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-casesensitive.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-concept-comments.json b/crates/fhir/tests/data/json/R4B/extension-valueset-concept-comments.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-concept-comments.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-concept-comments.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-concept-definition.json b/crates/fhir/tests/data/json/R4B/extension-valueset-concept-definition.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-concept-definition.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-concept-definition.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-conceptorder.json b/crates/fhir/tests/data/json/R4B/extension-valueset-conceptorder.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-conceptorder.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-conceptorder.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-deprecated.json b/crates/fhir/tests/data/json/R4B/extension-valueset-deprecated.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-deprecated.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-deprecated.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-effectivedate.json b/crates/fhir/tests/data/json/R4B/extension-valueset-effectivedate.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-effectivedate.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-effectivedate.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-expand-group.json b/crates/fhir/tests/data/json/R4B/extension-valueset-expand-group.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-expand-group.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-expand-group.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-expand-rules.json b/crates/fhir/tests/data/json/R4B/extension-valueset-expand-rules.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-expand-rules.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-expand-rules.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-expansionsource.json b/crates/fhir/tests/data/json/R4B/extension-valueset-expansionsource.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-expansionsource.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-expansionsource.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-expirationdate.json b/crates/fhir/tests/data/json/R4B/extension-valueset-expirationdate.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-expirationdate.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-expirationdate.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-expression.json b/crates/fhir/tests/data/json/R4B/extension-valueset-expression.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-expression.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-expression.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-extensible.json b/crates/fhir/tests/data/json/R4B/extension-valueset-extensible.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-extensible.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-extensible.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-keyword.json b/crates/fhir/tests/data/json/R4B/extension-valueset-keyword.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-keyword.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-keyword.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-label.json b/crates/fhir/tests/data/json/R4B/extension-valueset-label.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-label.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-label.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-map.json b/crates/fhir/tests/data/json/R4B/extension-valueset-map.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-map.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-map.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-othername.json b/crates/fhir/tests/data/json/R4B/extension-valueset-othername.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-othername.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-othername.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-parametersource.json b/crates/fhir/tests/data/json/R4B/extension-valueset-parametersource.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-parametersource.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-parametersource.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-reference.json b/crates/fhir/tests/data/json/R4B/extension-valueset-reference.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-reference.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-reference.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-rules-text.json b/crates/fhir/tests/data/json/R4B/extension-valueset-rules-text.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-rules-text.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-rules-text.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-sourcereference.json b/crates/fhir/tests/data/json/R4B/extension-valueset-sourcereference.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-sourcereference.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-sourcereference.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-special-status.json b/crates/fhir/tests/data/json/R4B/extension-valueset-special-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-special-status.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-special-status.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-steward.json b/crates/fhir/tests/data/json/R4B/extension-valueset-steward.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-steward.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-steward.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-supplement.json b/crates/fhir/tests/data/json/R4B/extension-valueset-supplement.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-supplement.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-supplement.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-system.json b/crates/fhir/tests/data/json/R4B/extension-valueset-system.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-system.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-system.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-systemname.json b/crates/fhir/tests/data/json/R4B/extension-valueset-systemname.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-systemname.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-systemname.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-systemref.json b/crates/fhir/tests/data/json/R4B/extension-valueset-systemref.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-systemref.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-systemref.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-toocostly.json b/crates/fhir/tests/data/json/R4B/extension-valueset-toocostly.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-toocostly.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-toocostly.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-trusted-expansion.json b/crates/fhir/tests/data/json/R4B/extension-valueset-trusted-expansion.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-trusted-expansion.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-trusted-expansion.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-unclosed.json b/crates/fhir/tests/data/json/R4B/extension-valueset-unclosed.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-unclosed.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-unclosed.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-usage.json b/crates/fhir/tests/data/json/R4B/extension-valueset-usage.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-usage.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-usage.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-warning.json b/crates/fhir/tests/data/json/R4B/extension-valueset-warning.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-warning.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-warning.json diff --git a/crates/fhir/tests/data/R4B/extension-valueset-workflowstatus.json b/crates/fhir/tests/data/json/R4B/extension-valueset-workflowstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-valueset-workflowstatus.json rename to crates/fhir/tests/data/json/R4B/extension-valueset-workflowstatus.json diff --git a/crates/fhir/tests/data/R4B/extension-variable.json b/crates/fhir/tests/data/json/R4B/extension-variable.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-variable.json rename to crates/fhir/tests/data/json/R4B/extension-variable.json diff --git a/crates/fhir/tests/data/R4B/extension-workflow-episodeofcare.json b/crates/fhir/tests/data/json/R4B/extension-workflow-episodeofcare.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-workflow-episodeofcare.json rename to crates/fhir/tests/data/json/R4B/extension-workflow-episodeofcare.json diff --git a/crates/fhir/tests/data/R4B/extension-workflow-instantiatescanonical.json b/crates/fhir/tests/data/json/R4B/extension-workflow-instantiatescanonical.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-workflow-instantiatescanonical.json rename to crates/fhir/tests/data/json/R4B/extension-workflow-instantiatescanonical.json diff --git a/crates/fhir/tests/data/R4B/extension-workflow-instantiatesuri.json b/crates/fhir/tests/data/json/R4B/extension-workflow-instantiatesuri.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-workflow-instantiatesuri.json rename to crates/fhir/tests/data/json/R4B/extension-workflow-instantiatesuri.json diff --git a/crates/fhir/tests/data/R4B/extension-workflow-reasoncode.json b/crates/fhir/tests/data/json/R4B/extension-workflow-reasoncode.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-workflow-reasoncode.json rename to crates/fhir/tests/data/json/R4B/extension-workflow-reasoncode.json diff --git a/crates/fhir/tests/data/R4B/extension-workflow-reasonreference.json b/crates/fhir/tests/data/json/R4B/extension-workflow-reasonreference.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-workflow-reasonreference.json rename to crates/fhir/tests/data/json/R4B/extension-workflow-reasonreference.json diff --git a/crates/fhir/tests/data/R4B/extension-workflow-relatedartifact.json b/crates/fhir/tests/data/json/R4B/extension-workflow-relatedartifact.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-workflow-relatedartifact.json rename to crates/fhir/tests/data/json/R4B/extension-workflow-relatedartifact.json diff --git a/crates/fhir/tests/data/R4B/extension-workflow-researchstudy.json b/crates/fhir/tests/data/json/R4B/extension-workflow-researchstudy.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-workflow-researchstudy.json rename to crates/fhir/tests/data/json/R4B/extension-workflow-researchstudy.json diff --git a/crates/fhir/tests/data/R4B/extension-workflow-supportinginfo.json b/crates/fhir/tests/data/json/R4B/extension-workflow-supportinginfo.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension-workflow-supportinginfo.json rename to crates/fhir/tests/data/json/R4B/extension-workflow-supportinginfo.json diff --git a/crates/fhir/tests/data/R4B/extension.profile.json b/crates/fhir/tests/data/json/R4B/extension.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/extension.profile.json rename to crates/fhir/tests/data/json/R4B/extension.profile.json diff --git a/crates/fhir/tests/data/R4B/external-resources.json b/crates/fhir/tests/data/json/R4B/external-resources.json similarity index 100% rename from crates/fhir/tests/data/R4B/external-resources.json rename to crates/fhir/tests/data/json/R4B/external-resources.json diff --git a/crates/fhir/tests/data/R4B/familymemberhistory-example-mother.json b/crates/fhir/tests/data/json/R4B/familymemberhistory-example-mother.json similarity index 100% rename from crates/fhir/tests/data/R4B/familymemberhistory-example-mother.json rename to crates/fhir/tests/data/json/R4B/familymemberhistory-example-mother.json diff --git a/crates/fhir/tests/data/R4B/familymemberhistory-example.json b/crates/fhir/tests/data/json/R4B/familymemberhistory-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/familymemberhistory-example.json rename to crates/fhir/tests/data/json/R4B/familymemberhistory-example.json diff --git a/crates/fhir/tests/data/R4B/familymemberhistory-genetic-questionnaire.json b/crates/fhir/tests/data/json/R4B/familymemberhistory-genetic-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/familymemberhistory-genetic-questionnaire.json rename to crates/fhir/tests/data/json/R4B/familymemberhistory-genetic-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/familymemberhistory-genetic.profile.json b/crates/fhir/tests/data/json/R4B/familymemberhistory-genetic.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/familymemberhistory-genetic.profile.json rename to crates/fhir/tests/data/json/R4B/familymemberhistory-genetic.profile.json diff --git a/crates/fhir/tests/data/R4B/familymemberhistory-questionnaire.json b/crates/fhir/tests/data/json/R4B/familymemberhistory-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/familymemberhistory-questionnaire.json rename to crates/fhir/tests/data/json/R4B/familymemberhistory-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/familymemberhistory.profile.json b/crates/fhir/tests/data/json/R4B/familymemberhistory.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/familymemberhistory.profile.json rename to crates/fhir/tests/data/json/R4B/familymemberhistory.profile.json diff --git a/crates/fhir/tests/data/R4B/fivews.json b/crates/fhir/tests/data/json/R4B/fivews.json similarity index 100% rename from crates/fhir/tests/data/R4B/fivews.json rename to crates/fhir/tests/data/json/R4B/fivews.json diff --git a/crates/fhir/tests/data/R4B/flag-example-encounter.json b/crates/fhir/tests/data/json/R4B/flag-example-encounter.json similarity index 100% rename from crates/fhir/tests/data/R4B/flag-example-encounter.json rename to crates/fhir/tests/data/json/R4B/flag-example-encounter.json diff --git a/crates/fhir/tests/data/R4B/flag-example.json b/crates/fhir/tests/data/json/R4B/flag-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/flag-example.json rename to crates/fhir/tests/data/json/R4B/flag-example.json diff --git a/crates/fhir/tests/data/R4B/flag-questionnaire.json b/crates/fhir/tests/data/json/R4B/flag-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/flag-questionnaire.json rename to crates/fhir/tests/data/json/R4B/flag-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/flag.profile.json b/crates/fhir/tests/data/json/R4B/flag.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/flag.profile.json rename to crates/fhir/tests/data/json/R4B/flag.profile.json diff --git a/crates/fhir/tests/data/R4B/goal-example-stop-smoking.json b/crates/fhir/tests/data/json/R4B/goal-example-stop-smoking.json similarity index 100% rename from crates/fhir/tests/data/R4B/goal-example-stop-smoking.json rename to crates/fhir/tests/data/json/R4B/goal-example-stop-smoking.json diff --git a/crates/fhir/tests/data/R4B/goal-example.json b/crates/fhir/tests/data/json/R4B/goal-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/goal-example.json rename to crates/fhir/tests/data/json/R4B/goal-example.json diff --git a/crates/fhir/tests/data/R4B/goal-questionnaire.json b/crates/fhir/tests/data/json/R4B/goal-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/goal-questionnaire.json rename to crates/fhir/tests/data/json/R4B/goal-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/goal.profile.json b/crates/fhir/tests/data/json/R4B/goal.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/goal.profile.json rename to crates/fhir/tests/data/json/R4B/goal.profile.json diff --git a/crates/fhir/tests/data/R4B/graphdefinition-example.json b/crates/fhir/tests/data/json/R4B/graphdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/graphdefinition-example.json rename to crates/fhir/tests/data/json/R4B/graphdefinition-example.json diff --git a/crates/fhir/tests/data/R4B/graphdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/graphdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/graphdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/graphdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/graphdefinition.profile.json b/crates/fhir/tests/data/json/R4B/graphdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/graphdefinition.profile.json rename to crates/fhir/tests/data/json/R4B/graphdefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/group-example-herd1.json b/crates/fhir/tests/data/json/R4B/group-example-herd1.json similarity index 100% rename from crates/fhir/tests/data/R4B/group-example-herd1.json rename to crates/fhir/tests/data/json/R4B/group-example-herd1.json diff --git a/crates/fhir/tests/data/R4B/group-example-member.json b/crates/fhir/tests/data/json/R4B/group-example-member.json similarity index 100% rename from crates/fhir/tests/data/R4B/group-example-member.json rename to crates/fhir/tests/data/json/R4B/group-example-member.json diff --git a/crates/fhir/tests/data/R4B/group-example-patientlist.json b/crates/fhir/tests/data/json/R4B/group-example-patientlist.json similarity index 100% rename from crates/fhir/tests/data/R4B/group-example-patientlist.json rename to crates/fhir/tests/data/json/R4B/group-example-patientlist.json diff --git a/crates/fhir/tests/data/R4B/group-example.json b/crates/fhir/tests/data/json/R4B/group-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/group-example.json rename to crates/fhir/tests/data/json/R4B/group-example.json diff --git a/crates/fhir/tests/data/R4B/group-questionnaire.json b/crates/fhir/tests/data/json/R4B/group-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/group-questionnaire.json rename to crates/fhir/tests/data/json/R4B/group-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/group.profile.json b/crates/fhir/tests/data/json/R4B/group.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/group.profile.json rename to crates/fhir/tests/data/json/R4B/group.profile.json diff --git a/crates/fhir/tests/data/R4B/groupdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/groupdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/groupdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/groupdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/groupdefinition.profile.json b/crates/fhir/tests/data/json/R4B/groupdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/groupdefinition.profile.json rename to crates/fhir/tests/data/json/R4B/groupdefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/guidanceresponse-example.json b/crates/fhir/tests/data/json/R4B/guidanceresponse-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/guidanceresponse-example.json rename to crates/fhir/tests/data/json/R4B/guidanceresponse-example.json diff --git a/crates/fhir/tests/data/R4B/guidanceresponse-questionnaire.json b/crates/fhir/tests/data/json/R4B/guidanceresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/guidanceresponse-questionnaire.json rename to crates/fhir/tests/data/json/R4B/guidanceresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/guidanceresponse.profile.json b/crates/fhir/tests/data/json/R4B/guidanceresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/guidanceresponse.profile.json rename to crates/fhir/tests/data/json/R4B/guidanceresponse.profile.json diff --git a/crates/fhir/tests/data/R4B/hdlcholesterol-questionnaire.json b/crates/fhir/tests/data/json/R4B/hdlcholesterol-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/hdlcholesterol-questionnaire.json rename to crates/fhir/tests/data/json/R4B/hdlcholesterol-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/hdlcholesterol.profile.json b/crates/fhir/tests/data/json/R4B/hdlcholesterol.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/hdlcholesterol.profile.json rename to crates/fhir/tests/data/json/R4B/hdlcholesterol.profile.json diff --git a/crates/fhir/tests/data/R4B/headcircum-questionnaire.json b/crates/fhir/tests/data/json/R4B/headcircum-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/headcircum-questionnaire.json rename to crates/fhir/tests/data/json/R4B/headcircum-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/headcircum.profile.json b/crates/fhir/tests/data/json/R4B/headcircum.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/headcircum.profile.json rename to crates/fhir/tests/data/json/R4B/headcircum.profile.json diff --git a/crates/fhir/tests/data/R4B/healthcareservice-example.json b/crates/fhir/tests/data/json/R4B/healthcareservice-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/healthcareservice-example.json rename to crates/fhir/tests/data/json/R4B/healthcareservice-example.json diff --git a/crates/fhir/tests/data/R4B/healthcareservice-questionnaire.json b/crates/fhir/tests/data/json/R4B/healthcareservice-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/healthcareservice-questionnaire.json rename to crates/fhir/tests/data/json/R4B/healthcareservice-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/healthcareservice.profile.json b/crates/fhir/tests/data/json/R4B/healthcareservice.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/healthcareservice.profile.json rename to crates/fhir/tests/data/json/R4B/healthcareservice.profile.json diff --git a/crates/fhir/tests/data/R4B/heartrate-questionnaire.json b/crates/fhir/tests/data/json/R4B/heartrate-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/heartrate-questionnaire.json rename to crates/fhir/tests/data/json/R4B/heartrate-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/heartrate.profile.json b/crates/fhir/tests/data/json/R4B/heartrate.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/heartrate.profile.json rename to crates/fhir/tests/data/json/R4B/heartrate.profile.json diff --git a/crates/fhir/tests/data/R4B/hlaresult-questionnaire.json b/crates/fhir/tests/data/json/R4B/hlaresult-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/hlaresult-questionnaire.json rename to crates/fhir/tests/data/json/R4B/hlaresult-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/hlaresult.profile.json b/crates/fhir/tests/data/json/R4B/hlaresult.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/hlaresult.profile.json rename to crates/fhir/tests/data/json/R4B/hlaresult.profile.json diff --git a/crates/fhir/tests/data/R4B/humanname.profile.json b/crates/fhir/tests/data/json/R4B/humanname.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/humanname.profile.json rename to crates/fhir/tests/data/json/R4B/humanname.profile.json diff --git a/crates/fhir/tests/data/R4B/id.profile.json b/crates/fhir/tests/data/json/R4B/id.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/id.profile.json rename to crates/fhir/tests/data/json/R4B/id.profile.json diff --git a/crates/fhir/tests/data/R4B/identifier.profile.json b/crates/fhir/tests/data/json/R4B/identifier.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/identifier.profile.json rename to crates/fhir/tests/data/json/R4B/identifier.profile.json diff --git a/crates/fhir/tests/data/R4B/imagingstudy-example-xr.json b/crates/fhir/tests/data/json/R4B/imagingstudy-example-xr.json similarity index 100% rename from crates/fhir/tests/data/R4B/imagingstudy-example-xr.json rename to crates/fhir/tests/data/json/R4B/imagingstudy-example-xr.json diff --git a/crates/fhir/tests/data/R4B/imagingstudy-example.json b/crates/fhir/tests/data/json/R4B/imagingstudy-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/imagingstudy-example.json rename to crates/fhir/tests/data/json/R4B/imagingstudy-example.json diff --git a/crates/fhir/tests/data/R4B/imagingstudy-questionnaire.json b/crates/fhir/tests/data/json/R4B/imagingstudy-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/imagingstudy-questionnaire.json rename to crates/fhir/tests/data/json/R4B/imagingstudy-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/imagingstudy.profile.json b/crates/fhir/tests/data/json/R4B/imagingstudy.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/imagingstudy.profile.json rename to crates/fhir/tests/data/json/R4B/imagingstudy.profile.json diff --git a/crates/fhir/tests/data/R4B/immunization-example-historical.json b/crates/fhir/tests/data/json/R4B/immunization-example-historical.json similarity index 100% rename from crates/fhir/tests/data/R4B/immunization-example-historical.json rename to crates/fhir/tests/data/json/R4B/immunization-example-historical.json diff --git a/crates/fhir/tests/data/R4B/immunization-example-protocol.json b/crates/fhir/tests/data/json/R4B/immunization-example-protocol.json similarity index 100% rename from crates/fhir/tests/data/R4B/immunization-example-protocol.json rename to crates/fhir/tests/data/json/R4B/immunization-example-protocol.json diff --git a/crates/fhir/tests/data/R4B/immunization-example-refused.json b/crates/fhir/tests/data/json/R4B/immunization-example-refused.json similarity index 100% rename from crates/fhir/tests/data/R4B/immunization-example-refused.json rename to crates/fhir/tests/data/json/R4B/immunization-example-refused.json diff --git a/crates/fhir/tests/data/R4B/immunization-example-subpotent.json b/crates/fhir/tests/data/json/R4B/immunization-example-subpotent.json similarity index 100% rename from crates/fhir/tests/data/R4B/immunization-example-subpotent.json rename to crates/fhir/tests/data/json/R4B/immunization-example-subpotent.json diff --git a/crates/fhir/tests/data/R4B/immunization-example.json b/crates/fhir/tests/data/json/R4B/immunization-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/immunization-example.json rename to crates/fhir/tests/data/json/R4B/immunization-example.json diff --git a/crates/fhir/tests/data/R4B/immunization-questionnaire.json b/crates/fhir/tests/data/json/R4B/immunization-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/immunization-questionnaire.json rename to crates/fhir/tests/data/json/R4B/immunization-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/immunization.profile.json b/crates/fhir/tests/data/json/R4B/immunization.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/immunization.profile.json rename to crates/fhir/tests/data/json/R4B/immunization.profile.json diff --git a/crates/fhir/tests/data/R4B/immunizationevaluation-example-notvalid.json b/crates/fhir/tests/data/json/R4B/immunizationevaluation-example-notvalid.json similarity index 100% rename from crates/fhir/tests/data/R4B/immunizationevaluation-example-notvalid.json rename to crates/fhir/tests/data/json/R4B/immunizationevaluation-example-notvalid.json diff --git a/crates/fhir/tests/data/R4B/immunizationevaluation-example.json b/crates/fhir/tests/data/json/R4B/immunizationevaluation-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/immunizationevaluation-example.json rename to crates/fhir/tests/data/json/R4B/immunizationevaluation-example.json diff --git a/crates/fhir/tests/data/R4B/immunizationevaluation-questionnaire.json b/crates/fhir/tests/data/json/R4B/immunizationevaluation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/immunizationevaluation-questionnaire.json rename to crates/fhir/tests/data/json/R4B/immunizationevaluation-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/immunizationevaluation.profile.json b/crates/fhir/tests/data/json/R4B/immunizationevaluation.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/immunizationevaluation.profile.json rename to crates/fhir/tests/data/json/R4B/immunizationevaluation.profile.json diff --git a/crates/fhir/tests/data/R4B/immunizationrecommendation-example-target-disease.json b/crates/fhir/tests/data/json/R4B/immunizationrecommendation-example-target-disease.json similarity index 100% rename from crates/fhir/tests/data/R4B/immunizationrecommendation-example-target-disease.json rename to crates/fhir/tests/data/json/R4B/immunizationrecommendation-example-target-disease.json diff --git a/crates/fhir/tests/data/R4B/immunizationrecommendation-example.json b/crates/fhir/tests/data/json/R4B/immunizationrecommendation-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/immunizationrecommendation-example.json rename to crates/fhir/tests/data/json/R4B/immunizationrecommendation-example.json diff --git a/crates/fhir/tests/data/R4B/immunizationrecommendation-questionnaire.json b/crates/fhir/tests/data/json/R4B/immunizationrecommendation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/immunizationrecommendation-questionnaire.json rename to crates/fhir/tests/data/json/R4B/immunizationrecommendation-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/immunizationrecommendation.profile.json b/crates/fhir/tests/data/json/R4B/immunizationrecommendation.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/immunizationrecommendation.profile.json rename to crates/fhir/tests/data/json/R4B/immunizationrecommendation.profile.json diff --git a/crates/fhir/tests/data/R4B/implementationguide-example.json b/crates/fhir/tests/data/json/R4B/implementationguide-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/implementationguide-example.json rename to crates/fhir/tests/data/json/R4B/implementationguide-example.json diff --git a/crates/fhir/tests/data/R4B/implementationguide-questionnaire.json b/crates/fhir/tests/data/json/R4B/implementationguide-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/implementationguide-questionnaire.json rename to crates/fhir/tests/data/json/R4B/implementationguide-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/implementationguide.profile.json b/crates/fhir/tests/data/json/R4B/implementationguide.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/implementationguide.profile.json rename to crates/fhir/tests/data/json/R4B/implementationguide.profile.json diff --git a/crates/fhir/tests/data/R4B/ingredient-example.json b/crates/fhir/tests/data/json/R4B/ingredient-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/ingredient-example.json rename to crates/fhir/tests/data/json/R4B/ingredient-example.json diff --git a/crates/fhir/tests/data/R4B/ingredient-questionnaire.json b/crates/fhir/tests/data/json/R4B/ingredient-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/ingredient-questionnaire.json rename to crates/fhir/tests/data/json/R4B/ingredient-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/ingredient.profile.json b/crates/fhir/tests/data/json/R4B/ingredient.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/ingredient.profile.json rename to crates/fhir/tests/data/json/R4B/ingredient.profile.json diff --git a/crates/fhir/tests/data/R4B/instant.profile.json b/crates/fhir/tests/data/json/R4B/instant.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/instant.profile.json rename to crates/fhir/tests/data/json/R4B/instant.profile.json diff --git a/crates/fhir/tests/data/R4B/insuranceplan-example.json b/crates/fhir/tests/data/json/R4B/insuranceplan-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/insuranceplan-example.json rename to crates/fhir/tests/data/json/R4B/insuranceplan-example.json diff --git a/crates/fhir/tests/data/R4B/insuranceplan-questionnaire.json b/crates/fhir/tests/data/json/R4B/insuranceplan-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/insuranceplan-questionnaire.json rename to crates/fhir/tests/data/json/R4B/insuranceplan-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/insuranceplan.profile.json b/crates/fhir/tests/data/json/R4B/insuranceplan.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/insuranceplan.profile.json rename to crates/fhir/tests/data/json/R4B/insuranceplan.profile.json diff --git a/crates/fhir/tests/data/R4B/integer.profile.json b/crates/fhir/tests/data/json/R4B/integer.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/integer.profile.json rename to crates/fhir/tests/data/json/R4B/integer.profile.json diff --git a/crates/fhir/tests/data/R4B/invoice-example.json b/crates/fhir/tests/data/json/R4B/invoice-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/invoice-example.json rename to crates/fhir/tests/data/json/R4B/invoice-example.json diff --git a/crates/fhir/tests/data/R4B/invoice-questionnaire.json b/crates/fhir/tests/data/json/R4B/invoice-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/invoice-questionnaire.json rename to crates/fhir/tests/data/json/R4B/invoice-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/invoice.profile.json b/crates/fhir/tests/data/json/R4B/invoice.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/invoice.profile.json rename to crates/fhir/tests/data/json/R4B/invoice.profile.json diff --git a/crates/fhir/tests/data/R4B/json-edge-cases.json b/crates/fhir/tests/data/json/R4B/json-edge-cases.json similarity index 100% rename from crates/fhir/tests/data/R4B/json-edge-cases.json rename to crates/fhir/tests/data/json/R4B/json-edge-cases.json diff --git a/crates/fhir/tests/data/R4B/ldlcholesterol-questionnaire.json b/crates/fhir/tests/data/json/R4B/ldlcholesterol-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/ldlcholesterol-questionnaire.json rename to crates/fhir/tests/data/json/R4B/ldlcholesterol-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/ldlcholesterol.profile.json b/crates/fhir/tests/data/json/R4B/ldlcholesterol.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/ldlcholesterol.profile.json rename to crates/fhir/tests/data/json/R4B/ldlcholesterol.profile.json diff --git a/crates/fhir/tests/data/R4B/library-cms146-example.json b/crates/fhir/tests/data/json/R4B/library-cms146-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-cms146-example.json rename to crates/fhir/tests/data/json/R4B/library-cms146-example.json diff --git a/crates/fhir/tests/data/R4B/library-composition-example.json b/crates/fhir/tests/data/json/R4B/library-composition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-composition-example.json rename to crates/fhir/tests/data/json/R4B/library-composition-example.json diff --git a/crates/fhir/tests/data/R4B/library-example.json b/crates/fhir/tests/data/json/R4B/library-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-example.json rename to crates/fhir/tests/data/json/R4B/library-example.json diff --git a/crates/fhir/tests/data/R4B/library-exclusive-breastfeeding-cds-logic.json b/crates/fhir/tests/data/json/R4B/library-exclusive-breastfeeding-cds-logic.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-exclusive-breastfeeding-cds-logic.json rename to crates/fhir/tests/data/json/R4B/library-exclusive-breastfeeding-cds-logic.json diff --git a/crates/fhir/tests/data/R4B/library-exclusive-breastfeeding-cqm-logic.json b/crates/fhir/tests/data/json/R4B/library-exclusive-breastfeeding-cqm-logic.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-exclusive-breastfeeding-cqm-logic.json rename to crates/fhir/tests/data/json/R4B/library-exclusive-breastfeeding-cqm-logic.json diff --git a/crates/fhir/tests/data/R4B/library-fhir-helpers.json b/crates/fhir/tests/data/json/R4B/library-fhir-helpers.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-fhir-helpers.json rename to crates/fhir/tests/data/json/R4B/library-fhir-helpers.json diff --git a/crates/fhir/tests/data/R4B/library-fhir-model-definition.json b/crates/fhir/tests/data/json/R4B/library-fhir-model-definition.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-fhir-model-definition.json rename to crates/fhir/tests/data/json/R4B/library-fhir-model-definition.json diff --git a/crates/fhir/tests/data/R4B/library-hiv-indicators.json b/crates/fhir/tests/data/json/R4B/library-hiv-indicators.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-hiv-indicators.json rename to crates/fhir/tests/data/json/R4B/library-hiv-indicators.json diff --git a/crates/fhir/tests/data/R4B/library-mmi-suiciderisk-orderset-logic.json b/crates/fhir/tests/data/json/R4B/library-mmi-suiciderisk-orderset-logic.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-mmi-suiciderisk-orderset-logic.json rename to crates/fhir/tests/data/json/R4B/library-mmi-suiciderisk-orderset-logic.json diff --git a/crates/fhir/tests/data/R4B/library-omtk-logic.json b/crates/fhir/tests/data/json/R4B/library-omtk-logic.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-omtk-logic.json rename to crates/fhir/tests/data/json/R4B/library-omtk-logic.json diff --git a/crates/fhir/tests/data/R4B/library-omtk-modelinfo.json b/crates/fhir/tests/data/json/R4B/library-omtk-modelinfo.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-omtk-modelinfo.json rename to crates/fhir/tests/data/json/R4B/library-omtk-modelinfo.json diff --git a/crates/fhir/tests/data/R4B/library-opioidcds-common.json b/crates/fhir/tests/data/json/R4B/library-opioidcds-common.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-opioidcds-common.json rename to crates/fhir/tests/data/json/R4B/library-opioidcds-common.json diff --git a/crates/fhir/tests/data/R4B/library-opioidcds-recommendation-04.json b/crates/fhir/tests/data/json/R4B/library-opioidcds-recommendation-04.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-opioidcds-recommendation-04.json rename to crates/fhir/tests/data/json/R4B/library-opioidcds-recommendation-04.json diff --git a/crates/fhir/tests/data/R4B/library-opioidcds-recommendation-05.json b/crates/fhir/tests/data/json/R4B/library-opioidcds-recommendation-05.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-opioidcds-recommendation-05.json rename to crates/fhir/tests/data/json/R4B/library-opioidcds-recommendation-05.json diff --git a/crates/fhir/tests/data/R4B/library-opioidcds-recommendation-07.json b/crates/fhir/tests/data/json/R4B/library-opioidcds-recommendation-07.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-opioidcds-recommendation-07.json rename to crates/fhir/tests/data/json/R4B/library-opioidcds-recommendation-07.json diff --git a/crates/fhir/tests/data/R4B/library-opioidcds-recommendation-08.json b/crates/fhir/tests/data/json/R4B/library-opioidcds-recommendation-08.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-opioidcds-recommendation-08.json rename to crates/fhir/tests/data/json/R4B/library-opioidcds-recommendation-08.json diff --git a/crates/fhir/tests/data/R4B/library-opioidcds-recommendation-10.json b/crates/fhir/tests/data/json/R4B/library-opioidcds-recommendation-10.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-opioidcds-recommendation-10.json rename to crates/fhir/tests/data/json/R4B/library-opioidcds-recommendation-10.json diff --git a/crates/fhir/tests/data/R4B/library-opioidcds-recommendation-11.json b/crates/fhir/tests/data/json/R4B/library-opioidcds-recommendation-11.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-opioidcds-recommendation-11.json rename to crates/fhir/tests/data/json/R4B/library-opioidcds-recommendation-11.json diff --git a/crates/fhir/tests/data/R4B/library-predecessor-example.json b/crates/fhir/tests/data/json/R4B/library-predecessor-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-predecessor-example.json rename to crates/fhir/tests/data/json/R4B/library-predecessor-example.json diff --git a/crates/fhir/tests/data/R4B/library-questionnaire.json b/crates/fhir/tests/data/json/R4B/library-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-questionnaire.json rename to crates/fhir/tests/data/json/R4B/library-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/library-quick-model-definition.json b/crates/fhir/tests/data/json/R4B/library-quick-model-definition.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-quick-model-definition.json rename to crates/fhir/tests/data/json/R4B/library-quick-model-definition.json diff --git a/crates/fhir/tests/data/R4B/library-zika-virus-intervention-logic.json b/crates/fhir/tests/data/json/R4B/library-zika-virus-intervention-logic.json similarity index 100% rename from crates/fhir/tests/data/R4B/library-zika-virus-intervention-logic.json rename to crates/fhir/tests/data/json/R4B/library-zika-virus-intervention-logic.json diff --git a/crates/fhir/tests/data/R4B/library.profile.json b/crates/fhir/tests/data/json/R4B/library.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/library.profile.json rename to crates/fhir/tests/data/json/R4B/library.profile.json diff --git a/crates/fhir/tests/data/R4B/linkage-example.json b/crates/fhir/tests/data/json/R4B/linkage-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/linkage-example.json rename to crates/fhir/tests/data/json/R4B/linkage-example.json diff --git a/crates/fhir/tests/data/R4B/linkage-questionnaire.json b/crates/fhir/tests/data/json/R4B/linkage-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/linkage-questionnaire.json rename to crates/fhir/tests/data/json/R4B/linkage-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/linkage.profile.json b/crates/fhir/tests/data/json/R4B/linkage.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/linkage.profile.json rename to crates/fhir/tests/data/json/R4B/linkage.profile.json diff --git a/crates/fhir/tests/data/R4B/lipidprofile-questionnaire.json b/crates/fhir/tests/data/json/R4B/lipidprofile-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/lipidprofile-questionnaire.json rename to crates/fhir/tests/data/json/R4B/lipidprofile-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/lipidprofile.profile.json b/crates/fhir/tests/data/json/R4B/lipidprofile.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/lipidprofile.profile.json rename to crates/fhir/tests/data/json/R4B/lipidprofile.profile.json diff --git a/crates/fhir/tests/data/R4B/list-example-allergies.json b/crates/fhir/tests/data/json/R4B/list-example-allergies.json similarity index 100% rename from crates/fhir/tests/data/R4B/list-example-allergies.json rename to crates/fhir/tests/data/json/R4B/list-example-allergies.json diff --git a/crates/fhir/tests/data/R4B/list-example-double-cousin-relationship-pedigree.json b/crates/fhir/tests/data/json/R4B/list-example-double-cousin-relationship-pedigree.json similarity index 100% rename from crates/fhir/tests/data/R4B/list-example-double-cousin-relationship-pedigree.json rename to crates/fhir/tests/data/json/R4B/list-example-double-cousin-relationship-pedigree.json diff --git a/crates/fhir/tests/data/R4B/list-example-empty.json b/crates/fhir/tests/data/json/R4B/list-example-empty.json similarity index 100% rename from crates/fhir/tests/data/R4B/list-example-empty.json rename to crates/fhir/tests/data/json/R4B/list-example-empty.json diff --git a/crates/fhir/tests/data/R4B/list-example-familyhistory-f201-roel.json b/crates/fhir/tests/data/json/R4B/list-example-familyhistory-f201-roel.json similarity index 100% rename from crates/fhir/tests/data/R4B/list-example-familyhistory-f201-roel.json rename to crates/fhir/tests/data/json/R4B/list-example-familyhistory-f201-roel.json diff --git a/crates/fhir/tests/data/R4B/list-example-familyhistory-genetics-profile-annie.json b/crates/fhir/tests/data/json/R4B/list-example-familyhistory-genetics-profile-annie.json similarity index 100% rename from crates/fhir/tests/data/R4B/list-example-familyhistory-genetics-profile-annie.json rename to crates/fhir/tests/data/json/R4B/list-example-familyhistory-genetics-profile-annie.json diff --git a/crates/fhir/tests/data/R4B/list-example-familyhistory-genetics-profile.json b/crates/fhir/tests/data/json/R4B/list-example-familyhistory-genetics-profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/list-example-familyhistory-genetics-profile.json rename to crates/fhir/tests/data/json/R4B/list-example-familyhistory-genetics-profile.json diff --git a/crates/fhir/tests/data/R4B/list-example-long.json b/crates/fhir/tests/data/json/R4B/list-example-long.json similarity index 100% rename from crates/fhir/tests/data/R4B/list-example-long.json rename to crates/fhir/tests/data/json/R4B/list-example-long.json diff --git a/crates/fhir/tests/data/R4B/list-example-medlist.json b/crates/fhir/tests/data/json/R4B/list-example-medlist.json similarity index 100% rename from crates/fhir/tests/data/R4B/list-example-medlist.json rename to crates/fhir/tests/data/json/R4B/list-example-medlist.json diff --git a/crates/fhir/tests/data/R4B/list-example-simple-empty.json b/crates/fhir/tests/data/json/R4B/list-example-simple-empty.json similarity index 100% rename from crates/fhir/tests/data/R4B/list-example-simple-empty.json rename to crates/fhir/tests/data/json/R4B/list-example-simple-empty.json diff --git a/crates/fhir/tests/data/R4B/list-example.json b/crates/fhir/tests/data/json/R4B/list-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/list-example.json rename to crates/fhir/tests/data/json/R4B/list-example.json diff --git a/crates/fhir/tests/data/R4B/list-questionnaire.json b/crates/fhir/tests/data/json/R4B/list-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/list-questionnaire.json rename to crates/fhir/tests/data/json/R4B/list-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/list.profile.json b/crates/fhir/tests/data/json/R4B/list.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/list.profile.json rename to crates/fhir/tests/data/json/R4B/list.profile.json diff --git a/crates/fhir/tests/data/R4B/location-example-ambulance.json b/crates/fhir/tests/data/json/R4B/location-example-ambulance.json similarity index 100% rename from crates/fhir/tests/data/R4B/location-example-ambulance.json rename to crates/fhir/tests/data/json/R4B/location-example-ambulance.json diff --git a/crates/fhir/tests/data/R4B/location-example-hl7hq.json b/crates/fhir/tests/data/json/R4B/location-example-hl7hq.json similarity index 100% rename from crates/fhir/tests/data/R4B/location-example-hl7hq.json rename to crates/fhir/tests/data/json/R4B/location-example-hl7hq.json diff --git a/crates/fhir/tests/data/R4B/location-example-patients-home.json b/crates/fhir/tests/data/json/R4B/location-example-patients-home.json similarity index 100% rename from crates/fhir/tests/data/R4B/location-example-patients-home.json rename to crates/fhir/tests/data/json/R4B/location-example-patients-home.json diff --git a/crates/fhir/tests/data/R4B/location-example-room.json b/crates/fhir/tests/data/json/R4B/location-example-room.json similarity index 100% rename from crates/fhir/tests/data/R4B/location-example-room.json rename to crates/fhir/tests/data/json/R4B/location-example-room.json diff --git a/crates/fhir/tests/data/R4B/location-example-ukpharmacy.json b/crates/fhir/tests/data/json/R4B/location-example-ukpharmacy.json similarity index 100% rename from crates/fhir/tests/data/R4B/location-example-ukpharmacy.json rename to crates/fhir/tests/data/json/R4B/location-example-ukpharmacy.json diff --git a/crates/fhir/tests/data/R4B/location-example.json b/crates/fhir/tests/data/json/R4B/location-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/location-example.json rename to crates/fhir/tests/data/json/R4B/location-example.json diff --git a/crates/fhir/tests/data/R4B/location-examples-general.json b/crates/fhir/tests/data/json/R4B/location-examples-general.json similarity index 100% rename from crates/fhir/tests/data/R4B/location-examples-general.json rename to crates/fhir/tests/data/json/R4B/location-examples-general.json diff --git a/crates/fhir/tests/data/R4B/location-questionnaire.json b/crates/fhir/tests/data/json/R4B/location-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/location-questionnaire.json rename to crates/fhir/tests/data/json/R4B/location-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/location.profile.json b/crates/fhir/tests/data/json/R4B/location.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/location.profile.json rename to crates/fhir/tests/data/json/R4B/location.profile.json diff --git a/crates/fhir/tests/data/R4B/manufactureditemdefinition-example.json b/crates/fhir/tests/data/json/R4B/manufactureditemdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/manufactureditemdefinition-example.json rename to crates/fhir/tests/data/json/R4B/manufactureditemdefinition-example.json diff --git a/crates/fhir/tests/data/R4B/manufactureditemdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/manufactureditemdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/manufactureditemdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/manufactureditemdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/manufactureditemdefinition.profile.json b/crates/fhir/tests/data/json/R4B/manufactureditemdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/manufactureditemdefinition.profile.json rename to crates/fhir/tests/data/json/R4B/manufactureditemdefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/markdown.profile.json b/crates/fhir/tests/data/json/R4B/markdown.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/markdown.profile.json rename to crates/fhir/tests/data/json/R4B/markdown.profile.json diff --git a/crates/fhir/tests/data/R4B/marketingstatus.profile.json b/crates/fhir/tests/data/json/R4B/marketingstatus.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/marketingstatus.profile.json rename to crates/fhir/tests/data/json/R4B/marketingstatus.profile.json diff --git a/crates/fhir/tests/data/R4B/measure-cms146-example.json b/crates/fhir/tests/data/json/R4B/measure-cms146-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/measure-cms146-example.json rename to crates/fhir/tests/data/json/R4B/measure-cms146-example.json diff --git a/crates/fhir/tests/data/R4B/measure-component-a-example.json b/crates/fhir/tests/data/json/R4B/measure-component-a-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/measure-component-a-example.json rename to crates/fhir/tests/data/json/R4B/measure-component-a-example.json diff --git a/crates/fhir/tests/data/R4B/measure-component-b-example.json b/crates/fhir/tests/data/json/R4B/measure-component-b-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/measure-component-b-example.json rename to crates/fhir/tests/data/json/R4B/measure-component-b-example.json diff --git a/crates/fhir/tests/data/R4B/measure-composite-example.json b/crates/fhir/tests/data/json/R4B/measure-composite-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/measure-composite-example.json rename to crates/fhir/tests/data/json/R4B/measure-composite-example.json diff --git a/crates/fhir/tests/data/R4B/measure-exclusive-breastfeeding.json b/crates/fhir/tests/data/json/R4B/measure-exclusive-breastfeeding.json similarity index 100% rename from crates/fhir/tests/data/R4B/measure-exclusive-breastfeeding.json rename to crates/fhir/tests/data/json/R4B/measure-exclusive-breastfeeding.json diff --git a/crates/fhir/tests/data/R4B/measure-hiv-indicators.json b/crates/fhir/tests/data/json/R4B/measure-hiv-indicators.json similarity index 100% rename from crates/fhir/tests/data/R4B/measure-hiv-indicators.json rename to crates/fhir/tests/data/json/R4B/measure-hiv-indicators.json diff --git a/crates/fhir/tests/data/R4B/measure-predecessor-example.json b/crates/fhir/tests/data/json/R4B/measure-predecessor-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/measure-predecessor-example.json rename to crates/fhir/tests/data/json/R4B/measure-predecessor-example.json diff --git a/crates/fhir/tests/data/R4B/measure-questionnaire.json b/crates/fhir/tests/data/json/R4B/measure-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/measure-questionnaire.json rename to crates/fhir/tests/data/json/R4B/measure-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/measure.profile.json b/crates/fhir/tests/data/json/R4B/measure.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/measure.profile.json rename to crates/fhir/tests/data/json/R4B/measure.profile.json diff --git a/crates/fhir/tests/data/R4B/measurereport-cms146-cat1-example.json b/crates/fhir/tests/data/json/R4B/measurereport-cms146-cat1-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/measurereport-cms146-cat1-example.json rename to crates/fhir/tests/data/json/R4B/measurereport-cms146-cat1-example.json diff --git a/crates/fhir/tests/data/R4B/measurereport-cms146-cat3-example.json b/crates/fhir/tests/data/json/R4B/measurereport-cms146-cat3-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/measurereport-cms146-cat3-example.json rename to crates/fhir/tests/data/json/R4B/measurereport-cms146-cat3-example.json diff --git a/crates/fhir/tests/data/R4B/measurereport-general-example.json b/crates/fhir/tests/data/json/R4B/measurereport-general-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/measurereport-general-example.json rename to crates/fhir/tests/data/json/R4B/measurereport-general-example.json diff --git a/crates/fhir/tests/data/R4B/measurereport-hiv-indicators.json b/crates/fhir/tests/data/json/R4B/measurereport-hiv-indicators.json similarity index 100% rename from crates/fhir/tests/data/R4B/measurereport-hiv-indicators.json rename to crates/fhir/tests/data/json/R4B/measurereport-hiv-indicators.json diff --git a/crates/fhir/tests/data/R4B/measurereport-questionnaire.json b/crates/fhir/tests/data/json/R4B/measurereport-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/measurereport-questionnaire.json rename to crates/fhir/tests/data/json/R4B/measurereport-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/measurereport.profile.json b/crates/fhir/tests/data/json/R4B/measurereport.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/measurereport.profile.json rename to crates/fhir/tests/data/json/R4B/measurereport.profile.json diff --git a/crates/fhir/tests/data/R4B/media-example-dicom.json b/crates/fhir/tests/data/json/R4B/media-example-dicom.json similarity index 100% rename from crates/fhir/tests/data/R4B/media-example-dicom.json rename to crates/fhir/tests/data/json/R4B/media-example-dicom.json diff --git a/crates/fhir/tests/data/R4B/media-example-sound.json b/crates/fhir/tests/data/json/R4B/media-example-sound.json similarity index 100% rename from crates/fhir/tests/data/R4B/media-example-sound.json rename to crates/fhir/tests/data/json/R4B/media-example-sound.json diff --git a/crates/fhir/tests/data/R4B/media-example-xray.json b/crates/fhir/tests/data/json/R4B/media-example-xray.json similarity index 100% rename from crates/fhir/tests/data/R4B/media-example-xray.json rename to crates/fhir/tests/data/json/R4B/media-example-xray.json diff --git a/crates/fhir/tests/data/R4B/media-example.json b/crates/fhir/tests/data/json/R4B/media-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/media-example.json rename to crates/fhir/tests/data/json/R4B/media-example.json diff --git a/crates/fhir/tests/data/R4B/media-questionnaire.json b/crates/fhir/tests/data/json/R4B/media-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/media-questionnaire.json rename to crates/fhir/tests/data/json/R4B/media-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/media.profile.json b/crates/fhir/tests/data/json/R4B/media.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/media.profile.json rename to crates/fhir/tests/data/json/R4B/media.profile.json diff --git a/crates/fhir/tests/data/R4B/medication-questionnaire.json b/crates/fhir/tests/data/json/R4B/medication-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/medication-questionnaire.json rename to crates/fhir/tests/data/json/R4B/medication-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/medication.profile.json b/crates/fhir/tests/data/json/R4B/medication.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/medication.profile.json rename to crates/fhir/tests/data/json/R4B/medication.profile.json diff --git a/crates/fhir/tests/data/R4B/medicationadministration-questionnaire.json b/crates/fhir/tests/data/json/R4B/medicationadministration-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationadministration-questionnaire.json rename to crates/fhir/tests/data/json/R4B/medicationadministration-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/medicationadministration.profile.json b/crates/fhir/tests/data/json/R4B/medicationadministration.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationadministration.profile.json rename to crates/fhir/tests/data/json/R4B/medicationadministration.profile.json diff --git a/crates/fhir/tests/data/R4B/medicationadministration0301.json b/crates/fhir/tests/data/json/R4B/medicationadministration0301.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationadministration0301.json rename to crates/fhir/tests/data/json/R4B/medicationadministration0301.json diff --git a/crates/fhir/tests/data/R4B/medicationadministration0302.json b/crates/fhir/tests/data/json/R4B/medicationadministration0302.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationadministration0302.json rename to crates/fhir/tests/data/json/R4B/medicationadministration0302.json diff --git a/crates/fhir/tests/data/R4B/medicationadministration0303.json b/crates/fhir/tests/data/json/R4B/medicationadministration0303.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationadministration0303.json rename to crates/fhir/tests/data/json/R4B/medicationadministration0303.json diff --git a/crates/fhir/tests/data/R4B/medicationadministration0304.json b/crates/fhir/tests/data/json/R4B/medicationadministration0304.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationadministration0304.json rename to crates/fhir/tests/data/json/R4B/medicationadministration0304.json diff --git a/crates/fhir/tests/data/R4B/medicationadministration0305.json b/crates/fhir/tests/data/json/R4B/medicationadministration0305.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationadministration0305.json rename to crates/fhir/tests/data/json/R4B/medicationadministration0305.json diff --git a/crates/fhir/tests/data/R4B/medicationadministration0306.json b/crates/fhir/tests/data/json/R4B/medicationadministration0306.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationadministration0306.json rename to crates/fhir/tests/data/json/R4B/medicationadministration0306.json diff --git a/crates/fhir/tests/data/R4B/medicationadministration0307.json b/crates/fhir/tests/data/json/R4B/medicationadministration0307.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationadministration0307.json rename to crates/fhir/tests/data/json/R4B/medicationadministration0307.json diff --git a/crates/fhir/tests/data/R4B/medicationadministration0308.json b/crates/fhir/tests/data/json/R4B/medicationadministration0308.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationadministration0308.json rename to crates/fhir/tests/data/json/R4B/medicationadministration0308.json diff --git a/crates/fhir/tests/data/R4B/medicationadministration0309.json b/crates/fhir/tests/data/json/R4B/medicationadministration0309.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationadministration0309.json rename to crates/fhir/tests/data/json/R4B/medicationadministration0309.json diff --git a/crates/fhir/tests/data/R4B/medicationadministration0310.json b/crates/fhir/tests/data/json/R4B/medicationadministration0310.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationadministration0310.json rename to crates/fhir/tests/data/json/R4B/medicationadministration0310.json diff --git a/crates/fhir/tests/data/R4B/medicationadministration0311.json b/crates/fhir/tests/data/json/R4B/medicationadministration0311.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationadministration0311.json rename to crates/fhir/tests/data/json/R4B/medicationadministration0311.json diff --git a/crates/fhir/tests/data/R4B/medicationadministration0312.json b/crates/fhir/tests/data/json/R4B/medicationadministration0312.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationadministration0312.json rename to crates/fhir/tests/data/json/R4B/medicationadministration0312.json diff --git a/crates/fhir/tests/data/R4B/medicationadministration0313.json b/crates/fhir/tests/data/json/R4B/medicationadministration0313.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationadministration0313.json rename to crates/fhir/tests/data/json/R4B/medicationadministration0313.json diff --git a/crates/fhir/tests/data/R4B/medicationadministrationexample3.json b/crates/fhir/tests/data/json/R4B/medicationadministrationexample3.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationadministrationexample3.json rename to crates/fhir/tests/data/json/R4B/medicationadministrationexample3.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense-questionnaire.json b/crates/fhir/tests/data/json/R4B/medicationdispense-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense-questionnaire.json rename to crates/fhir/tests/data/json/R4B/medicationdispense-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense.profile.json b/crates/fhir/tests/data/json/R4B/medicationdispense.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense.profile.json rename to crates/fhir/tests/data/json/R4B/medicationdispense.profile.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0301.json b/crates/fhir/tests/data/json/R4B/medicationdispense0301.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0301.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0301.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0302.json b/crates/fhir/tests/data/json/R4B/medicationdispense0302.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0302.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0302.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0303.json b/crates/fhir/tests/data/json/R4B/medicationdispense0303.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0303.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0303.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0304.json b/crates/fhir/tests/data/json/R4B/medicationdispense0304.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0304.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0304.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0305.json b/crates/fhir/tests/data/json/R4B/medicationdispense0305.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0305.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0305.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0306.json b/crates/fhir/tests/data/json/R4B/medicationdispense0306.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0306.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0306.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0307.json b/crates/fhir/tests/data/json/R4B/medicationdispense0307.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0307.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0307.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0308.json b/crates/fhir/tests/data/json/R4B/medicationdispense0308.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0308.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0308.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0309.json b/crates/fhir/tests/data/json/R4B/medicationdispense0309.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0309.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0309.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0310.json b/crates/fhir/tests/data/json/R4B/medicationdispense0310.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0310.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0310.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0311.json b/crates/fhir/tests/data/json/R4B/medicationdispense0311.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0311.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0311.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0312.json b/crates/fhir/tests/data/json/R4B/medicationdispense0312.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0312.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0312.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0313.json b/crates/fhir/tests/data/json/R4B/medicationdispense0313.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0313.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0313.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0314.json b/crates/fhir/tests/data/json/R4B/medicationdispense0314.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0314.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0314.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0315.json b/crates/fhir/tests/data/json/R4B/medicationdispense0315.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0315.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0315.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0316.json b/crates/fhir/tests/data/json/R4B/medicationdispense0316.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0316.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0316.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0317.json b/crates/fhir/tests/data/json/R4B/medicationdispense0317.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0317.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0317.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0318.json b/crates/fhir/tests/data/json/R4B/medicationdispense0318.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0318.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0318.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0319.json b/crates/fhir/tests/data/json/R4B/medicationdispense0319.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0319.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0319.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0320.json b/crates/fhir/tests/data/json/R4B/medicationdispense0320.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0320.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0320.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0321.json b/crates/fhir/tests/data/json/R4B/medicationdispense0321.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0321.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0321.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0322.json b/crates/fhir/tests/data/json/R4B/medicationdispense0322.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0322.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0322.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0324.json b/crates/fhir/tests/data/json/R4B/medicationdispense0324.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0324.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0324.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0325.json b/crates/fhir/tests/data/json/R4B/medicationdispense0325.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0325.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0325.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0326.json b/crates/fhir/tests/data/json/R4B/medicationdispense0326.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0326.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0326.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0327.json b/crates/fhir/tests/data/json/R4B/medicationdispense0327.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0327.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0327.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0328.json b/crates/fhir/tests/data/json/R4B/medicationdispense0328.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0328.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0328.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0329.json b/crates/fhir/tests/data/json/R4B/medicationdispense0329.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0329.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0329.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0330.json b/crates/fhir/tests/data/json/R4B/medicationdispense0330.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0330.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0330.json diff --git a/crates/fhir/tests/data/R4B/medicationdispense0331.json b/crates/fhir/tests/data/json/R4B/medicationdispense0331.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispense0331.json rename to crates/fhir/tests/data/json/R4B/medicationdispense0331.json diff --git a/crates/fhir/tests/data/R4B/medicationdispenseexample8.json b/crates/fhir/tests/data/json/R4B/medicationdispenseexample8.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationdispenseexample8.json rename to crates/fhir/tests/data/json/R4B/medicationdispenseexample8.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0301.json b/crates/fhir/tests/data/json/R4B/medicationexample0301.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0301.json rename to crates/fhir/tests/data/json/R4B/medicationexample0301.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0302.json b/crates/fhir/tests/data/json/R4B/medicationexample0302.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0302.json rename to crates/fhir/tests/data/json/R4B/medicationexample0302.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0303.json b/crates/fhir/tests/data/json/R4B/medicationexample0303.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0303.json rename to crates/fhir/tests/data/json/R4B/medicationexample0303.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0304.json b/crates/fhir/tests/data/json/R4B/medicationexample0304.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0304.json rename to crates/fhir/tests/data/json/R4B/medicationexample0304.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0305.json b/crates/fhir/tests/data/json/R4B/medicationexample0305.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0305.json rename to crates/fhir/tests/data/json/R4B/medicationexample0305.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0306.json b/crates/fhir/tests/data/json/R4B/medicationexample0306.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0306.json rename to crates/fhir/tests/data/json/R4B/medicationexample0306.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0307.json b/crates/fhir/tests/data/json/R4B/medicationexample0307.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0307.json rename to crates/fhir/tests/data/json/R4B/medicationexample0307.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0308.json b/crates/fhir/tests/data/json/R4B/medicationexample0308.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0308.json rename to crates/fhir/tests/data/json/R4B/medicationexample0308.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0309.json b/crates/fhir/tests/data/json/R4B/medicationexample0309.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0309.json rename to crates/fhir/tests/data/json/R4B/medicationexample0309.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0310.json b/crates/fhir/tests/data/json/R4B/medicationexample0310.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0310.json rename to crates/fhir/tests/data/json/R4B/medicationexample0310.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0311.json b/crates/fhir/tests/data/json/R4B/medicationexample0311.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0311.json rename to crates/fhir/tests/data/json/R4B/medicationexample0311.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0312.json b/crates/fhir/tests/data/json/R4B/medicationexample0312.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0312.json rename to crates/fhir/tests/data/json/R4B/medicationexample0312.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0313.json b/crates/fhir/tests/data/json/R4B/medicationexample0313.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0313.json rename to crates/fhir/tests/data/json/R4B/medicationexample0313.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0314.json b/crates/fhir/tests/data/json/R4B/medicationexample0314.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0314.json rename to crates/fhir/tests/data/json/R4B/medicationexample0314.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0315.json b/crates/fhir/tests/data/json/R4B/medicationexample0315.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0315.json rename to crates/fhir/tests/data/json/R4B/medicationexample0315.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0316.json b/crates/fhir/tests/data/json/R4B/medicationexample0316.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0316.json rename to crates/fhir/tests/data/json/R4B/medicationexample0316.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0317.json b/crates/fhir/tests/data/json/R4B/medicationexample0317.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0317.json rename to crates/fhir/tests/data/json/R4B/medicationexample0317.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0318.json b/crates/fhir/tests/data/json/R4B/medicationexample0318.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0318.json rename to crates/fhir/tests/data/json/R4B/medicationexample0318.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0319.json b/crates/fhir/tests/data/json/R4B/medicationexample0319.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0319.json rename to crates/fhir/tests/data/json/R4B/medicationexample0319.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0320.json b/crates/fhir/tests/data/json/R4B/medicationexample0320.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0320.json rename to crates/fhir/tests/data/json/R4B/medicationexample0320.json diff --git a/crates/fhir/tests/data/R4B/medicationexample0321.json b/crates/fhir/tests/data/json/R4B/medicationexample0321.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample0321.json rename to crates/fhir/tests/data/json/R4B/medicationexample0321.json diff --git a/crates/fhir/tests/data/R4B/medicationexample1.json b/crates/fhir/tests/data/json/R4B/medicationexample1.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample1.json rename to crates/fhir/tests/data/json/R4B/medicationexample1.json diff --git a/crates/fhir/tests/data/R4B/medicationexample15.json b/crates/fhir/tests/data/json/R4B/medicationexample15.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationexample15.json rename to crates/fhir/tests/data/json/R4B/medicationexample15.json diff --git a/crates/fhir/tests/data/R4B/medicationknowledge-example.json b/crates/fhir/tests/data/json/R4B/medicationknowledge-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationknowledge-example.json rename to crates/fhir/tests/data/json/R4B/medicationknowledge-example.json diff --git a/crates/fhir/tests/data/R4B/medicationknowledge-questionnaire.json b/crates/fhir/tests/data/json/R4B/medicationknowledge-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationknowledge-questionnaire.json rename to crates/fhir/tests/data/json/R4B/medicationknowledge-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/medicationknowledge.profile.json b/crates/fhir/tests/data/json/R4B/medicationknowledge.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationknowledge.profile.json rename to crates/fhir/tests/data/json/R4B/medicationknowledge.profile.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest-questionnaire.json b/crates/fhir/tests/data/json/R4B/medicationrequest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest-questionnaire.json rename to crates/fhir/tests/data/json/R4B/medicationrequest-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest.profile.json b/crates/fhir/tests/data/json/R4B/medicationrequest.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest.profile.json rename to crates/fhir/tests/data/json/R4B/medicationrequest.profile.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0301.json b/crates/fhir/tests/data/json/R4B/medicationrequest0301.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0301.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0301.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0302.json b/crates/fhir/tests/data/json/R4B/medicationrequest0302.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0302.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0302.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0303.json b/crates/fhir/tests/data/json/R4B/medicationrequest0303.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0303.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0303.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0304.json b/crates/fhir/tests/data/json/R4B/medicationrequest0304.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0304.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0304.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0305.json b/crates/fhir/tests/data/json/R4B/medicationrequest0305.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0305.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0305.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0306.json b/crates/fhir/tests/data/json/R4B/medicationrequest0306.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0306.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0306.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0307.json b/crates/fhir/tests/data/json/R4B/medicationrequest0307.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0307.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0307.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0308.json b/crates/fhir/tests/data/json/R4B/medicationrequest0308.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0308.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0308.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0309.json b/crates/fhir/tests/data/json/R4B/medicationrequest0309.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0309.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0309.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0310.json b/crates/fhir/tests/data/json/R4B/medicationrequest0310.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0310.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0310.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0312.json b/crates/fhir/tests/data/json/R4B/medicationrequest0312.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0312.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0312.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0313.json b/crates/fhir/tests/data/json/R4B/medicationrequest0313.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0313.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0313.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0314.json b/crates/fhir/tests/data/json/R4B/medicationrequest0314.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0314.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0314.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0315.json b/crates/fhir/tests/data/json/R4B/medicationrequest0315.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0315.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0315.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0316.json b/crates/fhir/tests/data/json/R4B/medicationrequest0316.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0316.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0316.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0317.json b/crates/fhir/tests/data/json/R4B/medicationrequest0317.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0317.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0317.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0318.json b/crates/fhir/tests/data/json/R4B/medicationrequest0318.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0318.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0318.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0319.json b/crates/fhir/tests/data/json/R4B/medicationrequest0319.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0319.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0319.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0320.json b/crates/fhir/tests/data/json/R4B/medicationrequest0320.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0320.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0320.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0321.json b/crates/fhir/tests/data/json/R4B/medicationrequest0321.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0321.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0321.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0322.json b/crates/fhir/tests/data/json/R4B/medicationrequest0322.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0322.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0322.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0323.json b/crates/fhir/tests/data/json/R4B/medicationrequest0323.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0323.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0323.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0324.json b/crates/fhir/tests/data/json/R4B/medicationrequest0324.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0324.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0324.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0325.json b/crates/fhir/tests/data/json/R4B/medicationrequest0325.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0325.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0325.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0326.json b/crates/fhir/tests/data/json/R4B/medicationrequest0326.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0326.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0326.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0327.json b/crates/fhir/tests/data/json/R4B/medicationrequest0327.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0327.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0327.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0328.json b/crates/fhir/tests/data/json/R4B/medicationrequest0328.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0328.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0328.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0329.json b/crates/fhir/tests/data/json/R4B/medicationrequest0329.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0329.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0329.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0330.json b/crates/fhir/tests/data/json/R4B/medicationrequest0330.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0330.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0330.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0331.json b/crates/fhir/tests/data/json/R4B/medicationrequest0331.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0331.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0331.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0332.json b/crates/fhir/tests/data/json/R4B/medicationrequest0332.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0332.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0332.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0333.json b/crates/fhir/tests/data/json/R4B/medicationrequest0333.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0333.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0333.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0334.json b/crates/fhir/tests/data/json/R4B/medicationrequest0334.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0334.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0334.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0335.json b/crates/fhir/tests/data/json/R4B/medicationrequest0335.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0335.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0335.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0336.json b/crates/fhir/tests/data/json/R4B/medicationrequest0336.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0336.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0336.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0337.json b/crates/fhir/tests/data/json/R4B/medicationrequest0337.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0337.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0337.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0338.json b/crates/fhir/tests/data/json/R4B/medicationrequest0338.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0338.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0338.json diff --git a/crates/fhir/tests/data/R4B/medicationrequest0339.json b/crates/fhir/tests/data/json/R4B/medicationrequest0339.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequest0339.json rename to crates/fhir/tests/data/json/R4B/medicationrequest0339.json diff --git a/crates/fhir/tests/data/R4B/medicationrequestexample1.json b/crates/fhir/tests/data/json/R4B/medicationrequestexample1.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequestexample1.json rename to crates/fhir/tests/data/json/R4B/medicationrequestexample1.json diff --git a/crates/fhir/tests/data/R4B/medicationrequestexample2.json b/crates/fhir/tests/data/json/R4B/medicationrequestexample2.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationrequestexample2.json rename to crates/fhir/tests/data/json/R4B/medicationrequestexample2.json diff --git a/crates/fhir/tests/data/R4B/medicationstatement-questionnaire.json b/crates/fhir/tests/data/json/R4B/medicationstatement-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationstatement-questionnaire.json rename to crates/fhir/tests/data/json/R4B/medicationstatement-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/medicationstatement.profile.json b/crates/fhir/tests/data/json/R4B/medicationstatement.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationstatement.profile.json rename to crates/fhir/tests/data/json/R4B/medicationstatement.profile.json diff --git a/crates/fhir/tests/data/R4B/medicationstatementexample1.json b/crates/fhir/tests/data/json/R4B/medicationstatementexample1.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationstatementexample1.json rename to crates/fhir/tests/data/json/R4B/medicationstatementexample1.json diff --git a/crates/fhir/tests/data/R4B/medicationstatementexample2.json b/crates/fhir/tests/data/json/R4B/medicationstatementexample2.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationstatementexample2.json rename to crates/fhir/tests/data/json/R4B/medicationstatementexample2.json diff --git a/crates/fhir/tests/data/R4B/medicationstatementexample3.json b/crates/fhir/tests/data/json/R4B/medicationstatementexample3.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationstatementexample3.json rename to crates/fhir/tests/data/json/R4B/medicationstatementexample3.json diff --git a/crates/fhir/tests/data/R4B/medicationstatementexample4.json b/crates/fhir/tests/data/json/R4B/medicationstatementexample4.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationstatementexample4.json rename to crates/fhir/tests/data/json/R4B/medicationstatementexample4.json diff --git a/crates/fhir/tests/data/R4B/medicationstatementexample5.json b/crates/fhir/tests/data/json/R4B/medicationstatementexample5.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationstatementexample5.json rename to crates/fhir/tests/data/json/R4B/medicationstatementexample5.json diff --git a/crates/fhir/tests/data/R4B/medicationstatementexample6.json b/crates/fhir/tests/data/json/R4B/medicationstatementexample6.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationstatementexample6.json rename to crates/fhir/tests/data/json/R4B/medicationstatementexample6.json diff --git a/crates/fhir/tests/data/R4B/medicationstatementexample7.json b/crates/fhir/tests/data/json/R4B/medicationstatementexample7.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicationstatementexample7.json rename to crates/fhir/tests/data/json/R4B/medicationstatementexample7.json diff --git a/crates/fhir/tests/data/R4B/medicinalproductdefinition-acetaminophen-500mg-tablets-box-of-20.json b/crates/fhir/tests/data/json/R4B/medicinalproductdefinition-acetaminophen-500mg-tablets-box-of-20.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicinalproductdefinition-acetaminophen-500mg-tablets-box-of-20.json rename to crates/fhir/tests/data/json/R4B/medicinalproductdefinition-acetaminophen-500mg-tablets-box-of-20.json diff --git a/crates/fhir/tests/data/R4B/medicinalproductdefinition-example-co-packaged-liquid-and-syringe-complete.json b/crates/fhir/tests/data/json/R4B/medicinalproductdefinition-example-co-packaged-liquid-and-syringe-complete.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicinalproductdefinition-example-co-packaged-liquid-and-syringe-complete.json rename to crates/fhir/tests/data/json/R4B/medicinalproductdefinition-example-co-packaged-liquid-and-syringe-complete.json diff --git a/crates/fhir/tests/data/R4B/medicinalproductdefinition-example-co-packaged-liquid-and-syringe.json b/crates/fhir/tests/data/json/R4B/medicinalproductdefinition-example-co-packaged-liquid-and-syringe.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicinalproductdefinition-example-co-packaged-liquid-and-syringe.json rename to crates/fhir/tests/data/json/R4B/medicinalproductdefinition-example-co-packaged-liquid-and-syringe.json diff --git a/crates/fhir/tests/data/R4B/medicinalproductdefinition-example-combo-product-bundle.json b/crates/fhir/tests/data/json/R4B/medicinalproductdefinition-example-combo-product-bundle.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicinalproductdefinition-example-combo-product-bundle.json rename to crates/fhir/tests/data/json/R4B/medicinalproductdefinition-example-combo-product-bundle.json diff --git a/crates/fhir/tests/data/R4B/medicinalproductdefinition-example-combo-product.json b/crates/fhir/tests/data/json/R4B/medicinalproductdefinition-example-combo-product.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicinalproductdefinition-example-combo-product.json rename to crates/fhir/tests/data/json/R4B/medicinalproductdefinition-example-combo-product.json diff --git a/crates/fhir/tests/data/R4B/medicinalproductdefinition-example-equilidem-basics.json b/crates/fhir/tests/data/json/R4B/medicinalproductdefinition-example-equilidem-basics.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicinalproductdefinition-example-equilidem-basics.json rename to crates/fhir/tests/data/json/R4B/medicinalproductdefinition-example-equilidem-basics.json diff --git a/crates/fhir/tests/data/R4B/medicinalproductdefinition-example-equilidem-using-ingredient-and-auth.json b/crates/fhir/tests/data/json/R4B/medicinalproductdefinition-example-equilidem-using-ingredient-and-auth.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicinalproductdefinition-example-equilidem-using-ingredient-and-auth.json rename to crates/fhir/tests/data/json/R4B/medicinalproductdefinition-example-equilidem-using-ingredient-and-auth.json diff --git a/crates/fhir/tests/data/R4B/medicinalproductdefinition-example.json b/crates/fhir/tests/data/json/R4B/medicinalproductdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicinalproductdefinition-example.json rename to crates/fhir/tests/data/json/R4B/medicinalproductdefinition-example.json diff --git a/crates/fhir/tests/data/R4B/medicinalproductdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/medicinalproductdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicinalproductdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/medicinalproductdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/medicinalproductdefinition-with-contained-package-and-ingredient.json b/crates/fhir/tests/data/json/R4B/medicinalproductdefinition-with-contained-package-and-ingredient.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicinalproductdefinition-with-contained-package-and-ingredient.json rename to crates/fhir/tests/data/json/R4B/medicinalproductdefinition-with-contained-package-and-ingredient.json diff --git a/crates/fhir/tests/data/R4B/medicinalproductdefinition.profile.json b/crates/fhir/tests/data/json/R4B/medicinalproductdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/medicinalproductdefinition.profile.json rename to crates/fhir/tests/data/json/R4B/medicinalproductdefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/message-request-link.json b/crates/fhir/tests/data/json/R4B/message-request-link.json similarity index 100% rename from crates/fhir/tests/data/R4B/message-request-link.json rename to crates/fhir/tests/data/json/R4B/message-request-link.json diff --git a/crates/fhir/tests/data/R4B/message-response-link.json b/crates/fhir/tests/data/json/R4B/message-response-link.json similarity index 100% rename from crates/fhir/tests/data/R4B/message-response-link.json rename to crates/fhir/tests/data/json/R4B/message-response-link.json diff --git a/crates/fhir/tests/data/R4B/messagedefinition-example.json b/crates/fhir/tests/data/json/R4B/messagedefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/messagedefinition-example.json rename to crates/fhir/tests/data/json/R4B/messagedefinition-example.json diff --git a/crates/fhir/tests/data/R4B/messagedefinition-patient-link-notification.json b/crates/fhir/tests/data/json/R4B/messagedefinition-patient-link-notification.json similarity index 100% rename from crates/fhir/tests/data/R4B/messagedefinition-patient-link-notification.json rename to crates/fhir/tests/data/json/R4B/messagedefinition-patient-link-notification.json diff --git a/crates/fhir/tests/data/R4B/messagedefinition-patient-link-response.json b/crates/fhir/tests/data/json/R4B/messagedefinition-patient-link-response.json similarity index 100% rename from crates/fhir/tests/data/R4B/messagedefinition-patient-link-response.json rename to crates/fhir/tests/data/json/R4B/messagedefinition-patient-link-response.json diff --git a/crates/fhir/tests/data/R4B/messagedefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/messagedefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/messagedefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/messagedefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/messagedefinition.profile.json b/crates/fhir/tests/data/json/R4B/messagedefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/messagedefinition.profile.json rename to crates/fhir/tests/data/json/R4B/messagedefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/messageheader-example.json b/crates/fhir/tests/data/json/R4B/messageheader-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/messageheader-example.json rename to crates/fhir/tests/data/json/R4B/messageheader-example.json diff --git a/crates/fhir/tests/data/R4B/messageheader-questionnaire.json b/crates/fhir/tests/data/json/R4B/messageheader-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/messageheader-questionnaire.json rename to crates/fhir/tests/data/json/R4B/messageheader-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/messageheader.profile.json b/crates/fhir/tests/data/json/R4B/messageheader.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/messageheader.profile.json rename to crates/fhir/tests/data/json/R4B/messageheader.profile.json diff --git a/crates/fhir/tests/data/R4B/meta.profile.json b/crates/fhir/tests/data/json/R4B/meta.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/meta.profile.json rename to crates/fhir/tests/data/json/R4B/meta.profile.json diff --git a/crates/fhir/tests/data/R4B/molecularsequence-example.json b/crates/fhir/tests/data/json/R4B/molecularsequence-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/molecularsequence-example.json rename to crates/fhir/tests/data/json/R4B/molecularsequence-example.json diff --git a/crates/fhir/tests/data/R4B/molecularsequence-questionnaire.json b/crates/fhir/tests/data/json/R4B/molecularsequence-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/molecularsequence-questionnaire.json rename to crates/fhir/tests/data/json/R4B/molecularsequence-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/molecularsequence.profile.json b/crates/fhir/tests/data/json/R4B/molecularsequence.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/molecularsequence.profile.json rename to crates/fhir/tests/data/json/R4B/molecularsequence.profile.json diff --git a/crates/fhir/tests/data/R4B/money.profile.json b/crates/fhir/tests/data/json/R4B/money.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/money.profile.json rename to crates/fhir/tests/data/json/R4B/money.profile.json diff --git a/crates/fhir/tests/data/R4B/moneyquantity.profile.json b/crates/fhir/tests/data/json/R4B/moneyquantity.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/moneyquantity.profile.json rename to crates/fhir/tests/data/json/R4B/moneyquantity.profile.json diff --git a/crates/fhir/tests/data/R4B/namingsystem-example-id.json b/crates/fhir/tests/data/json/R4B/namingsystem-example-id.json similarity index 100% rename from crates/fhir/tests/data/R4B/namingsystem-example-id.json rename to crates/fhir/tests/data/json/R4B/namingsystem-example-id.json diff --git a/crates/fhir/tests/data/R4B/namingsystem-example.json b/crates/fhir/tests/data/json/R4B/namingsystem-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/namingsystem-example.json rename to crates/fhir/tests/data/json/R4B/namingsystem-example.json diff --git a/crates/fhir/tests/data/R4B/namingsystem-questionnaire.json b/crates/fhir/tests/data/json/R4B/namingsystem-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/namingsystem-questionnaire.json rename to crates/fhir/tests/data/json/R4B/namingsystem-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/namingsystem-registry.json b/crates/fhir/tests/data/json/R4B/namingsystem-registry.json similarity index 100% rename from crates/fhir/tests/data/R4B/namingsystem-registry.json rename to crates/fhir/tests/data/json/R4B/namingsystem-registry.json diff --git a/crates/fhir/tests/data/R4B/namingsystem-terminologies.json b/crates/fhir/tests/data/json/R4B/namingsystem-terminologies.json similarity index 100% rename from crates/fhir/tests/data/R4B/namingsystem-terminologies.json rename to crates/fhir/tests/data/json/R4B/namingsystem-terminologies.json diff --git a/crates/fhir/tests/data/R4B/namingsystem.profile.json b/crates/fhir/tests/data/json/R4B/namingsystem.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/namingsystem.profile.json rename to crates/fhir/tests/data/json/R4B/namingsystem.profile.json diff --git a/crates/fhir/tests/data/R4B/narrative.profile.json b/crates/fhir/tests/data/json/R4B/narrative.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/narrative.profile.json rename to crates/fhir/tests/data/json/R4B/narrative.profile.json diff --git a/crates/fhir/tests/data/R4B/notification-empty.json b/crates/fhir/tests/data/json/R4B/notification-empty.json similarity index 100% rename from crates/fhir/tests/data/R4B/notification-empty.json rename to crates/fhir/tests/data/json/R4B/notification-empty.json diff --git a/crates/fhir/tests/data/R4B/notification-full-resource-with-patient.json b/crates/fhir/tests/data/json/R4B/notification-full-resource-with-patient.json similarity index 100% rename from crates/fhir/tests/data/R4B/notification-full-resource-with-patient.json rename to crates/fhir/tests/data/json/R4B/notification-full-resource-with-patient.json diff --git a/crates/fhir/tests/data/R4B/notification-full-resource.json b/crates/fhir/tests/data/json/R4B/notification-full-resource.json similarity index 100% rename from crates/fhir/tests/data/R4B/notification-full-resource.json rename to crates/fhir/tests/data/json/R4B/notification-full-resource.json diff --git a/crates/fhir/tests/data/R4B/notification-handshake.json b/crates/fhir/tests/data/json/R4B/notification-handshake.json similarity index 100% rename from crates/fhir/tests/data/R4B/notification-handshake.json rename to crates/fhir/tests/data/json/R4B/notification-handshake.json diff --git a/crates/fhir/tests/data/R4B/notification-heartbeat.json b/crates/fhir/tests/data/json/R4B/notification-heartbeat.json similarity index 100% rename from crates/fhir/tests/data/R4B/notification-heartbeat.json rename to crates/fhir/tests/data/json/R4B/notification-heartbeat.json diff --git a/crates/fhir/tests/data/R4B/notification-id-only-query.json b/crates/fhir/tests/data/json/R4B/notification-id-only-query.json similarity index 100% rename from crates/fhir/tests/data/R4B/notification-id-only-query.json rename to crates/fhir/tests/data/json/R4B/notification-id-only-query.json diff --git a/crates/fhir/tests/data/R4B/notification-id-only-with-patient.json b/crates/fhir/tests/data/json/R4B/notification-id-only-with-patient.json similarity index 100% rename from crates/fhir/tests/data/R4B/notification-id-only-with-patient.json rename to crates/fhir/tests/data/json/R4B/notification-id-only-with-patient.json diff --git a/crates/fhir/tests/data/R4B/notification-id-only.json b/crates/fhir/tests/data/json/R4B/notification-id-only.json similarity index 100% rename from crates/fhir/tests/data/R4B/notification-id-only.json rename to crates/fhir/tests/data/json/R4B/notification-id-only.json diff --git a/crates/fhir/tests/data/R4B/notification-message-full-resource.json b/crates/fhir/tests/data/json/R4B/notification-message-full-resource.json similarity index 100% rename from crates/fhir/tests/data/R4B/notification-message-full-resource.json rename to crates/fhir/tests/data/json/R4B/notification-message-full-resource.json diff --git a/crates/fhir/tests/data/R4B/notification-query-status.json b/crates/fhir/tests/data/json/R4B/notification-query-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/notification-query-status.json rename to crates/fhir/tests/data/json/R4B/notification-query-status.json diff --git a/crates/fhir/tests/data/R4B/nutritionorder-example-cardiacdiet.json b/crates/fhir/tests/data/json/R4B/nutritionorder-example-cardiacdiet.json similarity index 100% rename from crates/fhir/tests/data/R4B/nutritionorder-example-cardiacdiet.json rename to crates/fhir/tests/data/json/R4B/nutritionorder-example-cardiacdiet.json diff --git a/crates/fhir/tests/data/R4B/nutritionorder-example-diabeticdiet.json b/crates/fhir/tests/data/json/R4B/nutritionorder-example-diabeticdiet.json similarity index 100% rename from crates/fhir/tests/data/R4B/nutritionorder-example-diabeticdiet.json rename to crates/fhir/tests/data/json/R4B/nutritionorder-example-diabeticdiet.json diff --git a/crates/fhir/tests/data/R4B/nutritionorder-example-diabeticsupplement.json b/crates/fhir/tests/data/json/R4B/nutritionorder-example-diabeticsupplement.json similarity index 100% rename from crates/fhir/tests/data/R4B/nutritionorder-example-diabeticsupplement.json rename to crates/fhir/tests/data/json/R4B/nutritionorder-example-diabeticsupplement.json diff --git a/crates/fhir/tests/data/R4B/nutritionorder-example-energysupplement.json b/crates/fhir/tests/data/json/R4B/nutritionorder-example-energysupplement.json similarity index 100% rename from crates/fhir/tests/data/R4B/nutritionorder-example-energysupplement.json rename to crates/fhir/tests/data/json/R4B/nutritionorder-example-energysupplement.json diff --git a/crates/fhir/tests/data/R4B/nutritionorder-example-enteralbolus.json b/crates/fhir/tests/data/json/R4B/nutritionorder-example-enteralbolus.json similarity index 100% rename from crates/fhir/tests/data/R4B/nutritionorder-example-enteralbolus.json rename to crates/fhir/tests/data/json/R4B/nutritionorder-example-enteralbolus.json diff --git a/crates/fhir/tests/data/R4B/nutritionorder-example-enteralcontinuous.json b/crates/fhir/tests/data/json/R4B/nutritionorder-example-enteralcontinuous.json similarity index 100% rename from crates/fhir/tests/data/R4B/nutritionorder-example-enteralcontinuous.json rename to crates/fhir/tests/data/json/R4B/nutritionorder-example-enteralcontinuous.json diff --git a/crates/fhir/tests/data/R4B/nutritionorder-example-fiberrestricteddiet.json b/crates/fhir/tests/data/json/R4B/nutritionorder-example-fiberrestricteddiet.json similarity index 100% rename from crates/fhir/tests/data/R4B/nutritionorder-example-fiberrestricteddiet.json rename to crates/fhir/tests/data/json/R4B/nutritionorder-example-fiberrestricteddiet.json diff --git a/crates/fhir/tests/data/R4B/nutritionorder-example-infantenteral.json b/crates/fhir/tests/data/json/R4B/nutritionorder-example-infantenteral.json similarity index 100% rename from crates/fhir/tests/data/R4B/nutritionorder-example-infantenteral.json rename to crates/fhir/tests/data/json/R4B/nutritionorder-example-infantenteral.json diff --git a/crates/fhir/tests/data/R4B/nutritionorder-example-proteinsupplement.json b/crates/fhir/tests/data/json/R4B/nutritionorder-example-proteinsupplement.json similarity index 100% rename from crates/fhir/tests/data/R4B/nutritionorder-example-proteinsupplement.json rename to crates/fhir/tests/data/json/R4B/nutritionorder-example-proteinsupplement.json diff --git a/crates/fhir/tests/data/R4B/nutritionorder-example-pureeddiet-simple.json b/crates/fhir/tests/data/json/R4B/nutritionorder-example-pureeddiet-simple.json similarity index 100% rename from crates/fhir/tests/data/R4B/nutritionorder-example-pureeddiet-simple.json rename to crates/fhir/tests/data/json/R4B/nutritionorder-example-pureeddiet-simple.json diff --git a/crates/fhir/tests/data/R4B/nutritionorder-example-pureeddiet.json b/crates/fhir/tests/data/json/R4B/nutritionorder-example-pureeddiet.json similarity index 100% rename from crates/fhir/tests/data/R4B/nutritionorder-example-pureeddiet.json rename to crates/fhir/tests/data/json/R4B/nutritionorder-example-pureeddiet.json diff --git a/crates/fhir/tests/data/R4B/nutritionorder-example-renaldiet.json b/crates/fhir/tests/data/json/R4B/nutritionorder-example-renaldiet.json similarity index 100% rename from crates/fhir/tests/data/R4B/nutritionorder-example-renaldiet.json rename to crates/fhir/tests/data/json/R4B/nutritionorder-example-renaldiet.json diff --git a/crates/fhir/tests/data/R4B/nutritionorder-example-texture-modified.json b/crates/fhir/tests/data/json/R4B/nutritionorder-example-texture-modified.json similarity index 100% rename from crates/fhir/tests/data/R4B/nutritionorder-example-texture-modified.json rename to crates/fhir/tests/data/json/R4B/nutritionorder-example-texture-modified.json diff --git a/crates/fhir/tests/data/R4B/nutritionorder-questionnaire.json b/crates/fhir/tests/data/json/R4B/nutritionorder-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/nutritionorder-questionnaire.json rename to crates/fhir/tests/data/json/R4B/nutritionorder-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/nutritionorder.profile.json b/crates/fhir/tests/data/json/R4B/nutritionorder.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/nutritionorder.profile.json rename to crates/fhir/tests/data/json/R4B/nutritionorder.profile.json diff --git a/crates/fhir/tests/data/R4B/nutritionproduct-example.json b/crates/fhir/tests/data/json/R4B/nutritionproduct-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/nutritionproduct-example.json rename to crates/fhir/tests/data/json/R4B/nutritionproduct-example.json diff --git a/crates/fhir/tests/data/R4B/nutritionproduct-questionnaire.json b/crates/fhir/tests/data/json/R4B/nutritionproduct-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/nutritionproduct-questionnaire.json rename to crates/fhir/tests/data/json/R4B/nutritionproduct-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/nutritionproduct.profile.json b/crates/fhir/tests/data/json/R4B/nutritionproduct.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/nutritionproduct.profile.json rename to crates/fhir/tests/data/json/R4B/nutritionproduct.profile.json diff --git a/crates/fhir/tests/data/R4B/observation-decimal.json b/crates/fhir/tests/data/json/R4B/observation-decimal.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-decimal.json rename to crates/fhir/tests/data/json/R4B/observation-decimal.json diff --git a/crates/fhir/tests/data/R4B/observation-example-10minute-apgar-score.json b/crates/fhir/tests/data/json/R4B/observation-example-10minute-apgar-score.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-10minute-apgar-score.json rename to crates/fhir/tests/data/json/R4B/observation-example-10minute-apgar-score.json diff --git a/crates/fhir/tests/data/R4B/observation-example-1minute-apgar-score.json b/crates/fhir/tests/data/json/R4B/observation-example-1minute-apgar-score.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-1minute-apgar-score.json rename to crates/fhir/tests/data/json/R4B/observation-example-1minute-apgar-score.json diff --git a/crates/fhir/tests/data/R4B/observation-example-20minute-apgar-score.json b/crates/fhir/tests/data/json/R4B/observation-example-20minute-apgar-score.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-20minute-apgar-score.json rename to crates/fhir/tests/data/json/R4B/observation-example-20minute-apgar-score.json diff --git a/crates/fhir/tests/data/R4B/observation-example-2minute-apgar-score.json b/crates/fhir/tests/data/json/R4B/observation-example-2minute-apgar-score.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-2minute-apgar-score.json rename to crates/fhir/tests/data/json/R4B/observation-example-2minute-apgar-score.json diff --git a/crates/fhir/tests/data/R4B/observation-example-5minute-apgar-score.json b/crates/fhir/tests/data/json/R4B/observation-example-5minute-apgar-score.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-5minute-apgar-score.json rename to crates/fhir/tests/data/json/R4B/observation-example-5minute-apgar-score.json diff --git a/crates/fhir/tests/data/R4B/observation-example-TPMT-diplotype.json b/crates/fhir/tests/data/json/R4B/observation-example-TPMT-diplotype.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-TPMT-diplotype.json rename to crates/fhir/tests/data/json/R4B/observation-example-TPMT-diplotype.json diff --git a/crates/fhir/tests/data/R4B/observation-example-TPMT-haplotype-one.json b/crates/fhir/tests/data/json/R4B/observation-example-TPMT-haplotype-one.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-TPMT-haplotype-one.json rename to crates/fhir/tests/data/json/R4B/observation-example-TPMT-haplotype-one.json diff --git a/crates/fhir/tests/data/R4B/observation-example-TPMT-haplotype-two.json b/crates/fhir/tests/data/json/R4B/observation-example-TPMT-haplotype-two.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-TPMT-haplotype-two.json rename to crates/fhir/tests/data/json/R4B/observation-example-TPMT-haplotype-two.json diff --git a/crates/fhir/tests/data/R4B/observation-example-abdo-tender.json b/crates/fhir/tests/data/json/R4B/observation-example-abdo-tender.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-abdo-tender.json rename to crates/fhir/tests/data/json/R4B/observation-example-abdo-tender.json diff --git a/crates/fhir/tests/data/R4B/observation-example-alcohol-type.json b/crates/fhir/tests/data/json/R4B/observation-example-alcohol-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-alcohol-type.json rename to crates/fhir/tests/data/json/R4B/observation-example-alcohol-type.json diff --git a/crates/fhir/tests/data/R4B/observation-example-bgpanel.json b/crates/fhir/tests/data/json/R4B/observation-example-bgpanel.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-bgpanel.json rename to crates/fhir/tests/data/json/R4B/observation-example-bgpanel.json diff --git a/crates/fhir/tests/data/R4B/observation-example-bloodgroup.json b/crates/fhir/tests/data/json/R4B/observation-example-bloodgroup.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-bloodgroup.json rename to crates/fhir/tests/data/json/R4B/observation-example-bloodgroup.json diff --git a/crates/fhir/tests/data/R4B/observation-example-bloodpressure-cancel.json b/crates/fhir/tests/data/json/R4B/observation-example-bloodpressure-cancel.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-bloodpressure-cancel.json rename to crates/fhir/tests/data/json/R4B/observation-example-bloodpressure-cancel.json diff --git a/crates/fhir/tests/data/R4B/observation-example-bloodpressure-dar.json b/crates/fhir/tests/data/json/R4B/observation-example-bloodpressure-dar.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-bloodpressure-dar.json rename to crates/fhir/tests/data/json/R4B/observation-example-bloodpressure-dar.json diff --git a/crates/fhir/tests/data/R4B/observation-example-bloodpressure.json b/crates/fhir/tests/data/json/R4B/observation-example-bloodpressure.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-bloodpressure.json rename to crates/fhir/tests/data/json/R4B/observation-example-bloodpressure.json diff --git a/crates/fhir/tests/data/R4B/observation-example-bmd.json b/crates/fhir/tests/data/json/R4B/observation-example-bmd.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-bmd.json rename to crates/fhir/tests/data/json/R4B/observation-example-bmd.json diff --git a/crates/fhir/tests/data/R4B/observation-example-bmi-using-related.json b/crates/fhir/tests/data/json/R4B/observation-example-bmi-using-related.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-bmi-using-related.json rename to crates/fhir/tests/data/json/R4B/observation-example-bmi-using-related.json diff --git a/crates/fhir/tests/data/R4B/observation-example-bmi.json b/crates/fhir/tests/data/json/R4B/observation-example-bmi.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-bmi.json rename to crates/fhir/tests/data/json/R4B/observation-example-bmi.json diff --git a/crates/fhir/tests/data/R4B/observation-example-body-height.json b/crates/fhir/tests/data/json/R4B/observation-example-body-height.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-body-height.json rename to crates/fhir/tests/data/json/R4B/observation-example-body-height.json diff --git a/crates/fhir/tests/data/R4B/observation-example-body-length.json b/crates/fhir/tests/data/json/R4B/observation-example-body-length.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-body-length.json rename to crates/fhir/tests/data/json/R4B/observation-example-body-length.json diff --git a/crates/fhir/tests/data/R4B/observation-example-body-temperature.json b/crates/fhir/tests/data/json/R4B/observation-example-body-temperature.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-body-temperature.json rename to crates/fhir/tests/data/json/R4B/observation-example-body-temperature.json diff --git a/crates/fhir/tests/data/R4B/observation-example-clinical-gender.json b/crates/fhir/tests/data/json/R4B/observation-example-clinical-gender.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-clinical-gender.json rename to crates/fhir/tests/data/json/R4B/observation-example-clinical-gender.json diff --git a/crates/fhir/tests/data/R4B/observation-example-date-lastmp.json b/crates/fhir/tests/data/json/R4B/observation-example-date-lastmp.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-date-lastmp.json rename to crates/fhir/tests/data/json/R4B/observation-example-date-lastmp.json diff --git a/crates/fhir/tests/data/R4B/observation-example-diplotype1.json b/crates/fhir/tests/data/json/R4B/observation-example-diplotype1.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-diplotype1.json rename to crates/fhir/tests/data/json/R4B/observation-example-diplotype1.json diff --git a/crates/fhir/tests/data/R4B/observation-example-eye-color.json b/crates/fhir/tests/data/json/R4B/observation-example-eye-color.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-eye-color.json rename to crates/fhir/tests/data/json/R4B/observation-example-eye-color.json diff --git a/crates/fhir/tests/data/R4B/observation-example-f001-glucose.json b/crates/fhir/tests/data/json/R4B/observation-example-f001-glucose.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-f001-glucose.json rename to crates/fhir/tests/data/json/R4B/observation-example-f001-glucose.json diff --git a/crates/fhir/tests/data/R4B/observation-example-f002-excess.json b/crates/fhir/tests/data/json/R4B/observation-example-f002-excess.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-f002-excess.json rename to crates/fhir/tests/data/json/R4B/observation-example-f002-excess.json diff --git a/crates/fhir/tests/data/R4B/observation-example-f003-co2.json b/crates/fhir/tests/data/json/R4B/observation-example-f003-co2.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-f003-co2.json rename to crates/fhir/tests/data/json/R4B/observation-example-f003-co2.json diff --git a/crates/fhir/tests/data/R4B/observation-example-f004-erythrocyte.json b/crates/fhir/tests/data/json/R4B/observation-example-f004-erythrocyte.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-f004-erythrocyte.json rename to crates/fhir/tests/data/json/R4B/observation-example-f004-erythrocyte.json diff --git a/crates/fhir/tests/data/R4B/observation-example-f005-hemoglobin.json b/crates/fhir/tests/data/json/R4B/observation-example-f005-hemoglobin.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-f005-hemoglobin.json rename to crates/fhir/tests/data/json/R4B/observation-example-f005-hemoglobin.json diff --git a/crates/fhir/tests/data/R4B/observation-example-f202-temperature.json b/crates/fhir/tests/data/json/R4B/observation-example-f202-temperature.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-f202-temperature.json rename to crates/fhir/tests/data/json/R4B/observation-example-f202-temperature.json diff --git a/crates/fhir/tests/data/R4B/observation-example-f203-bicarbonate.json b/crates/fhir/tests/data/json/R4B/observation-example-f203-bicarbonate.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-f203-bicarbonate.json rename to crates/fhir/tests/data/json/R4B/observation-example-f203-bicarbonate.json diff --git a/crates/fhir/tests/data/R4B/observation-example-f204-creatinine.json b/crates/fhir/tests/data/json/R4B/observation-example-f204-creatinine.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-f204-creatinine.json rename to crates/fhir/tests/data/json/R4B/observation-example-f204-creatinine.json diff --git a/crates/fhir/tests/data/R4B/observation-example-f205-egfr.json b/crates/fhir/tests/data/json/R4B/observation-example-f205-egfr.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-f205-egfr.json rename to crates/fhir/tests/data/json/R4B/observation-example-f205-egfr.json diff --git a/crates/fhir/tests/data/R4B/observation-example-f206-staphylococcus.json b/crates/fhir/tests/data/json/R4B/observation-example-f206-staphylococcus.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-f206-staphylococcus.json rename to crates/fhir/tests/data/json/R4B/observation-example-f206-staphylococcus.json diff --git a/crates/fhir/tests/data/R4B/observation-example-genetics-1.json b/crates/fhir/tests/data/json/R4B/observation-example-genetics-1.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-genetics-1.json rename to crates/fhir/tests/data/json/R4B/observation-example-genetics-1.json diff --git a/crates/fhir/tests/data/R4B/observation-example-genetics-2.json b/crates/fhir/tests/data/json/R4B/observation-example-genetics-2.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-genetics-2.json rename to crates/fhir/tests/data/json/R4B/observation-example-genetics-2.json diff --git a/crates/fhir/tests/data/R4B/observation-example-genetics-3.json b/crates/fhir/tests/data/json/R4B/observation-example-genetics-3.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-genetics-3.json rename to crates/fhir/tests/data/json/R4B/observation-example-genetics-3.json diff --git a/crates/fhir/tests/data/R4B/observation-example-genetics-4.json b/crates/fhir/tests/data/json/R4B/observation-example-genetics-4.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-genetics-4.json rename to crates/fhir/tests/data/json/R4B/observation-example-genetics-4.json diff --git a/crates/fhir/tests/data/R4B/observation-example-genetics-5.json b/crates/fhir/tests/data/json/R4B/observation-example-genetics-5.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-genetics-5.json rename to crates/fhir/tests/data/json/R4B/observation-example-genetics-5.json diff --git a/crates/fhir/tests/data/R4B/observation-example-genetics-brcapat.json b/crates/fhir/tests/data/json/R4B/observation-example-genetics-brcapat.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-genetics-brcapat.json rename to crates/fhir/tests/data/json/R4B/observation-example-genetics-brcapat.json diff --git a/crates/fhir/tests/data/R4B/observation-example-glasgow-qa.json b/crates/fhir/tests/data/json/R4B/observation-example-glasgow-qa.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-glasgow-qa.json rename to crates/fhir/tests/data/json/R4B/observation-example-glasgow-qa.json diff --git a/crates/fhir/tests/data/R4B/observation-example-glasgow.json b/crates/fhir/tests/data/json/R4B/observation-example-glasgow.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-glasgow.json rename to crates/fhir/tests/data/json/R4B/observation-example-glasgow.json diff --git a/crates/fhir/tests/data/R4B/observation-example-haplotype1.json b/crates/fhir/tests/data/json/R4B/observation-example-haplotype1.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-haplotype1.json rename to crates/fhir/tests/data/json/R4B/observation-example-haplotype1.json diff --git a/crates/fhir/tests/data/R4B/observation-example-haplotype2.json b/crates/fhir/tests/data/json/R4B/observation-example-haplotype2.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-haplotype2.json rename to crates/fhir/tests/data/json/R4B/observation-example-haplotype2.json diff --git a/crates/fhir/tests/data/R4B/observation-example-head-circumference.json b/crates/fhir/tests/data/json/R4B/observation-example-head-circumference.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-head-circumference.json rename to crates/fhir/tests/data/json/R4B/observation-example-head-circumference.json diff --git a/crates/fhir/tests/data/R4B/observation-example-heart-rate.json b/crates/fhir/tests/data/json/R4B/observation-example-heart-rate.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-heart-rate.json rename to crates/fhir/tests/data/json/R4B/observation-example-heart-rate.json diff --git a/crates/fhir/tests/data/R4B/observation-example-herd1.json b/crates/fhir/tests/data/json/R4B/observation-example-herd1.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-herd1.json rename to crates/fhir/tests/data/json/R4B/observation-example-herd1.json diff --git a/crates/fhir/tests/data/R4B/observation-example-map-sitting.json b/crates/fhir/tests/data/json/R4B/observation-example-map-sitting.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-map-sitting.json rename to crates/fhir/tests/data/json/R4B/observation-example-map-sitting.json diff --git a/crates/fhir/tests/data/R4B/observation-example-mbp.json b/crates/fhir/tests/data/json/R4B/observation-example-mbp.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-mbp.json rename to crates/fhir/tests/data/json/R4B/observation-example-mbp.json diff --git a/crates/fhir/tests/data/R4B/observation-example-phenotype.json b/crates/fhir/tests/data/json/R4B/observation-example-phenotype.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-phenotype.json rename to crates/fhir/tests/data/json/R4B/observation-example-phenotype.json diff --git a/crates/fhir/tests/data/R4B/observation-example-respiratory-rate.json b/crates/fhir/tests/data/json/R4B/observation-example-respiratory-rate.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-respiratory-rate.json rename to crates/fhir/tests/data/json/R4B/observation-example-respiratory-rate.json diff --git a/crates/fhir/tests/data/R4B/observation-example-rhstatus.json b/crates/fhir/tests/data/json/R4B/observation-example-rhstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-rhstatus.json rename to crates/fhir/tests/data/json/R4B/observation-example-rhstatus.json diff --git a/crates/fhir/tests/data/R4B/observation-example-sample-data.json b/crates/fhir/tests/data/json/R4B/observation-example-sample-data.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-sample-data.json rename to crates/fhir/tests/data/json/R4B/observation-example-sample-data.json diff --git a/crates/fhir/tests/data/R4B/observation-example-satO2.json b/crates/fhir/tests/data/json/R4B/observation-example-satO2.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-satO2.json rename to crates/fhir/tests/data/json/R4B/observation-example-satO2.json diff --git a/crates/fhir/tests/data/R4B/observation-example-secondsmoke.json b/crates/fhir/tests/data/json/R4B/observation-example-secondsmoke.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-secondsmoke.json rename to crates/fhir/tests/data/json/R4B/observation-example-secondsmoke.json diff --git a/crates/fhir/tests/data/R4B/observation-example-spirometry.json b/crates/fhir/tests/data/json/R4B/observation-example-spirometry.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-spirometry.json rename to crates/fhir/tests/data/json/R4B/observation-example-spirometry.json diff --git a/crates/fhir/tests/data/R4B/observation-example-trachcare.json b/crates/fhir/tests/data/json/R4B/observation-example-trachcare.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-trachcare.json rename to crates/fhir/tests/data/json/R4B/observation-example-trachcare.json diff --git a/crates/fhir/tests/data/R4B/observation-example-unsat.json b/crates/fhir/tests/data/json/R4B/observation-example-unsat.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-unsat.json rename to crates/fhir/tests/data/json/R4B/observation-example-unsat.json diff --git a/crates/fhir/tests/data/R4B/observation-example-vitals-panel.json b/crates/fhir/tests/data/json/R4B/observation-example-vitals-panel.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-vitals-panel.json rename to crates/fhir/tests/data/json/R4B/observation-example-vitals-panel.json diff --git a/crates/fhir/tests/data/R4B/observation-example-vomiting.json b/crates/fhir/tests/data/json/R4B/observation-example-vomiting.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-vomiting.json rename to crates/fhir/tests/data/json/R4B/observation-example-vomiting.json diff --git a/crates/fhir/tests/data/R4B/observation-example-vp-oyster.json b/crates/fhir/tests/data/json/R4B/observation-example-vp-oyster.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example-vp-oyster.json rename to crates/fhir/tests/data/json/R4B/observation-example-vp-oyster.json diff --git a/crates/fhir/tests/data/R4B/observation-example.json b/crates/fhir/tests/data/json/R4B/observation-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-example.json rename to crates/fhir/tests/data/json/R4B/observation-example.json diff --git a/crates/fhir/tests/data/R4B/observation-genetic-Observation-amino-acid-change.json b/crates/fhir/tests/data/json/R4B/observation-genetic-Observation-amino-acid-change.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-genetic-Observation-amino-acid-change.json rename to crates/fhir/tests/data/json/R4B/observation-genetic-Observation-amino-acid-change.json diff --git a/crates/fhir/tests/data/R4B/observation-genetic-Observation-dna-variant.json b/crates/fhir/tests/data/json/R4B/observation-genetic-Observation-dna-variant.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-genetic-Observation-dna-variant.json rename to crates/fhir/tests/data/json/R4B/observation-genetic-Observation-dna-variant.json diff --git a/crates/fhir/tests/data/R4B/observation-genetic-Observation-gene-amino-acid-change.json b/crates/fhir/tests/data/json/R4B/observation-genetic-Observation-gene-amino-acid-change.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-genetic-Observation-gene-amino-acid-change.json rename to crates/fhir/tests/data/json/R4B/observation-genetic-Observation-gene-amino-acid-change.json diff --git a/crates/fhir/tests/data/R4B/observation-genetic-Observation-gene-dnavariant.json b/crates/fhir/tests/data/json/R4B/observation-genetic-Observation-gene-dnavariant.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-genetic-Observation-gene-dnavariant.json rename to crates/fhir/tests/data/json/R4B/observation-genetic-Observation-gene-dnavariant.json diff --git a/crates/fhir/tests/data/R4B/observation-genetic-Observation-gene-identifier.json b/crates/fhir/tests/data/json/R4B/observation-genetic-Observation-gene-identifier.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-genetic-Observation-gene-identifier.json rename to crates/fhir/tests/data/json/R4B/observation-genetic-Observation-gene-identifier.json diff --git a/crates/fhir/tests/data/R4B/observation-genetics-questionnaire.json b/crates/fhir/tests/data/json/R4B/observation-genetics-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-genetics-questionnaire.json rename to crates/fhir/tests/data/json/R4B/observation-genetics-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/observation-genetics.profile.json b/crates/fhir/tests/data/json/R4B/observation-genetics.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-genetics.profile.json rename to crates/fhir/tests/data/json/R4B/observation-genetics.profile.json diff --git a/crates/fhir/tests/data/R4B/observation-questionnaire.json b/crates/fhir/tests/data/json/R4B/observation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation-questionnaire.json rename to crates/fhir/tests/data/json/R4B/observation-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/observation.profile.json b/crates/fhir/tests/data/json/R4B/observation.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/observation.profile.json rename to crates/fhir/tests/data/json/R4B/observation.profile.json diff --git a/crates/fhir/tests/data/R4B/observationdefinition-example.json b/crates/fhir/tests/data/json/R4B/observationdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/observationdefinition-example.json rename to crates/fhir/tests/data/json/R4B/observationdefinition-example.json diff --git a/crates/fhir/tests/data/R4B/observationdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/observationdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/observationdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/observationdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/observationdefinition.profile.json b/crates/fhir/tests/data/json/R4B/observationdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/observationdefinition.profile.json rename to crates/fhir/tests/data/json/R4B/observationdefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/oid.profile.json b/crates/fhir/tests/data/json/R4B/oid.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/oid.profile.json rename to crates/fhir/tests/data/json/R4B/oid.profile.json diff --git a/crates/fhir/tests/data/R4B/operation-activitydefinition-apply.json b/crates/fhir/tests/data/json/R4B/operation-activitydefinition-apply.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-activitydefinition-apply.json rename to crates/fhir/tests/data/json/R4B/operation-activitydefinition-apply.json diff --git a/crates/fhir/tests/data/R4B/operation-activitydefinition-data-requirements.json b/crates/fhir/tests/data/json/R4B/operation-activitydefinition-data-requirements.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-activitydefinition-data-requirements.json rename to crates/fhir/tests/data/json/R4B/operation-activitydefinition-data-requirements.json diff --git a/crates/fhir/tests/data/R4B/operation-capabilitystatement-conforms.json b/crates/fhir/tests/data/json/R4B/operation-capabilitystatement-conforms.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-capabilitystatement-conforms.json rename to crates/fhir/tests/data/json/R4B/operation-capabilitystatement-conforms.json diff --git a/crates/fhir/tests/data/R4B/operation-capabilitystatement-implements.json b/crates/fhir/tests/data/json/R4B/operation-capabilitystatement-implements.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-capabilitystatement-implements.json rename to crates/fhir/tests/data/json/R4B/operation-capabilitystatement-implements.json diff --git a/crates/fhir/tests/data/R4B/operation-capabilitystatement-subset.json b/crates/fhir/tests/data/json/R4B/operation-capabilitystatement-subset.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-capabilitystatement-subset.json rename to crates/fhir/tests/data/json/R4B/operation-capabilitystatement-subset.json diff --git a/crates/fhir/tests/data/R4B/operation-capabilitystatement-versions.json b/crates/fhir/tests/data/json/R4B/operation-capabilitystatement-versions.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-capabilitystatement-versions.json rename to crates/fhir/tests/data/json/R4B/operation-capabilitystatement-versions.json diff --git a/crates/fhir/tests/data/R4B/operation-chargeitemdefinition-apply.json b/crates/fhir/tests/data/json/R4B/operation-chargeitemdefinition-apply.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-chargeitemdefinition-apply.json rename to crates/fhir/tests/data/json/R4B/operation-chargeitemdefinition-apply.json diff --git a/crates/fhir/tests/data/R4B/operation-claim-submit.json b/crates/fhir/tests/data/json/R4B/operation-claim-submit.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-claim-submit.json rename to crates/fhir/tests/data/json/R4B/operation-claim-submit.json diff --git a/crates/fhir/tests/data/R4B/operation-codesystem-find-matches.json b/crates/fhir/tests/data/json/R4B/operation-codesystem-find-matches.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-codesystem-find-matches.json rename to crates/fhir/tests/data/json/R4B/operation-codesystem-find-matches.json diff --git a/crates/fhir/tests/data/R4B/operation-codesystem-lookup.json b/crates/fhir/tests/data/json/R4B/operation-codesystem-lookup.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-codesystem-lookup.json rename to crates/fhir/tests/data/json/R4B/operation-codesystem-lookup.json diff --git a/crates/fhir/tests/data/R4B/operation-codesystem-subsumes.json b/crates/fhir/tests/data/json/R4B/operation-codesystem-subsumes.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-codesystem-subsumes.json rename to crates/fhir/tests/data/json/R4B/operation-codesystem-subsumes.json diff --git a/crates/fhir/tests/data/R4B/operation-codesystem-validate-code.json b/crates/fhir/tests/data/json/R4B/operation-codesystem-validate-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-codesystem-validate-code.json rename to crates/fhir/tests/data/json/R4B/operation-codesystem-validate-code.json diff --git a/crates/fhir/tests/data/R4B/operation-composition-document.json b/crates/fhir/tests/data/json/R4B/operation-composition-document.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-composition-document.json rename to crates/fhir/tests/data/json/R4B/operation-composition-document.json diff --git a/crates/fhir/tests/data/R4B/operation-conceptmap-closure.json b/crates/fhir/tests/data/json/R4B/operation-conceptmap-closure.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-conceptmap-closure.json rename to crates/fhir/tests/data/json/R4B/operation-conceptmap-closure.json diff --git a/crates/fhir/tests/data/R4B/operation-conceptmap-translate.json b/crates/fhir/tests/data/json/R4B/operation-conceptmap-translate.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-conceptmap-translate.json rename to crates/fhir/tests/data/json/R4B/operation-conceptmap-translate.json diff --git a/crates/fhir/tests/data/R4B/operation-coverageeligibilityrequest-submit.json b/crates/fhir/tests/data/json/R4B/operation-coverageeligibilityrequest-submit.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-coverageeligibilityrequest-submit.json rename to crates/fhir/tests/data/json/R4B/operation-coverageeligibilityrequest-submit.json diff --git a/crates/fhir/tests/data/R4B/operation-encounter-everything.json b/crates/fhir/tests/data/json/R4B/operation-encounter-everything.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-encounter-everything.json rename to crates/fhir/tests/data/json/R4B/operation-encounter-everything.json diff --git a/crates/fhir/tests/data/R4B/operation-group-everything.json b/crates/fhir/tests/data/json/R4B/operation-group-everything.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-group-everything.json rename to crates/fhir/tests/data/json/R4B/operation-group-everything.json diff --git a/crates/fhir/tests/data/R4B/operation-library-data-requirements.json b/crates/fhir/tests/data/json/R4B/operation-library-data-requirements.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-library-data-requirements.json rename to crates/fhir/tests/data/json/R4B/operation-library-data-requirements.json diff --git a/crates/fhir/tests/data/R4B/operation-list-find.json b/crates/fhir/tests/data/json/R4B/operation-list-find.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-list-find.json rename to crates/fhir/tests/data/json/R4B/operation-list-find.json diff --git a/crates/fhir/tests/data/R4B/operation-measure-care-gaps.json b/crates/fhir/tests/data/json/R4B/operation-measure-care-gaps.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-measure-care-gaps.json rename to crates/fhir/tests/data/json/R4B/operation-measure-care-gaps.json diff --git a/crates/fhir/tests/data/R4B/operation-measure-collect-data.json b/crates/fhir/tests/data/json/R4B/operation-measure-collect-data.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-measure-collect-data.json rename to crates/fhir/tests/data/json/R4B/operation-measure-collect-data.json diff --git a/crates/fhir/tests/data/R4B/operation-measure-data-requirements.json b/crates/fhir/tests/data/json/R4B/operation-measure-data-requirements.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-measure-data-requirements.json rename to crates/fhir/tests/data/json/R4B/operation-measure-data-requirements.json diff --git a/crates/fhir/tests/data/R4B/operation-measure-evaluate-measure.json b/crates/fhir/tests/data/json/R4B/operation-measure-evaluate-measure.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-measure-evaluate-measure.json rename to crates/fhir/tests/data/json/R4B/operation-measure-evaluate-measure.json diff --git a/crates/fhir/tests/data/R4B/operation-measure-submit-data.json b/crates/fhir/tests/data/json/R4B/operation-measure-submit-data.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-measure-submit-data.json rename to crates/fhir/tests/data/json/R4B/operation-measure-submit-data.json diff --git a/crates/fhir/tests/data/R4B/operation-medicinalproductdefinition-everything.json b/crates/fhir/tests/data/json/R4B/operation-medicinalproductdefinition-everything.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-medicinalproductdefinition-everything.json rename to crates/fhir/tests/data/json/R4B/operation-medicinalproductdefinition-everything.json diff --git a/crates/fhir/tests/data/R4B/operation-messageheader-process-message.json b/crates/fhir/tests/data/json/R4B/operation-messageheader-process-message.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-messageheader-process-message.json rename to crates/fhir/tests/data/json/R4B/operation-messageheader-process-message.json diff --git a/crates/fhir/tests/data/R4B/operation-namingsystem-preferred-id.json b/crates/fhir/tests/data/json/R4B/operation-namingsystem-preferred-id.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-namingsystem-preferred-id.json rename to crates/fhir/tests/data/json/R4B/operation-namingsystem-preferred-id.json diff --git a/crates/fhir/tests/data/R4B/operation-observation-lastn.json b/crates/fhir/tests/data/json/R4B/operation-observation-lastn.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-observation-lastn.json rename to crates/fhir/tests/data/json/R4B/operation-observation-lastn.json diff --git a/crates/fhir/tests/data/R4B/operation-observation-stats.json b/crates/fhir/tests/data/json/R4B/operation-observation-stats.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-observation-stats.json rename to crates/fhir/tests/data/json/R4B/operation-observation-stats.json diff --git a/crates/fhir/tests/data/R4B/operation-patient-everything.json b/crates/fhir/tests/data/json/R4B/operation-patient-everything.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-patient-everything.json rename to crates/fhir/tests/data/json/R4B/operation-patient-everything.json diff --git a/crates/fhir/tests/data/R4B/operation-patient-match.json b/crates/fhir/tests/data/json/R4B/operation-patient-match.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-patient-match.json rename to crates/fhir/tests/data/json/R4B/operation-patient-match.json diff --git a/crates/fhir/tests/data/R4B/operation-plandefinition-apply.json b/crates/fhir/tests/data/json/R4B/operation-plandefinition-apply.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-plandefinition-apply.json rename to crates/fhir/tests/data/json/R4B/operation-plandefinition-apply.json diff --git a/crates/fhir/tests/data/R4B/operation-plandefinition-data-requirements.json b/crates/fhir/tests/data/json/R4B/operation-plandefinition-data-requirements.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-plandefinition-data-requirements.json rename to crates/fhir/tests/data/json/R4B/operation-plandefinition-data-requirements.json diff --git a/crates/fhir/tests/data/R4B/operation-resource-convert.json b/crates/fhir/tests/data/json/R4B/operation-resource-convert.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-resource-convert.json rename to crates/fhir/tests/data/json/R4B/operation-resource-convert.json diff --git a/crates/fhir/tests/data/R4B/operation-resource-graph.json b/crates/fhir/tests/data/json/R4B/operation-resource-graph.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-resource-graph.json rename to crates/fhir/tests/data/json/R4B/operation-resource-graph.json diff --git a/crates/fhir/tests/data/R4B/operation-resource-graphql.json b/crates/fhir/tests/data/json/R4B/operation-resource-graphql.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-resource-graphql.json rename to crates/fhir/tests/data/json/R4B/operation-resource-graphql.json diff --git a/crates/fhir/tests/data/R4B/operation-resource-meta-add.json b/crates/fhir/tests/data/json/R4B/operation-resource-meta-add.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-resource-meta-add.json rename to crates/fhir/tests/data/json/R4B/operation-resource-meta-add.json diff --git a/crates/fhir/tests/data/R4B/operation-resource-meta-delete.json b/crates/fhir/tests/data/json/R4B/operation-resource-meta-delete.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-resource-meta-delete.json rename to crates/fhir/tests/data/json/R4B/operation-resource-meta-delete.json diff --git a/crates/fhir/tests/data/R4B/operation-resource-meta.json b/crates/fhir/tests/data/json/R4B/operation-resource-meta.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-resource-meta.json rename to crates/fhir/tests/data/json/R4B/operation-resource-meta.json diff --git a/crates/fhir/tests/data/R4B/operation-resource-validate.json b/crates/fhir/tests/data/json/R4B/operation-resource-validate.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-resource-validate.json rename to crates/fhir/tests/data/json/R4B/operation-resource-validate.json diff --git a/crates/fhir/tests/data/R4B/operation-structuredefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/operation-structuredefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-structuredefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/operation-structuredefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/operation-structuredefinition-snapshot.json b/crates/fhir/tests/data/json/R4B/operation-structuredefinition-snapshot.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-structuredefinition-snapshot.json rename to crates/fhir/tests/data/json/R4B/operation-structuredefinition-snapshot.json diff --git a/crates/fhir/tests/data/R4B/operation-structuremap-transform.json b/crates/fhir/tests/data/json/R4B/operation-structuremap-transform.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-structuremap-transform.json rename to crates/fhir/tests/data/json/R4B/operation-structuremap-transform.json diff --git a/crates/fhir/tests/data/R4B/operation-valueset-expand.json b/crates/fhir/tests/data/json/R4B/operation-valueset-expand.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-valueset-expand.json rename to crates/fhir/tests/data/json/R4B/operation-valueset-expand.json diff --git a/crates/fhir/tests/data/R4B/operation-valueset-validate-code.json b/crates/fhir/tests/data/json/R4B/operation-valueset-validate-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/operation-valueset-validate-code.json rename to crates/fhir/tests/data/json/R4B/operation-valueset-validate-code.json diff --git a/crates/fhir/tests/data/R4B/operationdefinition-example.json b/crates/fhir/tests/data/json/R4B/operationdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/operationdefinition-example.json rename to crates/fhir/tests/data/json/R4B/operationdefinition-example.json diff --git a/crates/fhir/tests/data/R4B/operationdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/operationdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/operationdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/operationdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/operationdefinition.profile.json b/crates/fhir/tests/data/json/R4B/operationdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/operationdefinition.profile.json rename to crates/fhir/tests/data/json/R4B/operationdefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/operationoutcome-example-allok.json b/crates/fhir/tests/data/json/R4B/operationoutcome-example-allok.json similarity index 100% rename from crates/fhir/tests/data/R4B/operationoutcome-example-allok.json rename to crates/fhir/tests/data/json/R4B/operationoutcome-example-allok.json diff --git a/crates/fhir/tests/data/R4B/operationoutcome-example-break-the-glass.json b/crates/fhir/tests/data/json/R4B/operationoutcome-example-break-the-glass.json similarity index 100% rename from crates/fhir/tests/data/R4B/operationoutcome-example-break-the-glass.json rename to crates/fhir/tests/data/json/R4B/operationoutcome-example-break-the-glass.json diff --git a/crates/fhir/tests/data/R4B/operationoutcome-example-exception.json b/crates/fhir/tests/data/json/R4B/operationoutcome-example-exception.json similarity index 100% rename from crates/fhir/tests/data/R4B/operationoutcome-example-exception.json rename to crates/fhir/tests/data/json/R4B/operationoutcome-example-exception.json diff --git a/crates/fhir/tests/data/R4B/operationoutcome-example-searchfail.json b/crates/fhir/tests/data/json/R4B/operationoutcome-example-searchfail.json similarity index 100% rename from crates/fhir/tests/data/R4B/operationoutcome-example-searchfail.json rename to crates/fhir/tests/data/json/R4B/operationoutcome-example-searchfail.json diff --git a/crates/fhir/tests/data/R4B/operationoutcome-example-validationfail.json b/crates/fhir/tests/data/json/R4B/operationoutcome-example-validationfail.json similarity index 100% rename from crates/fhir/tests/data/R4B/operationoutcome-example-validationfail.json rename to crates/fhir/tests/data/json/R4B/operationoutcome-example-validationfail.json diff --git a/crates/fhir/tests/data/R4B/operationoutcome-example.json b/crates/fhir/tests/data/json/R4B/operationoutcome-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/operationoutcome-example.json rename to crates/fhir/tests/data/json/R4B/operationoutcome-example.json diff --git a/crates/fhir/tests/data/R4B/operationoutcome-questionnaire.json b/crates/fhir/tests/data/json/R4B/operationoutcome-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/operationoutcome-questionnaire.json rename to crates/fhir/tests/data/json/R4B/operationoutcome-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/operationoutcome.profile.json b/crates/fhir/tests/data/json/R4B/operationoutcome.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/operationoutcome.profile.json rename to crates/fhir/tests/data/json/R4B/operationoutcome.profile.json diff --git a/crates/fhir/tests/data/R4B/organization-example-f001-burgers.json b/crates/fhir/tests/data/json/R4B/organization-example-f001-burgers.json similarity index 100% rename from crates/fhir/tests/data/R4B/organization-example-f001-burgers.json rename to crates/fhir/tests/data/json/R4B/organization-example-f001-burgers.json diff --git a/crates/fhir/tests/data/R4B/organization-example-f002-burgers-card.json b/crates/fhir/tests/data/json/R4B/organization-example-f002-burgers-card.json similarity index 100% rename from crates/fhir/tests/data/R4B/organization-example-f002-burgers-card.json rename to crates/fhir/tests/data/json/R4B/organization-example-f002-burgers-card.json diff --git a/crates/fhir/tests/data/R4B/organization-example-f003-burgers-ENT.json b/crates/fhir/tests/data/json/R4B/organization-example-f003-burgers-ENT.json similarity index 100% rename from crates/fhir/tests/data/R4B/organization-example-f003-burgers-ENT.json rename to crates/fhir/tests/data/json/R4B/organization-example-f003-burgers-ENT.json diff --git a/crates/fhir/tests/data/R4B/organization-example-f201-aumc.json b/crates/fhir/tests/data/json/R4B/organization-example-f201-aumc.json similarity index 100% rename from crates/fhir/tests/data/R4B/organization-example-f201-aumc.json rename to crates/fhir/tests/data/json/R4B/organization-example-f201-aumc.json diff --git a/crates/fhir/tests/data/R4B/organization-example-f203-bumc.json b/crates/fhir/tests/data/json/R4B/organization-example-f203-bumc.json similarity index 100% rename from crates/fhir/tests/data/R4B/organization-example-f203-bumc.json rename to crates/fhir/tests/data/json/R4B/organization-example-f203-bumc.json diff --git a/crates/fhir/tests/data/R4B/organization-example-gastro.json b/crates/fhir/tests/data/json/R4B/organization-example-gastro.json similarity index 100% rename from crates/fhir/tests/data/R4B/organization-example-gastro.json rename to crates/fhir/tests/data/json/R4B/organization-example-gastro.json diff --git a/crates/fhir/tests/data/R4B/organization-example-good-health-care.json b/crates/fhir/tests/data/json/R4B/organization-example-good-health-care.json similarity index 100% rename from crates/fhir/tests/data/R4B/organization-example-good-health-care.json rename to crates/fhir/tests/data/json/R4B/organization-example-good-health-care.json diff --git a/crates/fhir/tests/data/R4B/organization-example-hl7pay.json b/crates/fhir/tests/data/json/R4B/organization-example-hl7pay.json similarity index 100% rename from crates/fhir/tests/data/R4B/organization-example-hl7pay.json rename to crates/fhir/tests/data/json/R4B/organization-example-hl7pay.json diff --git a/crates/fhir/tests/data/R4B/organization-example-insurer.json b/crates/fhir/tests/data/json/R4B/organization-example-insurer.json similarity index 100% rename from crates/fhir/tests/data/R4B/organization-example-insurer.json rename to crates/fhir/tests/data/json/R4B/organization-example-insurer.json diff --git a/crates/fhir/tests/data/R4B/organization-example-lab.json b/crates/fhir/tests/data/json/R4B/organization-example-lab.json similarity index 100% rename from crates/fhir/tests/data/R4B/organization-example-lab.json rename to crates/fhir/tests/data/json/R4B/organization-example-lab.json diff --git a/crates/fhir/tests/data/R4B/organization-example-mihealth.json b/crates/fhir/tests/data/json/R4B/organization-example-mihealth.json similarity index 100% rename from crates/fhir/tests/data/R4B/organization-example-mihealth.json rename to crates/fhir/tests/data/json/R4B/organization-example-mihealth.json diff --git a/crates/fhir/tests/data/R4B/organization-example-mmanu.json b/crates/fhir/tests/data/json/R4B/organization-example-mmanu.json similarity index 100% rename from crates/fhir/tests/data/R4B/organization-example-mmanu.json rename to crates/fhir/tests/data/json/R4B/organization-example-mmanu.json diff --git a/crates/fhir/tests/data/R4B/organization-example.json b/crates/fhir/tests/data/json/R4B/organization-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/organization-example.json rename to crates/fhir/tests/data/json/R4B/organization-example.json diff --git a/crates/fhir/tests/data/R4B/organization-questionnaire.json b/crates/fhir/tests/data/json/R4B/organization-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/organization-questionnaire.json rename to crates/fhir/tests/data/json/R4B/organization-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/organization.profile.json b/crates/fhir/tests/data/json/R4B/organization.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/organization.profile.json rename to crates/fhir/tests/data/json/R4B/organization.profile.json diff --git a/crates/fhir/tests/data/R4B/organizationaffiliation-example.json b/crates/fhir/tests/data/json/R4B/organizationaffiliation-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/organizationaffiliation-example.json rename to crates/fhir/tests/data/json/R4B/organizationaffiliation-example.json diff --git a/crates/fhir/tests/data/R4B/organizationaffiliation-questionnaire.json b/crates/fhir/tests/data/json/R4B/organizationaffiliation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/organizationaffiliation-questionnaire.json rename to crates/fhir/tests/data/json/R4B/organizationaffiliation-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/organizationaffiliation.profile.json b/crates/fhir/tests/data/json/R4B/organizationaffiliation.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/organizationaffiliation.profile.json rename to crates/fhir/tests/data/json/R4B/organizationaffiliation.profile.json diff --git a/crates/fhir/tests/data/R4B/orgrole-example-hie.json b/crates/fhir/tests/data/json/R4B/orgrole-example-hie.json similarity index 100% rename from crates/fhir/tests/data/R4B/orgrole-example-hie.json rename to crates/fhir/tests/data/json/R4B/orgrole-example-hie.json diff --git a/crates/fhir/tests/data/R4B/orgrole-example-services.json b/crates/fhir/tests/data/json/R4B/orgrole-example-services.json similarity index 100% rename from crates/fhir/tests/data/R4B/orgrole-example-services.json rename to crates/fhir/tests/data/json/R4B/orgrole-example-services.json diff --git a/crates/fhir/tests/data/R4B/oxygensat-questionnaire.json b/crates/fhir/tests/data/json/R4B/oxygensat-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/oxygensat-questionnaire.json rename to crates/fhir/tests/data/json/R4B/oxygensat-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/oxygensat.profile.json b/crates/fhir/tests/data/json/R4B/oxygensat.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/oxygensat.profile.json rename to crates/fhir/tests/data/json/R4B/oxygensat.profile.json diff --git a/crates/fhir/tests/data/R4B/packagedproductdefinition-example-co-packaged-liquid-and-syringe.json b/crates/fhir/tests/data/json/R4B/packagedproductdefinition-example-co-packaged-liquid-and-syringe.json similarity index 100% rename from crates/fhir/tests/data/R4B/packagedproductdefinition-example-co-packaged-liquid-and-syringe.json rename to crates/fhir/tests/data/json/R4B/packagedproductdefinition-example-co-packaged-liquid-and-syringe.json diff --git a/crates/fhir/tests/data/R4B/packagedproductdefinition-example.json b/crates/fhir/tests/data/json/R4B/packagedproductdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/packagedproductdefinition-example.json rename to crates/fhir/tests/data/json/R4B/packagedproductdefinition-example.json diff --git a/crates/fhir/tests/data/R4B/packagedproductdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/packagedproductdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/packagedproductdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/packagedproductdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/packagedproductdefinition.profile.json b/crates/fhir/tests/data/json/R4B/packagedproductdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/packagedproductdefinition.profile.json rename to crates/fhir/tests/data/json/R4B/packagedproductdefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/parameterdefinition.profile.json b/crates/fhir/tests/data/json/R4B/parameterdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/parameterdefinition.profile.json rename to crates/fhir/tests/data/json/R4B/parameterdefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/parameters-example.json b/crates/fhir/tests/data/json/R4B/parameters-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/parameters-example.json rename to crates/fhir/tests/data/json/R4B/parameters-example.json diff --git a/crates/fhir/tests/data/R4B/parameters-questionnaire.json b/crates/fhir/tests/data/json/R4B/parameters-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/parameters-questionnaire.json rename to crates/fhir/tests/data/json/R4B/parameters-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/parameters.profile.json b/crates/fhir/tests/data/json/R4B/parameters.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/parameters.profile.json rename to crates/fhir/tests/data/json/R4B/parameters.profile.json diff --git a/crates/fhir/tests/data/R4B/patient-example-a.json b/crates/fhir/tests/data/json/R4B/patient-example-a.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example-a.json rename to crates/fhir/tests/data/json/R4B/patient-example-a.json diff --git a/crates/fhir/tests/data/R4B/patient-example-animal.json b/crates/fhir/tests/data/json/R4B/patient-example-animal.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example-animal.json rename to crates/fhir/tests/data/json/R4B/patient-example-animal.json diff --git a/crates/fhir/tests/data/R4B/patient-example-b.json b/crates/fhir/tests/data/json/R4B/patient-example-b.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example-b.json rename to crates/fhir/tests/data/json/R4B/patient-example-b.json diff --git a/crates/fhir/tests/data/R4B/patient-example-c.json b/crates/fhir/tests/data/json/R4B/patient-example-c.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example-c.json rename to crates/fhir/tests/data/json/R4B/patient-example-c.json diff --git a/crates/fhir/tests/data/R4B/patient-example-chinese.json b/crates/fhir/tests/data/json/R4B/patient-example-chinese.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example-chinese.json rename to crates/fhir/tests/data/json/R4B/patient-example-chinese.json diff --git a/crates/fhir/tests/data/R4B/patient-example-d.json b/crates/fhir/tests/data/json/R4B/patient-example-d.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example-d.json rename to crates/fhir/tests/data/json/R4B/patient-example-d.json diff --git a/crates/fhir/tests/data/R4B/patient-example-dicom.json b/crates/fhir/tests/data/json/R4B/patient-example-dicom.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example-dicom.json rename to crates/fhir/tests/data/json/R4B/patient-example-dicom.json diff --git a/crates/fhir/tests/data/R4B/patient-example-f001-pieter.json b/crates/fhir/tests/data/json/R4B/patient-example-f001-pieter.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example-f001-pieter.json rename to crates/fhir/tests/data/json/R4B/patient-example-f001-pieter.json diff --git a/crates/fhir/tests/data/R4B/patient-example-f201-roel.json b/crates/fhir/tests/data/json/R4B/patient-example-f201-roel.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example-f201-roel.json rename to crates/fhir/tests/data/json/R4B/patient-example-f201-roel.json diff --git a/crates/fhir/tests/data/R4B/patient-example-ihe-pcd.json b/crates/fhir/tests/data/json/R4B/patient-example-ihe-pcd.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example-ihe-pcd.json rename to crates/fhir/tests/data/json/R4B/patient-example-ihe-pcd.json diff --git a/crates/fhir/tests/data/R4B/patient-example-infant-fetal.json b/crates/fhir/tests/data/json/R4B/patient-example-infant-fetal.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example-infant-fetal.json rename to crates/fhir/tests/data/json/R4B/patient-example-infant-fetal.json diff --git a/crates/fhir/tests/data/R4B/patient-example-infant-mom.json b/crates/fhir/tests/data/json/R4B/patient-example-infant-mom.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example-infant-mom.json rename to crates/fhir/tests/data/json/R4B/patient-example-infant-mom.json diff --git a/crates/fhir/tests/data/R4B/patient-example-infant-twin-1.json b/crates/fhir/tests/data/json/R4B/patient-example-infant-twin-1.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example-infant-twin-1.json rename to crates/fhir/tests/data/json/R4B/patient-example-infant-twin-1.json diff --git a/crates/fhir/tests/data/R4B/patient-example-infant-twin-2.json b/crates/fhir/tests/data/json/R4B/patient-example-infant-twin-2.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example-infant-twin-2.json rename to crates/fhir/tests/data/json/R4B/patient-example-infant-twin-2.json diff --git a/crates/fhir/tests/data/R4B/patient-example-mom.json b/crates/fhir/tests/data/json/R4B/patient-example-mom.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example-mom.json rename to crates/fhir/tests/data/json/R4B/patient-example-mom.json diff --git a/crates/fhir/tests/data/R4B/patient-example-newborn.json b/crates/fhir/tests/data/json/R4B/patient-example-newborn.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example-newborn.json rename to crates/fhir/tests/data/json/R4B/patient-example-newborn.json diff --git a/crates/fhir/tests/data/R4B/patient-example-proband.json b/crates/fhir/tests/data/json/R4B/patient-example-proband.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example-proband.json rename to crates/fhir/tests/data/json/R4B/patient-example-proband.json diff --git a/crates/fhir/tests/data/R4B/patient-example-xcda.json b/crates/fhir/tests/data/json/R4B/patient-example-xcda.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example-xcda.json rename to crates/fhir/tests/data/json/R4B/patient-example-xcda.json diff --git a/crates/fhir/tests/data/R4B/patient-example-xds.json b/crates/fhir/tests/data/json/R4B/patient-example-xds.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example-xds.json rename to crates/fhir/tests/data/json/R4B/patient-example-xds.json diff --git a/crates/fhir/tests/data/R4B/patient-example.json b/crates/fhir/tests/data/json/R4B/patient-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-example.json rename to crates/fhir/tests/data/json/R4B/patient-example.json diff --git a/crates/fhir/tests/data/R4B/patient-examples-cypress-template.json b/crates/fhir/tests/data/json/R4B/patient-examples-cypress-template.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-examples-cypress-template.json rename to crates/fhir/tests/data/json/R4B/patient-examples-cypress-template.json diff --git a/crates/fhir/tests/data/R4B/patient-examples-general.json b/crates/fhir/tests/data/json/R4B/patient-examples-general.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-examples-general.json rename to crates/fhir/tests/data/json/R4B/patient-examples-general.json diff --git a/crates/fhir/tests/data/R4B/patient-extensions-Patient-age.json b/crates/fhir/tests/data/json/R4B/patient-extensions-Patient-age.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-extensions-Patient-age.json rename to crates/fhir/tests/data/json/R4B/patient-extensions-Patient-age.json diff --git a/crates/fhir/tests/data/R4B/patient-extensions-Patient-birthOrderBoolean.json b/crates/fhir/tests/data/json/R4B/patient-extensions-Patient-birthOrderBoolean.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-extensions-Patient-birthOrderBoolean.json rename to crates/fhir/tests/data/json/R4B/patient-extensions-Patient-birthOrderBoolean.json diff --git a/crates/fhir/tests/data/R4B/patient-extensions-Patient-mothersMaidenName.json b/crates/fhir/tests/data/json/R4B/patient-extensions-Patient-mothersMaidenName.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-extensions-Patient-mothersMaidenName.json rename to crates/fhir/tests/data/json/R4B/patient-extensions-Patient-mothersMaidenName.json diff --git a/crates/fhir/tests/data/R4B/patient-genetics-example1.json b/crates/fhir/tests/data/json/R4B/patient-genetics-example1.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-genetics-example1.json rename to crates/fhir/tests/data/json/R4B/patient-genetics-example1.json diff --git a/crates/fhir/tests/data/R4B/patient-glossy-example.json b/crates/fhir/tests/data/json/R4B/patient-glossy-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-glossy-example.json rename to crates/fhir/tests/data/json/R4B/patient-glossy-example.json diff --git a/crates/fhir/tests/data/R4B/patient-questionnaire.json b/crates/fhir/tests/data/json/R4B/patient-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient-questionnaire.json rename to crates/fhir/tests/data/json/R4B/patient-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/patient.profile.json b/crates/fhir/tests/data/json/R4B/patient.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/patient.profile.json rename to crates/fhir/tests/data/json/R4B/patient.profile.json diff --git a/crates/fhir/tests/data/R4B/paymentnotice-example.json b/crates/fhir/tests/data/json/R4B/paymentnotice-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/paymentnotice-example.json rename to crates/fhir/tests/data/json/R4B/paymentnotice-example.json diff --git a/crates/fhir/tests/data/R4B/paymentnotice-questionnaire.json b/crates/fhir/tests/data/json/R4B/paymentnotice-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/paymentnotice-questionnaire.json rename to crates/fhir/tests/data/json/R4B/paymentnotice-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/paymentnotice.profile.json b/crates/fhir/tests/data/json/R4B/paymentnotice.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/paymentnotice.profile.json rename to crates/fhir/tests/data/json/R4B/paymentnotice.profile.json diff --git a/crates/fhir/tests/data/R4B/paymentreconciliation-example.json b/crates/fhir/tests/data/json/R4B/paymentreconciliation-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/paymentreconciliation-example.json rename to crates/fhir/tests/data/json/R4B/paymentreconciliation-example.json diff --git a/crates/fhir/tests/data/R4B/paymentreconciliation-questionnaire.json b/crates/fhir/tests/data/json/R4B/paymentreconciliation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/paymentreconciliation-questionnaire.json rename to crates/fhir/tests/data/json/R4B/paymentreconciliation-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/paymentreconciliation.profile.json b/crates/fhir/tests/data/json/R4B/paymentreconciliation.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/paymentreconciliation.profile.json rename to crates/fhir/tests/data/json/R4B/paymentreconciliation.profile.json diff --git a/crates/fhir/tests/data/R4B/pcd-example-notAuthor.json b/crates/fhir/tests/data/json/R4B/pcd-example-notAuthor.json similarity index 100% rename from crates/fhir/tests/data/R4B/pcd-example-notAuthor.json rename to crates/fhir/tests/data/json/R4B/pcd-example-notAuthor.json diff --git a/crates/fhir/tests/data/R4B/pcd-example-notLabs.json b/crates/fhir/tests/data/json/R4B/pcd-example-notLabs.json similarity index 100% rename from crates/fhir/tests/data/R4B/pcd-example-notLabs.json rename to crates/fhir/tests/data/json/R4B/pcd-example-notLabs.json diff --git a/crates/fhir/tests/data/R4B/pcd-example-notOrg.json b/crates/fhir/tests/data/json/R4B/pcd-example-notOrg.json similarity index 100% rename from crates/fhir/tests/data/R4B/pcd-example-notOrg.json rename to crates/fhir/tests/data/json/R4B/pcd-example-notOrg.json diff --git a/crates/fhir/tests/data/R4B/pcd-example-notThem.json b/crates/fhir/tests/data/json/R4B/pcd-example-notThem.json similarity index 100% rename from crates/fhir/tests/data/R4B/pcd-example-notThem.json rename to crates/fhir/tests/data/json/R4B/pcd-example-notThem.json diff --git a/crates/fhir/tests/data/R4B/pcd-example-notThis.json b/crates/fhir/tests/data/json/R4B/pcd-example-notThis.json similarity index 100% rename from crates/fhir/tests/data/R4B/pcd-example-notThis.json rename to crates/fhir/tests/data/json/R4B/pcd-example-notThis.json diff --git a/crates/fhir/tests/data/R4B/period.profile.json b/crates/fhir/tests/data/json/R4B/period.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/period.profile.json rename to crates/fhir/tests/data/json/R4B/period.profile.json diff --git a/crates/fhir/tests/data/R4B/person-example-f002-ariadne.json b/crates/fhir/tests/data/json/R4B/person-example-f002-ariadne.json similarity index 100% rename from crates/fhir/tests/data/R4B/person-example-f002-ariadne.json rename to crates/fhir/tests/data/json/R4B/person-example-f002-ariadne.json diff --git a/crates/fhir/tests/data/R4B/person-example.json b/crates/fhir/tests/data/json/R4B/person-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/person-example.json rename to crates/fhir/tests/data/json/R4B/person-example.json diff --git a/crates/fhir/tests/data/R4B/person-grahame.json b/crates/fhir/tests/data/json/R4B/person-grahame.json similarity index 100% rename from crates/fhir/tests/data/R4B/person-grahame.json rename to crates/fhir/tests/data/json/R4B/person-grahame.json diff --git a/crates/fhir/tests/data/R4B/person-patient-portal.json b/crates/fhir/tests/data/json/R4B/person-patient-portal.json similarity index 100% rename from crates/fhir/tests/data/R4B/person-patient-portal.json rename to crates/fhir/tests/data/json/R4B/person-patient-portal.json diff --git a/crates/fhir/tests/data/R4B/person-provider-directory.json b/crates/fhir/tests/data/json/R4B/person-provider-directory.json similarity index 100% rename from crates/fhir/tests/data/R4B/person-provider-directory.json rename to crates/fhir/tests/data/json/R4B/person-provider-directory.json diff --git a/crates/fhir/tests/data/R4B/person-questionnaire.json b/crates/fhir/tests/data/json/R4B/person-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/person-questionnaire.json rename to crates/fhir/tests/data/json/R4B/person-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/person.profile.json b/crates/fhir/tests/data/json/R4B/person.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/person.profile.json rename to crates/fhir/tests/data/json/R4B/person.profile.json diff --git a/crates/fhir/tests/data/R4B/plandefinition-chlamydia-screening-intervention.json b/crates/fhir/tests/data/json/R4B/plandefinition-chlamydia-screening-intervention.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition-chlamydia-screening-intervention.json rename to crates/fhir/tests/data/json/R4B/plandefinition-chlamydia-screening-intervention.json diff --git a/crates/fhir/tests/data/R4B/plandefinition-example-cardiology-os.json b/crates/fhir/tests/data/json/R4B/plandefinition-example-cardiology-os.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition-example-cardiology-os.json rename to crates/fhir/tests/data/json/R4B/plandefinition-example-cardiology-os.json diff --git a/crates/fhir/tests/data/R4B/plandefinition-example-kdn5-simplified.json b/crates/fhir/tests/data/json/R4B/plandefinition-example-kdn5-simplified.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition-example-kdn5-simplified.json rename to crates/fhir/tests/data/json/R4B/plandefinition-example-kdn5-simplified.json diff --git a/crates/fhir/tests/data/R4B/plandefinition-example.json b/crates/fhir/tests/data/json/R4B/plandefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition-example.json rename to crates/fhir/tests/data/json/R4B/plandefinition-example.json diff --git a/crates/fhir/tests/data/R4B/plandefinition-exclusive-breastfeeding-intervention-01.json b/crates/fhir/tests/data/json/R4B/plandefinition-exclusive-breastfeeding-intervention-01.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition-exclusive-breastfeeding-intervention-01.json rename to crates/fhir/tests/data/json/R4B/plandefinition-exclusive-breastfeeding-intervention-01.json diff --git a/crates/fhir/tests/data/R4B/plandefinition-exclusive-breastfeeding-intervention-02.json b/crates/fhir/tests/data/json/R4B/plandefinition-exclusive-breastfeeding-intervention-02.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition-exclusive-breastfeeding-intervention-02.json rename to crates/fhir/tests/data/json/R4B/plandefinition-exclusive-breastfeeding-intervention-02.json diff --git a/crates/fhir/tests/data/R4B/plandefinition-exclusive-breastfeeding-intervention-03.json b/crates/fhir/tests/data/json/R4B/plandefinition-exclusive-breastfeeding-intervention-03.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition-exclusive-breastfeeding-intervention-03.json rename to crates/fhir/tests/data/json/R4B/plandefinition-exclusive-breastfeeding-intervention-03.json diff --git a/crates/fhir/tests/data/R4B/plandefinition-exclusive-breastfeeding-intervention-04.json b/crates/fhir/tests/data/json/R4B/plandefinition-exclusive-breastfeeding-intervention-04.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition-exclusive-breastfeeding-intervention-04.json rename to crates/fhir/tests/data/json/R4B/plandefinition-exclusive-breastfeeding-intervention-04.json diff --git a/crates/fhir/tests/data/R4B/plandefinition-opioidcds-04.json b/crates/fhir/tests/data/json/R4B/plandefinition-opioidcds-04.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition-opioidcds-04.json rename to crates/fhir/tests/data/json/R4B/plandefinition-opioidcds-04.json diff --git a/crates/fhir/tests/data/R4B/plandefinition-opioidcds-05.json b/crates/fhir/tests/data/json/R4B/plandefinition-opioidcds-05.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition-opioidcds-05.json rename to crates/fhir/tests/data/json/R4B/plandefinition-opioidcds-05.json diff --git a/crates/fhir/tests/data/R4B/plandefinition-opioidcds-07.json b/crates/fhir/tests/data/json/R4B/plandefinition-opioidcds-07.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition-opioidcds-07.json rename to crates/fhir/tests/data/json/R4B/plandefinition-opioidcds-07.json diff --git a/crates/fhir/tests/data/R4B/plandefinition-opioidcds-08.json b/crates/fhir/tests/data/json/R4B/plandefinition-opioidcds-08.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition-opioidcds-08.json rename to crates/fhir/tests/data/json/R4B/plandefinition-opioidcds-08.json diff --git a/crates/fhir/tests/data/R4B/plandefinition-opioidcds-10.json b/crates/fhir/tests/data/json/R4B/plandefinition-opioidcds-10.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition-opioidcds-10.json rename to crates/fhir/tests/data/json/R4B/plandefinition-opioidcds-10.json diff --git a/crates/fhir/tests/data/R4B/plandefinition-opioidcds-11.json b/crates/fhir/tests/data/json/R4B/plandefinition-opioidcds-11.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition-opioidcds-11.json rename to crates/fhir/tests/data/json/R4B/plandefinition-opioidcds-11.json diff --git a/crates/fhir/tests/data/R4B/plandefinition-options-example.json b/crates/fhir/tests/data/json/R4B/plandefinition-options-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition-options-example.json rename to crates/fhir/tests/data/json/R4B/plandefinition-options-example.json diff --git a/crates/fhir/tests/data/R4B/plandefinition-predecessor-example.json b/crates/fhir/tests/data/json/R4B/plandefinition-predecessor-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition-predecessor-example.json rename to crates/fhir/tests/data/json/R4B/plandefinition-predecessor-example.json diff --git a/crates/fhir/tests/data/R4B/plandefinition-protocol-example.json b/crates/fhir/tests/data/json/R4B/plandefinition-protocol-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition-protocol-example.json rename to crates/fhir/tests/data/json/R4B/plandefinition-protocol-example.json diff --git a/crates/fhir/tests/data/R4B/plandefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/plandefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/plandefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/plandefinition-zika-virus-intervention.json b/crates/fhir/tests/data/json/R4B/plandefinition-zika-virus-intervention.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition-zika-virus-intervention.json rename to crates/fhir/tests/data/json/R4B/plandefinition-zika-virus-intervention.json diff --git a/crates/fhir/tests/data/R4B/plandefinition.profile.json b/crates/fhir/tests/data/json/R4B/plandefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/plandefinition.profile.json rename to crates/fhir/tests/data/json/R4B/plandefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/population.profile.json b/crates/fhir/tests/data/json/R4B/population.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/population.profile.json rename to crates/fhir/tests/data/json/R4B/population.profile.json diff --git a/crates/fhir/tests/data/R4B/positiveint.profile.json b/crates/fhir/tests/data/json/R4B/positiveint.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/positiveint.profile.json rename to crates/fhir/tests/data/json/R4B/positiveint.profile.json diff --git a/crates/fhir/tests/data/R4B/practitioner-example-f001-evdb.json b/crates/fhir/tests/data/json/R4B/practitioner-example-f001-evdb.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitioner-example-f001-evdb.json rename to crates/fhir/tests/data/json/R4B/practitioner-example-f001-evdb.json diff --git a/crates/fhir/tests/data/R4B/practitioner-example-f002-pv.json b/crates/fhir/tests/data/json/R4B/practitioner-example-f002-pv.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitioner-example-f002-pv.json rename to crates/fhir/tests/data/json/R4B/practitioner-example-f002-pv.json diff --git a/crates/fhir/tests/data/R4B/practitioner-example-f003-mv.json b/crates/fhir/tests/data/json/R4B/practitioner-example-f003-mv.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitioner-example-f003-mv.json rename to crates/fhir/tests/data/json/R4B/practitioner-example-f003-mv.json diff --git a/crates/fhir/tests/data/R4B/practitioner-example-f004-rb.json b/crates/fhir/tests/data/json/R4B/practitioner-example-f004-rb.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitioner-example-f004-rb.json rename to crates/fhir/tests/data/json/R4B/practitioner-example-f004-rb.json diff --git a/crates/fhir/tests/data/R4B/practitioner-example-f005-al.json b/crates/fhir/tests/data/json/R4B/practitioner-example-f005-al.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitioner-example-f005-al.json rename to crates/fhir/tests/data/json/R4B/practitioner-example-f005-al.json diff --git a/crates/fhir/tests/data/R4B/practitioner-example-f006-rvdb.json b/crates/fhir/tests/data/json/R4B/practitioner-example-f006-rvdb.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitioner-example-f006-rvdb.json rename to crates/fhir/tests/data/json/R4B/practitioner-example-f006-rvdb.json diff --git a/crates/fhir/tests/data/R4B/practitioner-example-f007-sh.json b/crates/fhir/tests/data/json/R4B/practitioner-example-f007-sh.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitioner-example-f007-sh.json rename to crates/fhir/tests/data/json/R4B/practitioner-example-f007-sh.json diff --git a/crates/fhir/tests/data/R4B/practitioner-example-f201-ab.json b/crates/fhir/tests/data/json/R4B/practitioner-example-f201-ab.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitioner-example-f201-ab.json rename to crates/fhir/tests/data/json/R4B/practitioner-example-f201-ab.json diff --git a/crates/fhir/tests/data/R4B/practitioner-example-f202-lm.json b/crates/fhir/tests/data/json/R4B/practitioner-example-f202-lm.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitioner-example-f202-lm.json rename to crates/fhir/tests/data/json/R4B/practitioner-example-f202-lm.json diff --git a/crates/fhir/tests/data/R4B/practitioner-example-f203-jvg.json b/crates/fhir/tests/data/json/R4B/practitioner-example-f203-jvg.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitioner-example-f203-jvg.json rename to crates/fhir/tests/data/json/R4B/practitioner-example-f203-jvg.json diff --git a/crates/fhir/tests/data/R4B/practitioner-example-f204-ce.json b/crates/fhir/tests/data/json/R4B/practitioner-example-f204-ce.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitioner-example-f204-ce.json rename to crates/fhir/tests/data/json/R4B/practitioner-example-f204-ce.json diff --git a/crates/fhir/tests/data/R4B/practitioner-example-xcda-author.json b/crates/fhir/tests/data/json/R4B/practitioner-example-xcda-author.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitioner-example-xcda-author.json rename to crates/fhir/tests/data/json/R4B/practitioner-example-xcda-author.json diff --git a/crates/fhir/tests/data/R4B/practitioner-example-xcda1.json b/crates/fhir/tests/data/json/R4B/practitioner-example-xcda1.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitioner-example-xcda1.json rename to crates/fhir/tests/data/json/R4B/practitioner-example-xcda1.json diff --git a/crates/fhir/tests/data/R4B/practitioner-example.json b/crates/fhir/tests/data/json/R4B/practitioner-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitioner-example.json rename to crates/fhir/tests/data/json/R4B/practitioner-example.json diff --git a/crates/fhir/tests/data/R4B/practitioner-examples-general.json b/crates/fhir/tests/data/json/R4B/practitioner-examples-general.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitioner-examples-general.json rename to crates/fhir/tests/data/json/R4B/practitioner-examples-general.json diff --git a/crates/fhir/tests/data/R4B/practitioner-questionnaire.json b/crates/fhir/tests/data/json/R4B/practitioner-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitioner-questionnaire.json rename to crates/fhir/tests/data/json/R4B/practitioner-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/practitioner.profile.json b/crates/fhir/tests/data/json/R4B/practitioner.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitioner.profile.json rename to crates/fhir/tests/data/json/R4B/practitioner.profile.json diff --git a/crates/fhir/tests/data/R4B/practitionerrole-example.json b/crates/fhir/tests/data/json/R4B/practitionerrole-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitionerrole-example.json rename to crates/fhir/tests/data/json/R4B/practitionerrole-example.json diff --git a/crates/fhir/tests/data/R4B/practitionerrole-examples-general.json b/crates/fhir/tests/data/json/R4B/practitionerrole-examples-general.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitionerrole-examples-general.json rename to crates/fhir/tests/data/json/R4B/practitionerrole-examples-general.json diff --git a/crates/fhir/tests/data/R4B/practitionerrole-questionnaire.json b/crates/fhir/tests/data/json/R4B/practitionerrole-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitionerrole-questionnaire.json rename to crates/fhir/tests/data/json/R4B/practitionerrole-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/practitionerrole.profile.json b/crates/fhir/tests/data/json/R4B/practitionerrole.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/practitionerrole.profile.json rename to crates/fhir/tests/data/json/R4B/practitionerrole.profile.json diff --git a/crates/fhir/tests/data/R4B/procedure-example-HCBS.json b/crates/fhir/tests/data/json/R4B/procedure-example-HCBS.json similarity index 100% rename from crates/fhir/tests/data/R4B/procedure-example-HCBS.json rename to crates/fhir/tests/data/json/R4B/procedure-example-HCBS.json diff --git a/crates/fhir/tests/data/R4B/procedure-example-ambulation.json b/crates/fhir/tests/data/json/R4B/procedure-example-ambulation.json similarity index 100% rename from crates/fhir/tests/data/R4B/procedure-example-ambulation.json rename to crates/fhir/tests/data/json/R4B/procedure-example-ambulation.json diff --git a/crates/fhir/tests/data/R4B/procedure-example-appendectomy-narrative.json b/crates/fhir/tests/data/json/R4B/procedure-example-appendectomy-narrative.json similarity index 100% rename from crates/fhir/tests/data/R4B/procedure-example-appendectomy-narrative.json rename to crates/fhir/tests/data/json/R4B/procedure-example-appendectomy-narrative.json diff --git a/crates/fhir/tests/data/R4B/procedure-example-biopsy.json b/crates/fhir/tests/data/json/R4B/procedure-example-biopsy.json similarity index 100% rename from crates/fhir/tests/data/R4B/procedure-example-biopsy.json rename to crates/fhir/tests/data/json/R4B/procedure-example-biopsy.json diff --git a/crates/fhir/tests/data/R4B/procedure-example-colon-biopsy.json b/crates/fhir/tests/data/json/R4B/procedure-example-colon-biopsy.json similarity index 100% rename from crates/fhir/tests/data/R4B/procedure-example-colon-biopsy.json rename to crates/fhir/tests/data/json/R4B/procedure-example-colon-biopsy.json diff --git a/crates/fhir/tests/data/R4B/procedure-example-colonoscopy.json b/crates/fhir/tests/data/json/R4B/procedure-example-colonoscopy.json similarity index 100% rename from crates/fhir/tests/data/R4B/procedure-example-colonoscopy.json rename to crates/fhir/tests/data/json/R4B/procedure-example-colonoscopy.json diff --git a/crates/fhir/tests/data/R4B/procedure-example-education.json b/crates/fhir/tests/data/json/R4B/procedure-example-education.json similarity index 100% rename from crates/fhir/tests/data/R4B/procedure-example-education.json rename to crates/fhir/tests/data/json/R4B/procedure-example-education.json diff --git a/crates/fhir/tests/data/R4B/procedure-example-f001-heart.json b/crates/fhir/tests/data/json/R4B/procedure-example-f001-heart.json similarity index 100% rename from crates/fhir/tests/data/R4B/procedure-example-f001-heart.json rename to crates/fhir/tests/data/json/R4B/procedure-example-f001-heart.json diff --git a/crates/fhir/tests/data/R4B/procedure-example-f002-lung.json b/crates/fhir/tests/data/json/R4B/procedure-example-f002-lung.json similarity index 100% rename from crates/fhir/tests/data/R4B/procedure-example-f002-lung.json rename to crates/fhir/tests/data/json/R4B/procedure-example-f002-lung.json diff --git a/crates/fhir/tests/data/R4B/procedure-example-f003-abscess.json b/crates/fhir/tests/data/json/R4B/procedure-example-f003-abscess.json similarity index 100% rename from crates/fhir/tests/data/R4B/procedure-example-f003-abscess.json rename to crates/fhir/tests/data/json/R4B/procedure-example-f003-abscess.json diff --git a/crates/fhir/tests/data/R4B/procedure-example-f004-tracheotomy.json b/crates/fhir/tests/data/json/R4B/procedure-example-f004-tracheotomy.json similarity index 100% rename from crates/fhir/tests/data/R4B/procedure-example-f004-tracheotomy.json rename to crates/fhir/tests/data/json/R4B/procedure-example-f004-tracheotomy.json diff --git a/crates/fhir/tests/data/R4B/procedure-example-f201-tpf.json b/crates/fhir/tests/data/json/R4B/procedure-example-f201-tpf.json similarity index 100% rename from crates/fhir/tests/data/R4B/procedure-example-f201-tpf.json rename to crates/fhir/tests/data/json/R4B/procedure-example-f201-tpf.json diff --git a/crates/fhir/tests/data/R4B/procedure-example-implant.json b/crates/fhir/tests/data/json/R4B/procedure-example-implant.json similarity index 100% rename from crates/fhir/tests/data/R4B/procedure-example-implant.json rename to crates/fhir/tests/data/json/R4B/procedure-example-implant.json diff --git a/crates/fhir/tests/data/R4B/procedure-example-ob.json b/crates/fhir/tests/data/json/R4B/procedure-example-ob.json similarity index 100% rename from crates/fhir/tests/data/R4B/procedure-example-ob.json rename to crates/fhir/tests/data/json/R4B/procedure-example-ob.json diff --git a/crates/fhir/tests/data/R4B/procedure-example-physical-therapy.json b/crates/fhir/tests/data/json/R4B/procedure-example-physical-therapy.json similarity index 100% rename from crates/fhir/tests/data/R4B/procedure-example-physical-therapy.json rename to crates/fhir/tests/data/json/R4B/procedure-example-physical-therapy.json diff --git a/crates/fhir/tests/data/R4B/procedure-example.json b/crates/fhir/tests/data/json/R4B/procedure-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/procedure-example.json rename to crates/fhir/tests/data/json/R4B/procedure-example.json diff --git a/crates/fhir/tests/data/R4B/procedure-questionnaire.json b/crates/fhir/tests/data/json/R4B/procedure-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/procedure-questionnaire.json rename to crates/fhir/tests/data/json/R4B/procedure-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/procedure.profile.json b/crates/fhir/tests/data/json/R4B/procedure.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/procedure.profile.json rename to crates/fhir/tests/data/json/R4B/procedure.profile.json diff --git a/crates/fhir/tests/data/R4B/prodcharacteristic.profile.json b/crates/fhir/tests/data/json/R4B/prodcharacteristic.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/prodcharacteristic.profile.json rename to crates/fhir/tests/data/json/R4B/prodcharacteristic.profile.json diff --git a/crates/fhir/tests/data/R4B/productshelflife.profile.json b/crates/fhir/tests/data/json/R4B/productshelflife.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/productshelflife.profile.json rename to crates/fhir/tests/data/json/R4B/productshelflife.profile.json diff --git a/crates/fhir/tests/data/R4B/profiles-others.json b/crates/fhir/tests/data/json/R4B/profiles-others.json similarity index 100% rename from crates/fhir/tests/data/R4B/profiles-others.json rename to crates/fhir/tests/data/json/R4B/profiles-others.json diff --git a/crates/fhir/tests/data/R4B/profiles-resources.json b/crates/fhir/tests/data/json/R4B/profiles-resources.json similarity index 100% rename from crates/fhir/tests/data/R4B/profiles-resources.json rename to crates/fhir/tests/data/json/R4B/profiles-resources.json diff --git a/crates/fhir/tests/data/R4B/profiles-types.json b/crates/fhir/tests/data/json/R4B/profiles-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/profiles-types.json rename to crates/fhir/tests/data/json/R4B/profiles-types.json diff --git a/crates/fhir/tests/data/R4B/provenance-consent-signature.json b/crates/fhir/tests/data/json/R4B/provenance-consent-signature.json similarity index 100% rename from crates/fhir/tests/data/R4B/provenance-consent-signature.json rename to crates/fhir/tests/data/json/R4B/provenance-consent-signature.json diff --git a/crates/fhir/tests/data/R4B/provenance-example-biocompute-object.json b/crates/fhir/tests/data/json/R4B/provenance-example-biocompute-object.json similarity index 100% rename from crates/fhir/tests/data/R4B/provenance-example-biocompute-object.json rename to crates/fhir/tests/data/json/R4B/provenance-example-biocompute-object.json diff --git a/crates/fhir/tests/data/R4B/provenance-example-cwl.json b/crates/fhir/tests/data/json/R4B/provenance-example-cwl.json similarity index 100% rename from crates/fhir/tests/data/R4B/provenance-example-cwl.json rename to crates/fhir/tests/data/json/R4B/provenance-example-cwl.json diff --git a/crates/fhir/tests/data/R4B/provenance-example-sig.json b/crates/fhir/tests/data/json/R4B/provenance-example-sig.json similarity index 100% rename from crates/fhir/tests/data/R4B/provenance-example-sig.json rename to crates/fhir/tests/data/json/R4B/provenance-example-sig.json diff --git a/crates/fhir/tests/data/R4B/provenance-example.json b/crates/fhir/tests/data/json/R4B/provenance-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/provenance-example.json rename to crates/fhir/tests/data/json/R4B/provenance-example.json diff --git a/crates/fhir/tests/data/R4B/provenance-questionnaire.json b/crates/fhir/tests/data/json/R4B/provenance-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/provenance-questionnaire.json rename to crates/fhir/tests/data/json/R4B/provenance-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/provenance-relevant-history-questionnaire.json b/crates/fhir/tests/data/json/R4B/provenance-relevant-history-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/provenance-relevant-history-questionnaire.json rename to crates/fhir/tests/data/json/R4B/provenance-relevant-history-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/provenance-relevant-history.profile.json b/crates/fhir/tests/data/json/R4B/provenance-relevant-history.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/provenance-relevant-history.profile.json rename to crates/fhir/tests/data/json/R4B/provenance-relevant-history.profile.json diff --git a/crates/fhir/tests/data/R4B/provenance.profile.json b/crates/fhir/tests/data/json/R4B/provenance.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/provenance.profile.json rename to crates/fhir/tests/data/json/R4B/provenance.profile.json diff --git a/crates/fhir/tests/data/R4B/quantity.profile.json b/crates/fhir/tests/data/json/R4B/quantity.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/quantity.profile.json rename to crates/fhir/tests/data/json/R4B/quantity.profile.json diff --git a/crates/fhir/tests/data/R4B/questionnaire-cqf-example.json b/crates/fhir/tests/data/json/R4B/questionnaire-cqf-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/questionnaire-cqf-example.json rename to crates/fhir/tests/data/json/R4B/questionnaire-cqf-example.json diff --git a/crates/fhir/tests/data/R4B/questionnaire-example-bluebook.json b/crates/fhir/tests/data/json/R4B/questionnaire-example-bluebook.json similarity index 100% rename from crates/fhir/tests/data/R4B/questionnaire-example-bluebook.json rename to crates/fhir/tests/data/json/R4B/questionnaire-example-bluebook.json diff --git a/crates/fhir/tests/data/R4B/questionnaire-example-f201-lifelines.json b/crates/fhir/tests/data/json/R4B/questionnaire-example-f201-lifelines.json similarity index 100% rename from crates/fhir/tests/data/R4B/questionnaire-example-f201-lifelines.json rename to crates/fhir/tests/data/json/R4B/questionnaire-example-f201-lifelines.json diff --git a/crates/fhir/tests/data/R4B/questionnaire-example-gcs.json b/crates/fhir/tests/data/json/R4B/questionnaire-example-gcs.json similarity index 100% rename from crates/fhir/tests/data/R4B/questionnaire-example-gcs.json rename to crates/fhir/tests/data/json/R4B/questionnaire-example-gcs.json diff --git a/crates/fhir/tests/data/R4B/questionnaire-example.json b/crates/fhir/tests/data/json/R4B/questionnaire-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/questionnaire-example.json rename to crates/fhir/tests/data/json/R4B/questionnaire-example.json diff --git a/crates/fhir/tests/data/R4B/questionnaire-profile-example-ussg-fht.json b/crates/fhir/tests/data/json/R4B/questionnaire-profile-example-ussg-fht.json similarity index 100% rename from crates/fhir/tests/data/R4B/questionnaire-profile-example-ussg-fht.json rename to crates/fhir/tests/data/json/R4B/questionnaire-profile-example-ussg-fht.json diff --git a/crates/fhir/tests/data/R4B/questionnaire-questionnaire.json b/crates/fhir/tests/data/json/R4B/questionnaire-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/questionnaire-questionnaire.json rename to crates/fhir/tests/data/json/R4B/questionnaire-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/questionnaire-zika-virus-exposure-assessment.json b/crates/fhir/tests/data/json/R4B/questionnaire-zika-virus-exposure-assessment.json similarity index 100% rename from crates/fhir/tests/data/R4B/questionnaire-zika-virus-exposure-assessment.json rename to crates/fhir/tests/data/json/R4B/questionnaire-zika-virus-exposure-assessment.json diff --git a/crates/fhir/tests/data/R4B/questionnaire.profile.json b/crates/fhir/tests/data/json/R4B/questionnaire.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/questionnaire.profile.json rename to crates/fhir/tests/data/json/R4B/questionnaire.profile.json diff --git a/crates/fhir/tests/data/R4B/questionnaireresponse-example-bluebook.json b/crates/fhir/tests/data/json/R4B/questionnaireresponse-example-bluebook.json similarity index 100% rename from crates/fhir/tests/data/R4B/questionnaireresponse-example-bluebook.json rename to crates/fhir/tests/data/json/R4B/questionnaireresponse-example-bluebook.json diff --git a/crates/fhir/tests/data/R4B/questionnaireresponse-example-f201-lifelines.json b/crates/fhir/tests/data/json/R4B/questionnaireresponse-example-f201-lifelines.json similarity index 100% rename from crates/fhir/tests/data/R4B/questionnaireresponse-example-f201-lifelines.json rename to crates/fhir/tests/data/json/R4B/questionnaireresponse-example-f201-lifelines.json diff --git a/crates/fhir/tests/data/R4B/questionnaireresponse-example-gcs.json b/crates/fhir/tests/data/json/R4B/questionnaireresponse-example-gcs.json similarity index 100% rename from crates/fhir/tests/data/R4B/questionnaireresponse-example-gcs.json rename to crates/fhir/tests/data/json/R4B/questionnaireresponse-example-gcs.json diff --git a/crates/fhir/tests/data/R4B/questionnaireresponse-example-ussg-fht-answers.json b/crates/fhir/tests/data/json/R4B/questionnaireresponse-example-ussg-fht-answers.json similarity index 100% rename from crates/fhir/tests/data/R4B/questionnaireresponse-example-ussg-fht-answers.json rename to crates/fhir/tests/data/json/R4B/questionnaireresponse-example-ussg-fht-answers.json diff --git a/crates/fhir/tests/data/R4B/questionnaireresponse-example.json b/crates/fhir/tests/data/json/R4B/questionnaireresponse-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/questionnaireresponse-example.json rename to crates/fhir/tests/data/json/R4B/questionnaireresponse-example.json diff --git a/crates/fhir/tests/data/R4B/questionnaireresponse-extensions-QuestionnaireResponse-item-subject.json b/crates/fhir/tests/data/json/R4B/questionnaireresponse-extensions-QuestionnaireResponse-item-subject.json similarity index 100% rename from crates/fhir/tests/data/R4B/questionnaireresponse-extensions-QuestionnaireResponse-item-subject.json rename to crates/fhir/tests/data/json/R4B/questionnaireresponse-extensions-QuestionnaireResponse-item-subject.json diff --git a/crates/fhir/tests/data/R4B/questionnaireresponse-questionnaire.json b/crates/fhir/tests/data/json/R4B/questionnaireresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/questionnaireresponse-questionnaire.json rename to crates/fhir/tests/data/json/R4B/questionnaireresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/questionnaireresponse.profile.json b/crates/fhir/tests/data/json/R4B/questionnaireresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/questionnaireresponse.profile.json rename to crates/fhir/tests/data/json/R4B/questionnaireresponse.profile.json diff --git a/crates/fhir/tests/data/R4B/range.profile.json b/crates/fhir/tests/data/json/R4B/range.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/range.profile.json rename to crates/fhir/tests/data/json/R4B/range.profile.json diff --git a/crates/fhir/tests/data/R4B/ratio.profile.json b/crates/fhir/tests/data/json/R4B/ratio.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/ratio.profile.json rename to crates/fhir/tests/data/json/R4B/ratio.profile.json diff --git a/crates/fhir/tests/data/R4B/ratiorange.profile.json b/crates/fhir/tests/data/json/R4B/ratiorange.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/ratiorange.profile.json rename to crates/fhir/tests/data/json/R4B/ratiorange.profile.json diff --git a/crates/fhir/tests/data/R4B/reference.profile.json b/crates/fhir/tests/data/json/R4B/reference.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/reference.profile.json rename to crates/fhir/tests/data/json/R4B/reference.profile.json diff --git a/crates/fhir/tests/data/R4B/regulatedauthorization-example-basic-drug-auth.json b/crates/fhir/tests/data/json/R4B/regulatedauthorization-example-basic-drug-auth.json similarity index 100% rename from crates/fhir/tests/data/R4B/regulatedauthorization-example-basic-drug-auth.json rename to crates/fhir/tests/data/json/R4B/regulatedauthorization-example-basic-drug-auth.json diff --git a/crates/fhir/tests/data/R4B/regulatedauthorization-example.json b/crates/fhir/tests/data/json/R4B/regulatedauthorization-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/regulatedauthorization-example.json rename to crates/fhir/tests/data/json/R4B/regulatedauthorization-example.json diff --git a/crates/fhir/tests/data/R4B/regulatedauthorization-questionnaire.json b/crates/fhir/tests/data/json/R4B/regulatedauthorization-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/regulatedauthorization-questionnaire.json rename to crates/fhir/tests/data/json/R4B/regulatedauthorization-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/regulatedauthorization.profile.json b/crates/fhir/tests/data/json/R4B/regulatedauthorization.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/regulatedauthorization.profile.json rename to crates/fhir/tests/data/json/R4B/regulatedauthorization.profile.json diff --git a/crates/fhir/tests/data/R4B/relatedartifact.profile.json b/crates/fhir/tests/data/json/R4B/relatedartifact.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/relatedartifact.profile.json rename to crates/fhir/tests/data/json/R4B/relatedartifact.profile.json diff --git a/crates/fhir/tests/data/R4B/relatedperson-example-f001-sarah.json b/crates/fhir/tests/data/json/R4B/relatedperson-example-f001-sarah.json similarity index 100% rename from crates/fhir/tests/data/R4B/relatedperson-example-f001-sarah.json rename to crates/fhir/tests/data/json/R4B/relatedperson-example-f001-sarah.json diff --git a/crates/fhir/tests/data/R4B/relatedperson-example-f002-ariadne.json b/crates/fhir/tests/data/json/R4B/relatedperson-example-f002-ariadne.json similarity index 100% rename from crates/fhir/tests/data/R4B/relatedperson-example-f002-ariadne.json rename to crates/fhir/tests/data/json/R4B/relatedperson-example-f002-ariadne.json diff --git a/crates/fhir/tests/data/R4B/relatedperson-example-newborn-mom.json b/crates/fhir/tests/data/json/R4B/relatedperson-example-newborn-mom.json similarity index 100% rename from crates/fhir/tests/data/R4B/relatedperson-example-newborn-mom.json rename to crates/fhir/tests/data/json/R4B/relatedperson-example-newborn-mom.json diff --git a/crates/fhir/tests/data/R4B/relatedperson-example-peter.json b/crates/fhir/tests/data/json/R4B/relatedperson-example-peter.json similarity index 100% rename from crates/fhir/tests/data/R4B/relatedperson-example-peter.json rename to crates/fhir/tests/data/json/R4B/relatedperson-example-peter.json diff --git a/crates/fhir/tests/data/R4B/relatedperson-example.json b/crates/fhir/tests/data/json/R4B/relatedperson-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/relatedperson-example.json rename to crates/fhir/tests/data/json/R4B/relatedperson-example.json diff --git a/crates/fhir/tests/data/R4B/relatedperson-questionnaire.json b/crates/fhir/tests/data/json/R4B/relatedperson-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/relatedperson-questionnaire.json rename to crates/fhir/tests/data/json/R4B/relatedperson-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/relatedperson.profile.json b/crates/fhir/tests/data/json/R4B/relatedperson.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/relatedperson.profile.json rename to crates/fhir/tests/data/json/R4B/relatedperson.profile.json diff --git a/crates/fhir/tests/data/R4B/request.json b/crates/fhir/tests/data/json/R4B/request.json similarity index 100% rename from crates/fhir/tests/data/R4B/request.json rename to crates/fhir/tests/data/json/R4B/request.json diff --git a/crates/fhir/tests/data/R4B/requestgroup-example.json b/crates/fhir/tests/data/json/R4B/requestgroup-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/requestgroup-example.json rename to crates/fhir/tests/data/json/R4B/requestgroup-example.json diff --git a/crates/fhir/tests/data/R4B/requestgroup-kdn5-example.json b/crates/fhir/tests/data/json/R4B/requestgroup-kdn5-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/requestgroup-kdn5-example.json rename to crates/fhir/tests/data/json/R4B/requestgroup-kdn5-example.json diff --git a/crates/fhir/tests/data/R4B/requestgroup-questionnaire.json b/crates/fhir/tests/data/json/R4B/requestgroup-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/requestgroup-questionnaire.json rename to crates/fhir/tests/data/json/R4B/requestgroup-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/requestgroup.profile.json b/crates/fhir/tests/data/json/R4B/requestgroup.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/requestgroup.profile.json rename to crates/fhir/tests/data/json/R4B/requestgroup.profile.json diff --git a/crates/fhir/tests/data/R4B/researchdefinition-example.json b/crates/fhir/tests/data/json/R4B/researchdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/researchdefinition-example.json rename to crates/fhir/tests/data/json/R4B/researchdefinition-example.json diff --git a/crates/fhir/tests/data/R4B/researchdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/researchdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/researchdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/researchdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/researchdefinition.profile.json b/crates/fhir/tests/data/json/R4B/researchdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/researchdefinition.profile.json rename to crates/fhir/tests/data/json/R4B/researchdefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/researchelementdefinition-example.json b/crates/fhir/tests/data/json/R4B/researchelementdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/researchelementdefinition-example.json rename to crates/fhir/tests/data/json/R4B/researchelementdefinition-example.json diff --git a/crates/fhir/tests/data/R4B/researchelementdefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/researchelementdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/researchelementdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/researchelementdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/researchelementdefinition.profile.json b/crates/fhir/tests/data/json/R4B/researchelementdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/researchelementdefinition.profile.json rename to crates/fhir/tests/data/json/R4B/researchelementdefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/researchstudy-example.json b/crates/fhir/tests/data/json/R4B/researchstudy-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/researchstudy-example.json rename to crates/fhir/tests/data/json/R4B/researchstudy-example.json diff --git a/crates/fhir/tests/data/R4B/researchstudy-questionnaire.json b/crates/fhir/tests/data/json/R4B/researchstudy-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/researchstudy-questionnaire.json rename to crates/fhir/tests/data/json/R4B/researchstudy-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/researchstudy.profile.json b/crates/fhir/tests/data/json/R4B/researchstudy.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/researchstudy.profile.json rename to crates/fhir/tests/data/json/R4B/researchstudy.profile.json diff --git a/crates/fhir/tests/data/R4B/researchsubject-example.json b/crates/fhir/tests/data/json/R4B/researchsubject-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/researchsubject-example.json rename to crates/fhir/tests/data/json/R4B/researchsubject-example.json diff --git a/crates/fhir/tests/data/R4B/researchsubject-questionnaire.json b/crates/fhir/tests/data/json/R4B/researchsubject-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/researchsubject-questionnaire.json rename to crates/fhir/tests/data/json/R4B/researchsubject-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/researchsubject.profile.json b/crates/fhir/tests/data/json/R4B/researchsubject.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/researchsubject.profile.json rename to crates/fhir/tests/data/json/R4B/researchsubject.profile.json diff --git a/crates/fhir/tests/data/R4B/resource.profile.json b/crates/fhir/tests/data/json/R4B/resource.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/resource.profile.json rename to crates/fhir/tests/data/json/R4B/resource.profile.json diff --git a/crates/fhir/tests/data/R4B/resprate-questionnaire.json b/crates/fhir/tests/data/json/R4B/resprate-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/resprate-questionnaire.json rename to crates/fhir/tests/data/json/R4B/resprate-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/resprate.profile.json b/crates/fhir/tests/data/json/R4B/resprate.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/resprate.profile.json rename to crates/fhir/tests/data/json/R4B/resprate.profile.json diff --git a/crates/fhir/tests/data/R4B/riskassessment-example-breastcancer.json b/crates/fhir/tests/data/json/R4B/riskassessment-example-breastcancer.json similarity index 100% rename from crates/fhir/tests/data/R4B/riskassessment-example-breastcancer.json rename to crates/fhir/tests/data/json/R4B/riskassessment-example-breastcancer.json diff --git a/crates/fhir/tests/data/R4B/riskassessment-example-cardiac.json b/crates/fhir/tests/data/json/R4B/riskassessment-example-cardiac.json similarity index 100% rename from crates/fhir/tests/data/R4B/riskassessment-example-cardiac.json rename to crates/fhir/tests/data/json/R4B/riskassessment-example-cardiac.json diff --git a/crates/fhir/tests/data/R4B/riskassessment-example-population.json b/crates/fhir/tests/data/json/R4B/riskassessment-example-population.json similarity index 100% rename from crates/fhir/tests/data/R4B/riskassessment-example-population.json rename to crates/fhir/tests/data/json/R4B/riskassessment-example-population.json diff --git a/crates/fhir/tests/data/R4B/riskassessment-example-prognosis.json b/crates/fhir/tests/data/json/R4B/riskassessment-example-prognosis.json similarity index 100% rename from crates/fhir/tests/data/R4B/riskassessment-example-prognosis.json rename to crates/fhir/tests/data/json/R4B/riskassessment-example-prognosis.json diff --git a/crates/fhir/tests/data/R4B/riskassessment-example.json b/crates/fhir/tests/data/json/R4B/riskassessment-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/riskassessment-example.json rename to crates/fhir/tests/data/json/R4B/riskassessment-example.json diff --git a/crates/fhir/tests/data/R4B/riskassessment-questionnaire.json b/crates/fhir/tests/data/json/R4B/riskassessment-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/riskassessment-questionnaire.json rename to crates/fhir/tests/data/json/R4B/riskassessment-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/riskassessment-riskexample.json b/crates/fhir/tests/data/json/R4B/riskassessment-riskexample.json similarity index 100% rename from crates/fhir/tests/data/R4B/riskassessment-riskexample.json rename to crates/fhir/tests/data/json/R4B/riskassessment-riskexample.json diff --git a/crates/fhir/tests/data/R4B/riskassessment.profile.json b/crates/fhir/tests/data/json/R4B/riskassessment.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/riskassessment.profile.json rename to crates/fhir/tests/data/json/R4B/riskassessment.profile.json diff --git a/crates/fhir/tests/data/R4B/sampleddata.profile.json b/crates/fhir/tests/data/json/R4B/sampleddata.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/sampleddata.profile.json rename to crates/fhir/tests/data/json/R4B/sampleddata.profile.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-account-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-account-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-account-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-account-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-allergyintolerance-clinical.json b/crates/fhir/tests/data/json/R4B/sc-valueset-allergyintolerance-clinical.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-allergyintolerance-clinical.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-allergyintolerance-clinical.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-allergyintolerance-verification.json b/crates/fhir/tests/data/json/R4B/sc-valueset-allergyintolerance-verification.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-allergyintolerance-verification.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-allergyintolerance-verification.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-appointmentstatus.json b/crates/fhir/tests/data/json/R4B/sc-valueset-appointmentstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-appointmentstatus.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-appointmentstatus.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-care-plan-activity-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-care-plan-activity-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-care-plan-activity-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-care-plan-activity-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-care-team-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-care-team-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-care-team-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-care-team-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-chargeitem-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-chargeitem-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-chargeitem-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-chargeitem-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-clinicalimpression-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-clinicalimpression-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-clinicalimpression-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-clinicalimpression-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-composition-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-composition-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-composition-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-composition-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-condition-ver-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-condition-ver-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-condition-ver-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-condition-ver-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-consent-state-codes.json b/crates/fhir/tests/data/json/R4B/sc-valueset-consent-state-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-consent-state-codes.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-consent-state-codes.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-contract-publicationstatus.json b/crates/fhir/tests/data/json/R4B/sc-valueset-contract-publicationstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-contract-publicationstatus.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-contract-publicationstatus.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-contract-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-contract-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-contract-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-contract-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-device-statement-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-device-statement-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-device-statement-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-device-statement-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-device-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-device-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-device-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-device-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-diagnostic-report-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-diagnostic-report-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-diagnostic-report-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-diagnostic-report-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-document-reference-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-document-reference-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-document-reference-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-document-reference-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-encounter-location-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-encounter-location-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-encounter-location-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-encounter-location-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-encounter-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-encounter-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-encounter-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-encounter-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-endpoint-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-endpoint-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-endpoint-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-endpoint-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-episode-of-care-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-episode-of-care-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-episode-of-care-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-episode-of-care-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-event-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-event-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-event-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-event-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-explanationofbenefit-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-explanationofbenefit-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-explanationofbenefit-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-explanationofbenefit-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-flag-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-flag-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-flag-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-flag-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-fm-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-fm-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-fm-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-fm-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-goal-achievement.json b/crates/fhir/tests/data/json/R4B/sc-valueset-goal-achievement.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-goal-achievement.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-goal-achievement.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-goal-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-goal-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-goal-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-goal-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-guidance-response-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-guidance-response-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-guidance-response-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-guidance-response-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-history-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-history-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-history-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-history-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-imagingstudy-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-imagingstudy-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-imagingstudy-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-imagingstudy-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-immunization-evaluation-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-immunization-evaluation-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-immunization-evaluation-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-immunization-evaluation-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-immunization-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-immunization-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-immunization-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-immunization-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-invoice-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-invoice-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-invoice-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-invoice-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-list-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-list-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-list-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-list-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-location-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-location-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-location-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-location-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-measure-report-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-measure-report-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-measure-report-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-measure-report-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-medication-admin-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-medication-admin-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-medication-admin-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-medication-admin-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-medication-statement-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-medication-statement-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-medication-statement-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-medication-statement-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-medication-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-medication-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-medication-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-medication-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-medicationdispense-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-medicationdispense-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-medicationdispense-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-medicationdispense-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-medicationknowledge-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-medicationknowledge-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-medicationknowledge-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-medicationknowledge-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-medicationrequest-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-medicationrequest-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-medicationrequest-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-medicationrequest-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-metric-operational-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-metric-operational-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-metric-operational-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-metric-operational-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-nutritionproduct-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-nutritionproduct-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-nutritionproduct-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-nutritionproduct-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-observation-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-observation-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-observation-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-observation-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-participationstatus.json b/crates/fhir/tests/data/json/R4B/sc-valueset-participationstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-participationstatus.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-participationstatus.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-product-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-product-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-product-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-product-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-publication-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-publication-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-publication-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-publication-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-questionnaire-answers-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-questionnaire-answers-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-questionnaire-answers-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-questionnaire-answers-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-report-status-codes.json b/crates/fhir/tests/data/json/R4B/sc-valueset-report-status-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-report-status-codes.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-report-status-codes.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-request-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-request-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-request-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-request-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-research-study-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-research-study-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-research-study-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-research-study-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-research-subject-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-research-subject-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-research-subject-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-research-subject-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-slotstatus.json b/crates/fhir/tests/data/json/R4B/sc-valueset-slotstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-slotstatus.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-slotstatus.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-specimen-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-specimen-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-specimen-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-specimen-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-subscription-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-subscription-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-subscription-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-subscription-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-substance-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-substance-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-substance-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-substance-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-supplydelivery-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-supplydelivery-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-supplydelivery-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-supplydelivery-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-supplyrequest-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-supplyrequest-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-supplyrequest-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-supplyrequest-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-task-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-task-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-task-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-task-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-verificationresult-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-verificationresult-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-verificationresult-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-verificationresult-status.json diff --git a/crates/fhir/tests/data/R4B/sc-valueset-verificationresult-validation-status.json b/crates/fhir/tests/data/json/R4B/sc-valueset-verificationresult-validation-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/sc-valueset-verificationresult-validation-status.json rename to crates/fhir/tests/data/json/R4B/sc-valueset-verificationresult-validation-status.json diff --git a/crates/fhir/tests/data/R4B/schedule-example.json b/crates/fhir/tests/data/json/R4B/schedule-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/schedule-example.json rename to crates/fhir/tests/data/json/R4B/schedule-example.json diff --git a/crates/fhir/tests/data/R4B/schedule-provider-location1-example.json b/crates/fhir/tests/data/json/R4B/schedule-provider-location1-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/schedule-provider-location1-example.json rename to crates/fhir/tests/data/json/R4B/schedule-provider-location1-example.json diff --git a/crates/fhir/tests/data/R4B/schedule-provider-location2-example.json b/crates/fhir/tests/data/json/R4B/schedule-provider-location2-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/schedule-provider-location2-example.json rename to crates/fhir/tests/data/json/R4B/schedule-provider-location2-example.json diff --git a/crates/fhir/tests/data/R4B/schedule-questionnaire.json b/crates/fhir/tests/data/json/R4B/schedule-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/schedule-questionnaire.json rename to crates/fhir/tests/data/json/R4B/schedule-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/schedule.profile.json b/crates/fhir/tests/data/json/R4B/schedule.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/schedule.profile.json rename to crates/fhir/tests/data/json/R4B/schedule.profile.json diff --git a/crates/fhir/tests/data/R4B/search-parameters.json b/crates/fhir/tests/data/json/R4B/search-parameters.json similarity index 100% rename from crates/fhir/tests/data/R4B/search-parameters.json rename to crates/fhir/tests/data/json/R4B/search-parameters.json diff --git a/crates/fhir/tests/data/R4B/searchparameter-example-extension.json b/crates/fhir/tests/data/json/R4B/searchparameter-example-extension.json similarity index 100% rename from crates/fhir/tests/data/R4B/searchparameter-example-extension.json rename to crates/fhir/tests/data/json/R4B/searchparameter-example-extension.json diff --git a/crates/fhir/tests/data/R4B/searchparameter-example-reference.json b/crates/fhir/tests/data/json/R4B/searchparameter-example-reference.json similarity index 100% rename from crates/fhir/tests/data/R4B/searchparameter-example-reference.json rename to crates/fhir/tests/data/json/R4B/searchparameter-example-reference.json diff --git a/crates/fhir/tests/data/R4B/searchparameter-example.json b/crates/fhir/tests/data/json/R4B/searchparameter-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/searchparameter-example.json rename to crates/fhir/tests/data/json/R4B/searchparameter-example.json diff --git a/crates/fhir/tests/data/R4B/searchparameter-filter.json b/crates/fhir/tests/data/json/R4B/searchparameter-filter.json similarity index 100% rename from crates/fhir/tests/data/R4B/searchparameter-filter.json rename to crates/fhir/tests/data/json/R4B/searchparameter-filter.json diff --git a/crates/fhir/tests/data/R4B/searchparameter-questionnaire.json b/crates/fhir/tests/data/json/R4B/searchparameter-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/searchparameter-questionnaire.json rename to crates/fhir/tests/data/json/R4B/searchparameter-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/searchparameter.profile.json b/crates/fhir/tests/data/json/R4B/searchparameter.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/searchparameter.profile.json rename to crates/fhir/tests/data/json/R4B/searchparameter.profile.json diff --git a/crates/fhir/tests/data/R4B/sequence-complex-variant.json b/crates/fhir/tests/data/json/R4B/sequence-complex-variant.json similarity index 100% rename from crates/fhir/tests/data/R4B/sequence-complex-variant.json rename to crates/fhir/tests/data/json/R4B/sequence-complex-variant.json diff --git a/crates/fhir/tests/data/R4B/sequence-example-TPMT-one.json b/crates/fhir/tests/data/json/R4B/sequence-example-TPMT-one.json similarity index 100% rename from crates/fhir/tests/data/R4B/sequence-example-TPMT-one.json rename to crates/fhir/tests/data/json/R4B/sequence-example-TPMT-one.json diff --git a/crates/fhir/tests/data/R4B/sequence-example-TPMT-two.json b/crates/fhir/tests/data/json/R4B/sequence-example-TPMT-two.json similarity index 100% rename from crates/fhir/tests/data/R4B/sequence-example-TPMT-two.json rename to crates/fhir/tests/data/json/R4B/sequence-example-TPMT-two.json diff --git a/crates/fhir/tests/data/R4B/sequence-example-fda-comparisons.json b/crates/fhir/tests/data/json/R4B/sequence-example-fda-comparisons.json similarity index 100% rename from crates/fhir/tests/data/R4B/sequence-example-fda-comparisons.json rename to crates/fhir/tests/data/json/R4B/sequence-example-fda-comparisons.json diff --git a/crates/fhir/tests/data/R4B/sequence-example-fda-vcfeval.json b/crates/fhir/tests/data/json/R4B/sequence-example-fda-vcfeval.json similarity index 100% rename from crates/fhir/tests/data/R4B/sequence-example-fda-vcfeval.json rename to crates/fhir/tests/data/json/R4B/sequence-example-fda-vcfeval.json diff --git a/crates/fhir/tests/data/R4B/sequence-example-fda.json b/crates/fhir/tests/data/json/R4B/sequence-example-fda.json similarity index 100% rename from crates/fhir/tests/data/R4B/sequence-example-fda.json rename to crates/fhir/tests/data/json/R4B/sequence-example-fda.json diff --git a/crates/fhir/tests/data/R4B/sequence-example-pgx-1.json b/crates/fhir/tests/data/json/R4B/sequence-example-pgx-1.json similarity index 100% rename from crates/fhir/tests/data/R4B/sequence-example-pgx-1.json rename to crates/fhir/tests/data/json/R4B/sequence-example-pgx-1.json diff --git a/crates/fhir/tests/data/R4B/sequence-example-pgx-2.json b/crates/fhir/tests/data/json/R4B/sequence-example-pgx-2.json similarity index 100% rename from crates/fhir/tests/data/R4B/sequence-example-pgx-2.json rename to crates/fhir/tests/data/json/R4B/sequence-example-pgx-2.json diff --git a/crates/fhir/tests/data/R4B/sequence-genetics-example-breastcancer.json b/crates/fhir/tests/data/json/R4B/sequence-genetics-example-breastcancer.json similarity index 100% rename from crates/fhir/tests/data/R4B/sequence-genetics-example-breastcancer.json rename to crates/fhir/tests/data/json/R4B/sequence-genetics-example-breastcancer.json diff --git a/crates/fhir/tests/data/R4B/sequence-graphic-example-1.json b/crates/fhir/tests/data/json/R4B/sequence-graphic-example-1.json similarity index 100% rename from crates/fhir/tests/data/R4B/sequence-graphic-example-1.json rename to crates/fhir/tests/data/json/R4B/sequence-graphic-example-1.json diff --git a/crates/fhir/tests/data/R4B/sequence-graphic-example-2.json b/crates/fhir/tests/data/json/R4B/sequence-graphic-example-2.json similarity index 100% rename from crates/fhir/tests/data/R4B/sequence-graphic-example-2.json rename to crates/fhir/tests/data/json/R4B/sequence-graphic-example-2.json diff --git a/crates/fhir/tests/data/R4B/sequence-graphic-example-3.json b/crates/fhir/tests/data/json/R4B/sequence-graphic-example-3.json similarity index 100% rename from crates/fhir/tests/data/R4B/sequence-graphic-example-3.json rename to crates/fhir/tests/data/json/R4B/sequence-graphic-example-3.json diff --git a/crates/fhir/tests/data/R4B/sequence-graphic-example-4.json b/crates/fhir/tests/data/json/R4B/sequence-graphic-example-4.json similarity index 100% rename from crates/fhir/tests/data/R4B/sequence-graphic-example-4.json rename to crates/fhir/tests/data/json/R4B/sequence-graphic-example-4.json diff --git a/crates/fhir/tests/data/R4B/sequence-graphic-example-5.json b/crates/fhir/tests/data/json/R4B/sequence-graphic-example-5.json similarity index 100% rename from crates/fhir/tests/data/R4B/sequence-graphic-example-5.json rename to crates/fhir/tests/data/json/R4B/sequence-graphic-example-5.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-example-ambulation.json b/crates/fhir/tests/data/json/R4B/servicerequest-example-ambulation.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-example-ambulation.json rename to crates/fhir/tests/data/json/R4B/servicerequest-example-ambulation.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-example-appendectomy.json b/crates/fhir/tests/data/json/R4B/servicerequest-example-appendectomy.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-example-appendectomy.json rename to crates/fhir/tests/data/json/R4B/servicerequest-example-appendectomy.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-example-colonoscopy-bx.json b/crates/fhir/tests/data/json/R4B/servicerequest-example-colonoscopy-bx.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-example-colonoscopy-bx.json rename to crates/fhir/tests/data/json/R4B/servicerequest-example-colonoscopy-bx.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-example-colonoscopy.json b/crates/fhir/tests/data/json/R4B/servicerequest-example-colonoscopy.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-example-colonoscopy.json rename to crates/fhir/tests/data/json/R4B/servicerequest-example-colonoscopy.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-example-di.json b/crates/fhir/tests/data/json/R4B/servicerequest-example-di.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-example-di.json rename to crates/fhir/tests/data/json/R4B/servicerequest-example-di.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-example-edu.json b/crates/fhir/tests/data/json/R4B/servicerequest-example-edu.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-example-edu.json rename to crates/fhir/tests/data/json/R4B/servicerequest-example-edu.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-example-ft4.json b/crates/fhir/tests/data/json/R4B/servicerequest-example-ft4.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-example-ft4.json rename to crates/fhir/tests/data/json/R4B/servicerequest-example-ft4.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-example-implant.json b/crates/fhir/tests/data/json/R4B/servicerequest-example-implant.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-example-implant.json rename to crates/fhir/tests/data/json/R4B/servicerequest-example-implant.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-example-lipid.json b/crates/fhir/tests/data/json/R4B/servicerequest-example-lipid.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-example-lipid.json rename to crates/fhir/tests/data/json/R4B/servicerequest-example-lipid.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-example-myringotomy.json b/crates/fhir/tests/data/json/R4B/servicerequest-example-myringotomy.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-example-myringotomy.json rename to crates/fhir/tests/data/json/R4B/servicerequest-example-myringotomy.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-example-ob.json b/crates/fhir/tests/data/json/R4B/servicerequest-example-ob.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-example-ob.json rename to crates/fhir/tests/data/json/R4B/servicerequest-example-ob.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-example-pgx.json b/crates/fhir/tests/data/json/R4B/servicerequest-example-pgx.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-example-pgx.json rename to crates/fhir/tests/data/json/R4B/servicerequest-example-pgx.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-example-pt.json b/crates/fhir/tests/data/json/R4B/servicerequest-example-pt.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-example-pt.json rename to crates/fhir/tests/data/json/R4B/servicerequest-example-pt.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-example-subrequest.json b/crates/fhir/tests/data/json/R4B/servicerequest-example-subrequest.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-example-subrequest.json rename to crates/fhir/tests/data/json/R4B/servicerequest-example-subrequest.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-example-ventilation.json b/crates/fhir/tests/data/json/R4B/servicerequest-example-ventilation.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-example-ventilation.json rename to crates/fhir/tests/data/json/R4B/servicerequest-example-ventilation.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-example.json b/crates/fhir/tests/data/json/R4B/servicerequest-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-example.json rename to crates/fhir/tests/data/json/R4B/servicerequest-example.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-example2.json b/crates/fhir/tests/data/json/R4B/servicerequest-example2.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-example2.json rename to crates/fhir/tests/data/json/R4B/servicerequest-example2.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-example3.json b/crates/fhir/tests/data/json/R4B/servicerequest-example3.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-example3.json rename to crates/fhir/tests/data/json/R4B/servicerequest-example3.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-example4.json b/crates/fhir/tests/data/json/R4B/servicerequest-example4.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-example4.json rename to crates/fhir/tests/data/json/R4B/servicerequest-example4.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-genetics-example-1.json b/crates/fhir/tests/data/json/R4B/servicerequest-genetics-example-1.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-genetics-example-1.json rename to crates/fhir/tests/data/json/R4B/servicerequest-genetics-example-1.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-genetics-questionnaire.json b/crates/fhir/tests/data/json/R4B/servicerequest-genetics-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-genetics-questionnaire.json rename to crates/fhir/tests/data/json/R4B/servicerequest-genetics-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-genetics.profile.json b/crates/fhir/tests/data/json/R4B/servicerequest-genetics.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-genetics.profile.json rename to crates/fhir/tests/data/json/R4B/servicerequest-genetics.profile.json diff --git a/crates/fhir/tests/data/R4B/servicerequest-questionnaire.json b/crates/fhir/tests/data/json/R4B/servicerequest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest-questionnaire.json rename to crates/fhir/tests/data/json/R4B/servicerequest-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/servicerequest.profile.json b/crates/fhir/tests/data/json/R4B/servicerequest.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/servicerequest.profile.json rename to crates/fhir/tests/data/json/R4B/servicerequest.profile.json diff --git a/crates/fhir/tests/data/R4B/shareableactivitydefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/shareableactivitydefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/shareableactivitydefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/shareableactivitydefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/shareableactivitydefinition.profile.json b/crates/fhir/tests/data/json/R4B/shareableactivitydefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/shareableactivitydefinition.profile.json rename to crates/fhir/tests/data/json/R4B/shareableactivitydefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/shareablecodesystem-questionnaire.json b/crates/fhir/tests/data/json/R4B/shareablecodesystem-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/shareablecodesystem-questionnaire.json rename to crates/fhir/tests/data/json/R4B/shareablecodesystem-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/shareablecodesystem.profile.json b/crates/fhir/tests/data/json/R4B/shareablecodesystem.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/shareablecodesystem.profile.json rename to crates/fhir/tests/data/json/R4B/shareablecodesystem.profile.json diff --git a/crates/fhir/tests/data/R4B/shareablelibrary-questionnaire.json b/crates/fhir/tests/data/json/R4B/shareablelibrary-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/shareablelibrary-questionnaire.json rename to crates/fhir/tests/data/json/R4B/shareablelibrary-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/shareablelibrary.profile.json b/crates/fhir/tests/data/json/R4B/shareablelibrary.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/shareablelibrary.profile.json rename to crates/fhir/tests/data/json/R4B/shareablelibrary.profile.json diff --git a/crates/fhir/tests/data/R4B/shareablemeasure-questionnaire.json b/crates/fhir/tests/data/json/R4B/shareablemeasure-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/shareablemeasure-questionnaire.json rename to crates/fhir/tests/data/json/R4B/shareablemeasure-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/shareablemeasure.profile.json b/crates/fhir/tests/data/json/R4B/shareablemeasure.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/shareablemeasure.profile.json rename to crates/fhir/tests/data/json/R4B/shareablemeasure.profile.json diff --git a/crates/fhir/tests/data/R4B/shareablevalueset-questionnaire.json b/crates/fhir/tests/data/json/R4B/shareablevalueset-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/shareablevalueset-questionnaire.json rename to crates/fhir/tests/data/json/R4B/shareablevalueset-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/shareablevalueset.profile.json b/crates/fhir/tests/data/json/R4B/shareablevalueset.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/shareablevalueset.profile.json rename to crates/fhir/tests/data/json/R4B/shareablevalueset.profile.json diff --git a/crates/fhir/tests/data/R4B/signature.profile.json b/crates/fhir/tests/data/json/R4B/signature.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/signature.profile.json rename to crates/fhir/tests/data/json/R4B/signature.profile.json diff --git a/crates/fhir/tests/data/R4B/simplequantity.profile.json b/crates/fhir/tests/data/json/R4B/simplequantity.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/simplequantity.profile.json rename to crates/fhir/tests/data/json/R4B/simplequantity.profile.json diff --git a/crates/fhir/tests/data/R4B/slot-example-busy.json b/crates/fhir/tests/data/json/R4B/slot-example-busy.json similarity index 100% rename from crates/fhir/tests/data/R4B/slot-example-busy.json rename to crates/fhir/tests/data/json/R4B/slot-example-busy.json diff --git a/crates/fhir/tests/data/R4B/slot-example-tentative.json b/crates/fhir/tests/data/json/R4B/slot-example-tentative.json similarity index 100% rename from crates/fhir/tests/data/R4B/slot-example-tentative.json rename to crates/fhir/tests/data/json/R4B/slot-example-tentative.json diff --git a/crates/fhir/tests/data/R4B/slot-example-unavailable.json b/crates/fhir/tests/data/json/R4B/slot-example-unavailable.json similarity index 100% rename from crates/fhir/tests/data/R4B/slot-example-unavailable.json rename to crates/fhir/tests/data/json/R4B/slot-example-unavailable.json diff --git a/crates/fhir/tests/data/R4B/slot-example.json b/crates/fhir/tests/data/json/R4B/slot-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/slot-example.json rename to crates/fhir/tests/data/json/R4B/slot-example.json diff --git a/crates/fhir/tests/data/R4B/slot-questionnaire.json b/crates/fhir/tests/data/json/R4B/slot-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/slot-questionnaire.json rename to crates/fhir/tests/data/json/R4B/slot-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/slot.profile.json b/crates/fhir/tests/data/json/R4B/slot.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/slot.profile.json rename to crates/fhir/tests/data/json/R4B/slot.profile.json diff --git a/crates/fhir/tests/data/R4B/specimen-example-isolate.json b/crates/fhir/tests/data/json/R4B/specimen-example-isolate.json similarity index 100% rename from crates/fhir/tests/data/R4B/specimen-example-isolate.json rename to crates/fhir/tests/data/json/R4B/specimen-example-isolate.json diff --git a/crates/fhir/tests/data/R4B/specimen-example-pooled-serum.json b/crates/fhir/tests/data/json/R4B/specimen-example-pooled-serum.json similarity index 100% rename from crates/fhir/tests/data/R4B/specimen-example-pooled-serum.json rename to crates/fhir/tests/data/json/R4B/specimen-example-pooled-serum.json diff --git a/crates/fhir/tests/data/R4B/specimen-example-serum.json b/crates/fhir/tests/data/json/R4B/specimen-example-serum.json similarity index 100% rename from crates/fhir/tests/data/R4B/specimen-example-serum.json rename to crates/fhir/tests/data/json/R4B/specimen-example-serum.json diff --git a/crates/fhir/tests/data/R4B/specimen-example-urine.json b/crates/fhir/tests/data/json/R4B/specimen-example-urine.json similarity index 100% rename from crates/fhir/tests/data/R4B/specimen-example-urine.json rename to crates/fhir/tests/data/json/R4B/specimen-example-urine.json diff --git a/crates/fhir/tests/data/R4B/specimen-example.json b/crates/fhir/tests/data/json/R4B/specimen-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/specimen-example.json rename to crates/fhir/tests/data/json/R4B/specimen-example.json diff --git a/crates/fhir/tests/data/R4B/specimen-questionnaire.json b/crates/fhir/tests/data/json/R4B/specimen-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/specimen-questionnaire.json rename to crates/fhir/tests/data/json/R4B/specimen-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/specimen.profile.json b/crates/fhir/tests/data/json/R4B/specimen.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/specimen.profile.json rename to crates/fhir/tests/data/json/R4B/specimen.profile.json diff --git a/crates/fhir/tests/data/R4B/specimendefinition-example-serum-plasma.json b/crates/fhir/tests/data/json/R4B/specimendefinition-example-serum-plasma.json similarity index 100% rename from crates/fhir/tests/data/R4B/specimendefinition-example-serum-plasma.json rename to crates/fhir/tests/data/json/R4B/specimendefinition-example-serum-plasma.json diff --git a/crates/fhir/tests/data/R4B/specimendefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/specimendefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/specimendefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/specimendefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/specimendefinition.profile.json b/crates/fhir/tests/data/json/R4B/specimendefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/specimendefinition.profile.json rename to crates/fhir/tests/data/json/R4B/specimendefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/string.profile.json b/crates/fhir/tests/data/json/R4B/string.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/string.profile.json rename to crates/fhir/tests/data/json/R4B/string.profile.json diff --git a/crates/fhir/tests/data/R4B/structuredefinition-example-composition.json b/crates/fhir/tests/data/json/R4B/structuredefinition-example-composition.json similarity index 100% rename from crates/fhir/tests/data/R4B/structuredefinition-example-composition.json rename to crates/fhir/tests/data/json/R4B/structuredefinition-example-composition.json diff --git a/crates/fhir/tests/data/R4B/structuredefinition-example-section-library.json b/crates/fhir/tests/data/json/R4B/structuredefinition-example-section-library.json similarity index 100% rename from crates/fhir/tests/data/R4B/structuredefinition-example-section-library.json rename to crates/fhir/tests/data/json/R4B/structuredefinition-example-section-library.json diff --git a/crates/fhir/tests/data/R4B/structuredefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/structuredefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/structuredefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/structuredefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/structuredefinition.profile.json b/crates/fhir/tests/data/json/R4B/structuredefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/structuredefinition.profile.json rename to crates/fhir/tests/data/json/R4B/structuredefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/structuremap-example.json b/crates/fhir/tests/data/json/R4B/structuremap-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/structuremap-example.json rename to crates/fhir/tests/data/json/R4B/structuremap-example.json diff --git a/crates/fhir/tests/data/R4B/structuremap-questionnaire.json b/crates/fhir/tests/data/json/R4B/structuremap-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/structuremap-questionnaire.json rename to crates/fhir/tests/data/json/R4B/structuremap-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/structuremap-supplyrequest-transform.json b/crates/fhir/tests/data/json/R4B/structuremap-supplyrequest-transform.json similarity index 100% rename from crates/fhir/tests/data/R4B/structuremap-supplyrequest-transform.json rename to crates/fhir/tests/data/json/R4B/structuremap-supplyrequest-transform.json diff --git a/crates/fhir/tests/data/R4B/structuremap.profile.json b/crates/fhir/tests/data/json/R4B/structuremap.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/structuremap.profile.json rename to crates/fhir/tests/data/json/R4B/structuremap.profile.json diff --git a/crates/fhir/tests/data/R4B/subscription-example-error.json b/crates/fhir/tests/data/json/R4B/subscription-example-error.json similarity index 100% rename from crates/fhir/tests/data/R4B/subscription-example-error.json rename to crates/fhir/tests/data/json/R4B/subscription-example-error.json diff --git a/crates/fhir/tests/data/R4B/subscription-example.json b/crates/fhir/tests/data/json/R4B/subscription-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/subscription-example.json rename to crates/fhir/tests/data/json/R4B/subscription-example.json diff --git a/crates/fhir/tests/data/R4B/subscription-questionnaire.json b/crates/fhir/tests/data/json/R4B/subscription-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/subscription-questionnaire.json rename to crates/fhir/tests/data/json/R4B/subscription-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/subscription.profile.json b/crates/fhir/tests/data/json/R4B/subscription.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/subscription.profile.json rename to crates/fhir/tests/data/json/R4B/subscription.profile.json diff --git a/crates/fhir/tests/data/R4B/subscriptionstatus-example.json b/crates/fhir/tests/data/json/R4B/subscriptionstatus-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/subscriptionstatus-example.json rename to crates/fhir/tests/data/json/R4B/subscriptionstatus-example.json diff --git a/crates/fhir/tests/data/R4B/subscriptionstatus-questionnaire.json b/crates/fhir/tests/data/json/R4B/subscriptionstatus-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/subscriptionstatus-questionnaire.json rename to crates/fhir/tests/data/json/R4B/subscriptionstatus-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/subscriptionstatus.profile.json b/crates/fhir/tests/data/json/R4B/subscriptionstatus.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/subscriptionstatus.profile.json rename to crates/fhir/tests/data/json/R4B/subscriptionstatus.profile.json diff --git a/crates/fhir/tests/data/R4B/subscriptiontopic-example-admission.json b/crates/fhir/tests/data/json/R4B/subscriptiontopic-example-admission.json similarity index 100% rename from crates/fhir/tests/data/R4B/subscriptiontopic-example-admission.json rename to crates/fhir/tests/data/json/R4B/subscriptiontopic-example-admission.json diff --git a/crates/fhir/tests/data/R4B/subscriptiontopic-questionnaire.json b/crates/fhir/tests/data/json/R4B/subscriptiontopic-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/subscriptiontopic-questionnaire.json rename to crates/fhir/tests/data/json/R4B/subscriptiontopic-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/subscriptiontopic.profile.json b/crates/fhir/tests/data/json/R4B/subscriptiontopic.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/subscriptiontopic.profile.json rename to crates/fhir/tests/data/json/R4B/subscriptiontopic.profile.json diff --git a/crates/fhir/tests/data/R4B/substance-example-amoxicillin-clavulanate.json b/crates/fhir/tests/data/json/R4B/substance-example-amoxicillin-clavulanate.json similarity index 100% rename from crates/fhir/tests/data/R4B/substance-example-amoxicillin-clavulanate.json rename to crates/fhir/tests/data/json/R4B/substance-example-amoxicillin-clavulanate.json diff --git a/crates/fhir/tests/data/R4B/substance-example-f201-dust.json b/crates/fhir/tests/data/json/R4B/substance-example-f201-dust.json similarity index 100% rename from crates/fhir/tests/data/R4B/substance-example-f201-dust.json rename to crates/fhir/tests/data/json/R4B/substance-example-f201-dust.json diff --git a/crates/fhir/tests/data/R4B/substance-example-f202-staphylococcus.json b/crates/fhir/tests/data/json/R4B/substance-example-f202-staphylococcus.json similarity index 100% rename from crates/fhir/tests/data/R4B/substance-example-f202-staphylococcus.json rename to crates/fhir/tests/data/json/R4B/substance-example-f202-staphylococcus.json diff --git a/crates/fhir/tests/data/R4B/substance-example-f203-potassium.json b/crates/fhir/tests/data/json/R4B/substance-example-f203-potassium.json similarity index 100% rename from crates/fhir/tests/data/R4B/substance-example-f203-potassium.json rename to crates/fhir/tests/data/json/R4B/substance-example-f203-potassium.json diff --git a/crates/fhir/tests/data/R4B/substance-example-silver-nitrate-product.json b/crates/fhir/tests/data/json/R4B/substance-example-silver-nitrate-product.json similarity index 100% rename from crates/fhir/tests/data/R4B/substance-example-silver-nitrate-product.json rename to crates/fhir/tests/data/json/R4B/substance-example-silver-nitrate-product.json diff --git a/crates/fhir/tests/data/R4B/substance-example.json b/crates/fhir/tests/data/json/R4B/substance-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/substance-example.json rename to crates/fhir/tests/data/json/R4B/substance-example.json diff --git a/crates/fhir/tests/data/R4B/substance-questionnaire.json b/crates/fhir/tests/data/json/R4B/substance-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/substance-questionnaire.json rename to crates/fhir/tests/data/json/R4B/substance-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/substance.profile.json b/crates/fhir/tests/data/json/R4B/substance.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/substance.profile.json rename to crates/fhir/tests/data/json/R4B/substance.profile.json diff --git a/crates/fhir/tests/data/R4B/substancedefinition-example.json b/crates/fhir/tests/data/json/R4B/substancedefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/substancedefinition-example.json rename to crates/fhir/tests/data/json/R4B/substancedefinition-example.json diff --git a/crates/fhir/tests/data/R4B/substancedefinition-questionnaire.json b/crates/fhir/tests/data/json/R4B/substancedefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/substancedefinition-questionnaire.json rename to crates/fhir/tests/data/json/R4B/substancedefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/substancedefinition.profile.json b/crates/fhir/tests/data/json/R4B/substancedefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/substancedefinition.profile.json rename to crates/fhir/tests/data/json/R4B/substancedefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/supplydelivery-example-pumpdelivery.json b/crates/fhir/tests/data/json/R4B/supplydelivery-example-pumpdelivery.json similarity index 100% rename from crates/fhir/tests/data/R4B/supplydelivery-example-pumpdelivery.json rename to crates/fhir/tests/data/json/R4B/supplydelivery-example-pumpdelivery.json diff --git a/crates/fhir/tests/data/R4B/supplydelivery-example.json b/crates/fhir/tests/data/json/R4B/supplydelivery-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/supplydelivery-example.json rename to crates/fhir/tests/data/json/R4B/supplydelivery-example.json diff --git a/crates/fhir/tests/data/R4B/supplydelivery-questionnaire.json b/crates/fhir/tests/data/json/R4B/supplydelivery-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/supplydelivery-questionnaire.json rename to crates/fhir/tests/data/json/R4B/supplydelivery-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/supplydelivery.profile.json b/crates/fhir/tests/data/json/R4B/supplydelivery.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/supplydelivery.profile.json rename to crates/fhir/tests/data/json/R4B/supplydelivery.profile.json diff --git a/crates/fhir/tests/data/R4B/supplyrequest-example-simpleorder.json b/crates/fhir/tests/data/json/R4B/supplyrequest-example-simpleorder.json similarity index 100% rename from crates/fhir/tests/data/R4B/supplyrequest-example-simpleorder.json rename to crates/fhir/tests/data/json/R4B/supplyrequest-example-simpleorder.json diff --git a/crates/fhir/tests/data/R4B/supplyrequest-questionnaire.json b/crates/fhir/tests/data/json/R4B/supplyrequest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/supplyrequest-questionnaire.json rename to crates/fhir/tests/data/json/R4B/supplyrequest-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/supplyrequest.profile.json b/crates/fhir/tests/data/json/R4B/supplyrequest.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/supplyrequest.profile.json rename to crates/fhir/tests/data/json/R4B/supplyrequest.profile.json diff --git a/crates/fhir/tests/data/R4B/task-example-fm-cancel.json b/crates/fhir/tests/data/json/R4B/task-example-fm-cancel.json similarity index 100% rename from crates/fhir/tests/data/R4B/task-example-fm-cancel.json rename to crates/fhir/tests/data/json/R4B/task-example-fm-cancel.json diff --git a/crates/fhir/tests/data/R4B/task-example-fm-poll.json b/crates/fhir/tests/data/json/R4B/task-example-fm-poll.json similarity index 100% rename from crates/fhir/tests/data/R4B/task-example-fm-poll.json rename to crates/fhir/tests/data/json/R4B/task-example-fm-poll.json diff --git a/crates/fhir/tests/data/R4B/task-example-fm-release.json b/crates/fhir/tests/data/json/R4B/task-example-fm-release.json similarity index 100% rename from crates/fhir/tests/data/R4B/task-example-fm-release.json rename to crates/fhir/tests/data/json/R4B/task-example-fm-release.json diff --git a/crates/fhir/tests/data/R4B/task-example-fm-reprocess.json b/crates/fhir/tests/data/json/R4B/task-example-fm-reprocess.json similarity index 100% rename from crates/fhir/tests/data/R4B/task-example-fm-reprocess.json rename to crates/fhir/tests/data/json/R4B/task-example-fm-reprocess.json diff --git a/crates/fhir/tests/data/R4B/task-example-fm-status-resp.json b/crates/fhir/tests/data/json/R4B/task-example-fm-status-resp.json similarity index 100% rename from crates/fhir/tests/data/R4B/task-example-fm-status-resp.json rename to crates/fhir/tests/data/json/R4B/task-example-fm-status-resp.json diff --git a/crates/fhir/tests/data/R4B/task-example-fm-status.json b/crates/fhir/tests/data/json/R4B/task-example-fm-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/task-example-fm-status.json rename to crates/fhir/tests/data/json/R4B/task-example-fm-status.json diff --git a/crates/fhir/tests/data/R4B/task-example1.json b/crates/fhir/tests/data/json/R4B/task-example1.json similarity index 100% rename from crates/fhir/tests/data/R4B/task-example1.json rename to crates/fhir/tests/data/json/R4B/task-example1.json diff --git a/crates/fhir/tests/data/R4B/task-example2.json b/crates/fhir/tests/data/json/R4B/task-example2.json similarity index 100% rename from crates/fhir/tests/data/R4B/task-example2.json rename to crates/fhir/tests/data/json/R4B/task-example2.json diff --git a/crates/fhir/tests/data/R4B/task-example3.json b/crates/fhir/tests/data/json/R4B/task-example3.json similarity index 100% rename from crates/fhir/tests/data/R4B/task-example3.json rename to crates/fhir/tests/data/json/R4B/task-example3.json diff --git a/crates/fhir/tests/data/R4B/task-example4.json b/crates/fhir/tests/data/json/R4B/task-example4.json similarity index 100% rename from crates/fhir/tests/data/R4B/task-example4.json rename to crates/fhir/tests/data/json/R4B/task-example4.json diff --git a/crates/fhir/tests/data/R4B/task-example5.json b/crates/fhir/tests/data/json/R4B/task-example5.json similarity index 100% rename from crates/fhir/tests/data/R4B/task-example5.json rename to crates/fhir/tests/data/json/R4B/task-example5.json diff --git a/crates/fhir/tests/data/R4B/task-example6.json b/crates/fhir/tests/data/json/R4B/task-example6.json similarity index 100% rename from crates/fhir/tests/data/R4B/task-example6.json rename to crates/fhir/tests/data/json/R4B/task-example6.json diff --git a/crates/fhir/tests/data/R4B/task-questionnaire.json b/crates/fhir/tests/data/json/R4B/task-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/task-questionnaire.json rename to crates/fhir/tests/data/json/R4B/task-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/task.profile.json b/crates/fhir/tests/data/json/R4B/task.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/task.profile.json rename to crates/fhir/tests/data/json/R4B/task.profile.json diff --git a/crates/fhir/tests/data/R4B/terminologycapabilities-example.json b/crates/fhir/tests/data/json/R4B/terminologycapabilities-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/terminologycapabilities-example.json rename to crates/fhir/tests/data/json/R4B/terminologycapabilities-example.json diff --git a/crates/fhir/tests/data/R4B/terminologycapabilities-questionnaire.json b/crates/fhir/tests/data/json/R4B/terminologycapabilities-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/terminologycapabilities-questionnaire.json rename to crates/fhir/tests/data/json/R4B/terminologycapabilities-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/terminologycapabilities.profile.json b/crates/fhir/tests/data/json/R4B/terminologycapabilities.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/terminologycapabilities.profile.json rename to crates/fhir/tests/data/json/R4B/terminologycapabilities.profile.json diff --git a/crates/fhir/tests/data/R4B/testreport-example.json b/crates/fhir/tests/data/json/R4B/testreport-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/testreport-example.json rename to crates/fhir/tests/data/json/R4B/testreport-example.json diff --git a/crates/fhir/tests/data/R4B/testreport-questionnaire.json b/crates/fhir/tests/data/json/R4B/testreport-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/testreport-questionnaire.json rename to crates/fhir/tests/data/json/R4B/testreport-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/testreport.profile.json b/crates/fhir/tests/data/json/R4B/testreport.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/testreport.profile.json rename to crates/fhir/tests/data/json/R4B/testreport.profile.json diff --git a/crates/fhir/tests/data/R4B/testscript-example-history.json b/crates/fhir/tests/data/json/R4B/testscript-example-history.json similarity index 100% rename from crates/fhir/tests/data/R4B/testscript-example-history.json rename to crates/fhir/tests/data/json/R4B/testscript-example-history.json diff --git a/crates/fhir/tests/data/R4B/testscript-example-multisystem.json b/crates/fhir/tests/data/json/R4B/testscript-example-multisystem.json similarity index 100% rename from crates/fhir/tests/data/R4B/testscript-example-multisystem.json rename to crates/fhir/tests/data/json/R4B/testscript-example-multisystem.json diff --git a/crates/fhir/tests/data/R4B/testscript-example-readtest.json b/crates/fhir/tests/data/json/R4B/testscript-example-readtest.json similarity index 100% rename from crates/fhir/tests/data/R4B/testscript-example-readtest.json rename to crates/fhir/tests/data/json/R4B/testscript-example-readtest.json diff --git a/crates/fhir/tests/data/R4B/testscript-example-search.json b/crates/fhir/tests/data/json/R4B/testscript-example-search.json similarity index 100% rename from crates/fhir/tests/data/R4B/testscript-example-search.json rename to crates/fhir/tests/data/json/R4B/testscript-example-search.json diff --git a/crates/fhir/tests/data/R4B/testscript-example-update.json b/crates/fhir/tests/data/json/R4B/testscript-example-update.json similarity index 100% rename from crates/fhir/tests/data/R4B/testscript-example-update.json rename to crates/fhir/tests/data/json/R4B/testscript-example-update.json diff --git a/crates/fhir/tests/data/R4B/testscript-example.json b/crates/fhir/tests/data/json/R4B/testscript-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/testscript-example.json rename to crates/fhir/tests/data/json/R4B/testscript-example.json diff --git a/crates/fhir/tests/data/R4B/testscript-questionnaire.json b/crates/fhir/tests/data/json/R4B/testscript-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/testscript-questionnaire.json rename to crates/fhir/tests/data/json/R4B/testscript-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/testscript.profile.json b/crates/fhir/tests/data/json/R4B/testscript.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/testscript.profile.json rename to crates/fhir/tests/data/json/R4B/testscript.profile.json diff --git a/crates/fhir/tests/data/R4B/time.profile.json b/crates/fhir/tests/data/json/R4B/time.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/time.profile.json rename to crates/fhir/tests/data/json/R4B/time.profile.json diff --git a/crates/fhir/tests/data/R4B/timing.profile.json b/crates/fhir/tests/data/json/R4B/timing.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/timing.profile.json rename to crates/fhir/tests/data/json/R4B/timing.profile.json diff --git a/crates/fhir/tests/data/R4B/triggerdefinition.profile.json b/crates/fhir/tests/data/json/R4B/triggerdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/triggerdefinition.profile.json rename to crates/fhir/tests/data/json/R4B/triggerdefinition.profile.json diff --git a/crates/fhir/tests/data/R4B/triglyceride-questionnaire.json b/crates/fhir/tests/data/json/R4B/triglyceride-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/triglyceride-questionnaire.json rename to crates/fhir/tests/data/json/R4B/triglyceride-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/triglyceride.profile.json b/crates/fhir/tests/data/json/R4B/triglyceride.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/triglyceride.profile.json rename to crates/fhir/tests/data/json/R4B/triglyceride.profile.json diff --git a/crates/fhir/tests/data/R4B/unsignedint.profile.json b/crates/fhir/tests/data/json/R4B/unsignedint.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/unsignedint.profile.json rename to crates/fhir/tests/data/json/R4B/unsignedint.profile.json diff --git a/crates/fhir/tests/data/R4B/uri.profile.json b/crates/fhir/tests/data/json/R4B/uri.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/uri.profile.json rename to crates/fhir/tests/data/json/R4B/uri.profile.json diff --git a/crates/fhir/tests/data/R4B/url.profile.json b/crates/fhir/tests/data/json/R4B/url.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/url.profile.json rename to crates/fhir/tests/data/json/R4B/url.profile.json diff --git a/crates/fhir/tests/data/R4B/usagecontext.profile.json b/crates/fhir/tests/data/json/R4B/usagecontext.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/usagecontext.profile.json rename to crates/fhir/tests/data/json/R4B/usagecontext.profile.json diff --git a/crates/fhir/tests/data/R4B/uuid.profile.json b/crates/fhir/tests/data/json/R4B/uuid.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/uuid.profile.json rename to crates/fhir/tests/data/json/R4B/uuid.profile.json diff --git a/crates/fhir/tests/data/R4B/valueset-FHIR-version.json b/crates/fhir/tests/data/json/R4B/valueset-FHIR-version.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-FHIR-version.json rename to crates/fhir/tests/data/json/R4B/valueset-FHIR-version.json diff --git a/crates/fhir/tests/data/R4B/valueset-abstract-types.json b/crates/fhir/tests/data/json/R4B/valueset-abstract-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-abstract-types.json rename to crates/fhir/tests/data/json/R4B/valueset-abstract-types.json diff --git a/crates/fhir/tests/data/R4B/valueset-account-status.json b/crates/fhir/tests/data/json/R4B/valueset-account-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-account-status.json rename to crates/fhir/tests/data/json/R4B/valueset-account-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-account-type.json b/crates/fhir/tests/data/json/R4B/valueset-account-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-account-type.json rename to crates/fhir/tests/data/json/R4B/valueset-account-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-action-cardinality-behavior.json b/crates/fhir/tests/data/json/R4B/valueset-action-cardinality-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-action-cardinality-behavior.json rename to crates/fhir/tests/data/json/R4B/valueset-action-cardinality-behavior.json diff --git a/crates/fhir/tests/data/R4B/valueset-action-code.json b/crates/fhir/tests/data/json/R4B/valueset-action-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-action-code.json rename to crates/fhir/tests/data/json/R4B/valueset-action-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-action-condition-kind.json b/crates/fhir/tests/data/json/R4B/valueset-action-condition-kind.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-action-condition-kind.json rename to crates/fhir/tests/data/json/R4B/valueset-action-condition-kind.json diff --git a/crates/fhir/tests/data/R4B/valueset-action-grouping-behavior.json b/crates/fhir/tests/data/json/R4B/valueset-action-grouping-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-action-grouping-behavior.json rename to crates/fhir/tests/data/json/R4B/valueset-action-grouping-behavior.json diff --git a/crates/fhir/tests/data/R4B/valueset-action-participant-type.json b/crates/fhir/tests/data/json/R4B/valueset-action-participant-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-action-participant-type.json rename to crates/fhir/tests/data/json/R4B/valueset-action-participant-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-action-precheck-behavior.json b/crates/fhir/tests/data/json/R4B/valueset-action-precheck-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-action-precheck-behavior.json rename to crates/fhir/tests/data/json/R4B/valueset-action-precheck-behavior.json diff --git a/crates/fhir/tests/data/R4B/valueset-action-reason-code.json b/crates/fhir/tests/data/json/R4B/valueset-action-reason-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-action-reason-code.json rename to crates/fhir/tests/data/json/R4B/valueset-action-reason-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-action-relationship-type.json b/crates/fhir/tests/data/json/R4B/valueset-action-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-action-relationship-type.json rename to crates/fhir/tests/data/json/R4B/valueset-action-relationship-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-action-required-behavior.json b/crates/fhir/tests/data/json/R4B/valueset-action-required-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-action-required-behavior.json rename to crates/fhir/tests/data/json/R4B/valueset-action-required-behavior.json diff --git a/crates/fhir/tests/data/R4B/valueset-action-selection-behavior.json b/crates/fhir/tests/data/json/R4B/valueset-action-selection-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-action-selection-behavior.json rename to crates/fhir/tests/data/json/R4B/valueset-action-selection-behavior.json diff --git a/crates/fhir/tests/data/R4B/valueset-action-type.json b/crates/fhir/tests/data/json/R4B/valueset-action-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-action-type.json rename to crates/fhir/tests/data/json/R4B/valueset-action-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-additional-instruction-codes.json b/crates/fhir/tests/data/json/R4B/valueset-additional-instruction-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-additional-instruction-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-additional-instruction-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-address-type.json b/crates/fhir/tests/data/json/R4B/valueset-address-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-address-type.json rename to crates/fhir/tests/data/json/R4B/valueset-address-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-address-use.json b/crates/fhir/tests/data/json/R4B/valueset-address-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-address-use.json rename to crates/fhir/tests/data/json/R4B/valueset-address-use.json diff --git a/crates/fhir/tests/data/R4B/valueset-adjudication-error.json b/crates/fhir/tests/data/json/R4B/valueset-adjudication-error.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-adjudication-error.json rename to crates/fhir/tests/data/json/R4B/valueset-adjudication-error.json diff --git a/crates/fhir/tests/data/R4B/valueset-adjudication-reason.json b/crates/fhir/tests/data/json/R4B/valueset-adjudication-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-adjudication-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-adjudication-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-adjudication.json b/crates/fhir/tests/data/json/R4B/valueset-adjudication.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-adjudication.json rename to crates/fhir/tests/data/json/R4B/valueset-adjudication.json diff --git a/crates/fhir/tests/data/R4B/valueset-administrable-dose-form.json b/crates/fhir/tests/data/json/R4B/valueset-administrable-dose-form.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-administrable-dose-form.json rename to crates/fhir/tests/data/json/R4B/valueset-administrable-dose-form.json diff --git a/crates/fhir/tests/data/R4B/valueset-administration-method-codes.json b/crates/fhir/tests/data/json/R4B/valueset-administration-method-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-administration-method-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-administration-method-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-administrative-gender.json b/crates/fhir/tests/data/json/R4B/valueset-administrative-gender.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-administrative-gender.json rename to crates/fhir/tests/data/json/R4B/valueset-administrative-gender.json diff --git a/crates/fhir/tests/data/R4B/valueset-adverse-event-actuality.json b/crates/fhir/tests/data/json/R4B/valueset-adverse-event-actuality.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-adverse-event-actuality.json rename to crates/fhir/tests/data/json/R4B/valueset-adverse-event-actuality.json diff --git a/crates/fhir/tests/data/R4B/valueset-adverse-event-category.json b/crates/fhir/tests/data/json/R4B/valueset-adverse-event-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-adverse-event-category.json rename to crates/fhir/tests/data/json/R4B/valueset-adverse-event-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-adverse-event-causality-assess.json b/crates/fhir/tests/data/json/R4B/valueset-adverse-event-causality-assess.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-adverse-event-causality-assess.json rename to crates/fhir/tests/data/json/R4B/valueset-adverse-event-causality-assess.json diff --git a/crates/fhir/tests/data/R4B/valueset-adverse-event-causality-method.json b/crates/fhir/tests/data/json/R4B/valueset-adverse-event-causality-method.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-adverse-event-causality-method.json rename to crates/fhir/tests/data/json/R4B/valueset-adverse-event-causality-method.json diff --git a/crates/fhir/tests/data/R4B/valueset-adverse-event-outcome.json b/crates/fhir/tests/data/json/R4B/valueset-adverse-event-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-adverse-event-outcome.json rename to crates/fhir/tests/data/json/R4B/valueset-adverse-event-outcome.json diff --git a/crates/fhir/tests/data/R4B/valueset-adverse-event-seriousness.json b/crates/fhir/tests/data/json/R4B/valueset-adverse-event-seriousness.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-adverse-event-seriousness.json rename to crates/fhir/tests/data/json/R4B/valueset-adverse-event-seriousness.json diff --git a/crates/fhir/tests/data/R4B/valueset-adverse-event-severity.json b/crates/fhir/tests/data/json/R4B/valueset-adverse-event-severity.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-adverse-event-severity.json rename to crates/fhir/tests/data/json/R4B/valueset-adverse-event-severity.json diff --git a/crates/fhir/tests/data/R4B/valueset-adverse-event-type.json b/crates/fhir/tests/data/json/R4B/valueset-adverse-event-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-adverse-event-type.json rename to crates/fhir/tests/data/json/R4B/valueset-adverse-event-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-age-units.json b/crates/fhir/tests/data/json/R4B/valueset-age-units.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-age-units.json rename to crates/fhir/tests/data/json/R4B/valueset-age-units.json diff --git a/crates/fhir/tests/data/R4B/valueset-all-distance-units.json b/crates/fhir/tests/data/json/R4B/valueset-all-distance-units.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-all-distance-units.json rename to crates/fhir/tests/data/json/R4B/valueset-all-distance-units.json diff --git a/crates/fhir/tests/data/R4B/valueset-all-languages.json b/crates/fhir/tests/data/json/R4B/valueset-all-languages.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-all-languages.json rename to crates/fhir/tests/data/json/R4B/valueset-all-languages.json diff --git a/crates/fhir/tests/data/R4B/valueset-all-time-units.json b/crates/fhir/tests/data/json/R4B/valueset-all-time-units.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-all-time-units.json rename to crates/fhir/tests/data/json/R4B/valueset-all-time-units.json diff --git a/crates/fhir/tests/data/R4B/valueset-all-types.json b/crates/fhir/tests/data/json/R4B/valueset-all-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-all-types.json rename to crates/fhir/tests/data/json/R4B/valueset-all-types.json diff --git a/crates/fhir/tests/data/R4B/valueset-allelename.json b/crates/fhir/tests/data/json/R4B/valueset-allelename.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-allelename.json rename to crates/fhir/tests/data/json/R4B/valueset-allelename.json diff --git a/crates/fhir/tests/data/R4B/valueset-allergen-class.json b/crates/fhir/tests/data/json/R4B/valueset-allergen-class.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-allergen-class.json rename to crates/fhir/tests/data/json/R4B/valueset-allergen-class.json diff --git a/crates/fhir/tests/data/R4B/valueset-allergy-intolerance-category.json b/crates/fhir/tests/data/json/R4B/valueset-allergy-intolerance-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-allergy-intolerance-category.json rename to crates/fhir/tests/data/json/R4B/valueset-allergy-intolerance-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-allergy-intolerance-criticality.json b/crates/fhir/tests/data/json/R4B/valueset-allergy-intolerance-criticality.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-allergy-intolerance-criticality.json rename to crates/fhir/tests/data/json/R4B/valueset-allergy-intolerance-criticality.json diff --git a/crates/fhir/tests/data/R4B/valueset-allergy-intolerance-type.json b/crates/fhir/tests/data/json/R4B/valueset-allergy-intolerance-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-allergy-intolerance-type.json rename to crates/fhir/tests/data/json/R4B/valueset-allergy-intolerance-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-allergyintolerance-clinical.json b/crates/fhir/tests/data/json/R4B/valueset-allergyintolerance-clinical.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-allergyintolerance-clinical.json rename to crates/fhir/tests/data/json/R4B/valueset-allergyintolerance-clinical.json diff --git a/crates/fhir/tests/data/R4B/valueset-allergyintolerance-code.json b/crates/fhir/tests/data/json/R4B/valueset-allergyintolerance-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-allergyintolerance-code.json rename to crates/fhir/tests/data/json/R4B/valueset-allergyintolerance-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-allergyintolerance-verification.json b/crates/fhir/tests/data/json/R4B/valueset-allergyintolerance-verification.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-allergyintolerance-verification.json rename to crates/fhir/tests/data/json/R4B/valueset-allergyintolerance-verification.json diff --git a/crates/fhir/tests/data/R4B/valueset-animal-breeds.json b/crates/fhir/tests/data/json/R4B/valueset-animal-breeds.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-animal-breeds.json rename to crates/fhir/tests/data/json/R4B/valueset-animal-breeds.json diff --git a/crates/fhir/tests/data/R4B/valueset-animal-genderstatus.json b/crates/fhir/tests/data/json/R4B/valueset-animal-genderstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-animal-genderstatus.json rename to crates/fhir/tests/data/json/R4B/valueset-animal-genderstatus.json diff --git a/crates/fhir/tests/data/R4B/valueset-animal-species.json b/crates/fhir/tests/data/json/R4B/valueset-animal-species.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-animal-species.json rename to crates/fhir/tests/data/json/R4B/valueset-animal-species.json diff --git a/crates/fhir/tests/data/R4B/valueset-animal-tissue-type.json b/crates/fhir/tests/data/json/R4B/valueset-animal-tissue-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-animal-tissue-type.json rename to crates/fhir/tests/data/json/R4B/valueset-animal-tissue-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-appointment-cancellation-reason.json b/crates/fhir/tests/data/json/R4B/valueset-appointment-cancellation-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-appointment-cancellation-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-appointment-cancellation-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-appointmentstatus.json b/crates/fhir/tests/data/json/R4B/valueset-appointmentstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-appointmentstatus.json rename to crates/fhir/tests/data/json/R4B/valueset-appointmentstatus.json diff --git a/crates/fhir/tests/data/R4B/valueset-approach-site-codes.json b/crates/fhir/tests/data/json/R4B/valueset-approach-site-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-approach-site-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-approach-site-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-article-url-type.json b/crates/fhir/tests/data/json/R4B/valueset-article-url-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-article-url-type.json rename to crates/fhir/tests/data/json/R4B/valueset-article-url-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-artifact-contribution-instance-type.json b/crates/fhir/tests/data/json/R4B/valueset-artifact-contribution-instance-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-artifact-contribution-instance-type.json rename to crates/fhir/tests/data/json/R4B/valueset-artifact-contribution-instance-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-artifact-contribution-type.json b/crates/fhir/tests/data/json/R4B/valueset-artifact-contribution-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-artifact-contribution-type.json rename to crates/fhir/tests/data/json/R4B/valueset-artifact-contribution-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-artifact-relationship-type.json b/crates/fhir/tests/data/json/R4B/valueset-artifact-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-artifact-relationship-type.json rename to crates/fhir/tests/data/json/R4B/valueset-artifact-relationship-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-assert-direction-codes.json b/crates/fhir/tests/data/json/R4B/valueset-assert-direction-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-assert-direction-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-assert-direction-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-assert-operator-codes.json b/crates/fhir/tests/data/json/R4B/valueset-assert-operator-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-assert-operator-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-assert-operator-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-assert-response-code-types.json b/crates/fhir/tests/data/json/R4B/valueset-assert-response-code-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-assert-response-code-types.json rename to crates/fhir/tests/data/json/R4B/valueset-assert-response-code-types.json diff --git a/crates/fhir/tests/data/R4B/valueset-asset-availability.json b/crates/fhir/tests/data/json/R4B/valueset-asset-availability.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-asset-availability.json rename to crates/fhir/tests/data/json/R4B/valueset-asset-availability.json diff --git a/crates/fhir/tests/data/R4B/valueset-attribute-estimate-type.json b/crates/fhir/tests/data/json/R4B/valueset-attribute-estimate-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-attribute-estimate-type.json rename to crates/fhir/tests/data/json/R4B/valueset-attribute-estimate-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-audit-entity-type.json b/crates/fhir/tests/data/json/R4B/valueset-audit-entity-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-audit-entity-type.json rename to crates/fhir/tests/data/json/R4B/valueset-audit-entity-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-audit-event-action.json b/crates/fhir/tests/data/json/R4B/valueset-audit-event-action.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-audit-event-action.json rename to crates/fhir/tests/data/json/R4B/valueset-audit-event-action.json diff --git a/crates/fhir/tests/data/R4B/valueset-audit-event-outcome.json b/crates/fhir/tests/data/json/R4B/valueset-audit-event-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-audit-event-outcome.json rename to crates/fhir/tests/data/json/R4B/valueset-audit-event-outcome.json diff --git a/crates/fhir/tests/data/R4B/valueset-audit-event-sub-type.json b/crates/fhir/tests/data/json/R4B/valueset-audit-event-sub-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-audit-event-sub-type.json rename to crates/fhir/tests/data/json/R4B/valueset-audit-event-sub-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-audit-event-type.json b/crates/fhir/tests/data/json/R4B/valueset-audit-event-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-audit-event-type.json rename to crates/fhir/tests/data/json/R4B/valueset-audit-event-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-audit-source-type.json b/crates/fhir/tests/data/json/R4B/valueset-audit-source-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-audit-source-type.json rename to crates/fhir/tests/data/json/R4B/valueset-audit-source-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-basic-resource-type.json b/crates/fhir/tests/data/json/R4B/valueset-basic-resource-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-basic-resource-type.json rename to crates/fhir/tests/data/json/R4B/valueset-basic-resource-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-benefit-network.json b/crates/fhir/tests/data/json/R4B/valueset-benefit-network.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-benefit-network.json rename to crates/fhir/tests/data/json/R4B/valueset-benefit-network.json diff --git a/crates/fhir/tests/data/R4B/valueset-benefit-term.json b/crates/fhir/tests/data/json/R4B/valueset-benefit-term.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-benefit-term.json rename to crates/fhir/tests/data/json/R4B/valueset-benefit-term.json diff --git a/crates/fhir/tests/data/R4B/valueset-benefit-type.json b/crates/fhir/tests/data/json/R4B/valueset-benefit-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-benefit-type.json rename to crates/fhir/tests/data/json/R4B/valueset-benefit-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-benefit-unit.json b/crates/fhir/tests/data/json/R4B/valueset-benefit-unit.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-benefit-unit.json rename to crates/fhir/tests/data/json/R4B/valueset-benefit-unit.json diff --git a/crates/fhir/tests/data/R4B/valueset-binding-strength.json b/crates/fhir/tests/data/json/R4B/valueset-binding-strength.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-binding-strength.json rename to crates/fhir/tests/data/json/R4B/valueset-binding-strength.json diff --git a/crates/fhir/tests/data/R4B/valueset-body-site.json b/crates/fhir/tests/data/json/R4B/valueset-body-site.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-body-site.json rename to crates/fhir/tests/data/json/R4B/valueset-body-site.json diff --git a/crates/fhir/tests/data/R4B/valueset-bodysite-laterality.json b/crates/fhir/tests/data/json/R4B/valueset-bodysite-laterality.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-bodysite-laterality.json rename to crates/fhir/tests/data/json/R4B/valueset-bodysite-laterality.json diff --git a/crates/fhir/tests/data/R4B/valueset-bodystructure-code.json b/crates/fhir/tests/data/json/R4B/valueset-bodystructure-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-bodystructure-code.json rename to crates/fhir/tests/data/json/R4B/valueset-bodystructure-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-bodystructure-relative-location.json b/crates/fhir/tests/data/json/R4B/valueset-bodystructure-relative-location.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-bodystructure-relative-location.json rename to crates/fhir/tests/data/json/R4B/valueset-bodystructure-relative-location.json diff --git a/crates/fhir/tests/data/R4B/valueset-bundle-type.json b/crates/fhir/tests/data/json/R4B/valueset-bundle-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-bundle-type.json rename to crates/fhir/tests/data/json/R4B/valueset-bundle-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-c80-facilitycodes.json b/crates/fhir/tests/data/json/R4B/valueset-c80-facilitycodes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-c80-facilitycodes.json rename to crates/fhir/tests/data/json/R4B/valueset-c80-facilitycodes.json diff --git a/crates/fhir/tests/data/R4B/valueset-c80-practice-codes.json b/crates/fhir/tests/data/json/R4B/valueset-c80-practice-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-c80-practice-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-c80-practice-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-capability-statement-kind.json b/crates/fhir/tests/data/json/R4B/valueset-capability-statement-kind.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-capability-statement-kind.json rename to crates/fhir/tests/data/json/R4B/valueset-capability-statement-kind.json diff --git a/crates/fhir/tests/data/R4B/valueset-care-plan-activity-kind.json b/crates/fhir/tests/data/json/R4B/valueset-care-plan-activity-kind.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-care-plan-activity-kind.json rename to crates/fhir/tests/data/json/R4B/valueset-care-plan-activity-kind.json diff --git a/crates/fhir/tests/data/R4B/valueset-care-plan-activity-outcome.json b/crates/fhir/tests/data/json/R4B/valueset-care-plan-activity-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-care-plan-activity-outcome.json rename to crates/fhir/tests/data/json/R4B/valueset-care-plan-activity-outcome.json diff --git a/crates/fhir/tests/data/R4B/valueset-care-plan-activity-status.json b/crates/fhir/tests/data/json/R4B/valueset-care-plan-activity-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-care-plan-activity-status.json rename to crates/fhir/tests/data/json/R4B/valueset-care-plan-activity-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-care-plan-category.json b/crates/fhir/tests/data/json/R4B/valueset-care-plan-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-care-plan-category.json rename to crates/fhir/tests/data/json/R4B/valueset-care-plan-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-care-plan-intent.json b/crates/fhir/tests/data/json/R4B/valueset-care-plan-intent.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-care-plan-intent.json rename to crates/fhir/tests/data/json/R4B/valueset-care-plan-intent.json diff --git a/crates/fhir/tests/data/R4B/valueset-care-team-category.json b/crates/fhir/tests/data/json/R4B/valueset-care-team-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-care-team-category.json rename to crates/fhir/tests/data/json/R4B/valueset-care-team-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-care-team-status.json b/crates/fhir/tests/data/json/R4B/valueset-care-team-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-care-team-status.json rename to crates/fhir/tests/data/json/R4B/valueset-care-team-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-careteam-participant-role.json b/crates/fhir/tests/data/json/R4B/valueset-careteam-participant-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-careteam-participant-role.json rename to crates/fhir/tests/data/json/R4B/valueset-careteam-participant-role.json diff --git a/crates/fhir/tests/data/R4B/valueset-catalogType.json b/crates/fhir/tests/data/json/R4B/valueset-catalogType.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-catalogType.json rename to crates/fhir/tests/data/json/R4B/valueset-catalogType.json diff --git a/crates/fhir/tests/data/R4B/valueset-cdshooks-indicator.json b/crates/fhir/tests/data/json/R4B/valueset-cdshooks-indicator.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-cdshooks-indicator.json rename to crates/fhir/tests/data/json/R4B/valueset-cdshooks-indicator.json diff --git a/crates/fhir/tests/data/R4B/valueset-certainty-rating.json b/crates/fhir/tests/data/json/R4B/valueset-certainty-rating.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-certainty-rating.json rename to crates/fhir/tests/data/json/R4B/valueset-certainty-rating.json diff --git a/crates/fhir/tests/data/R4B/valueset-certainty-type.json b/crates/fhir/tests/data/json/R4B/valueset-certainty-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-certainty-type.json rename to crates/fhir/tests/data/json/R4B/valueset-certainty-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-characteristic-combination.json b/crates/fhir/tests/data/json/R4B/valueset-characteristic-combination.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-characteristic-combination.json rename to crates/fhir/tests/data/json/R4B/valueset-characteristic-combination.json diff --git a/crates/fhir/tests/data/R4B/valueset-characteristic-method.json b/crates/fhir/tests/data/json/R4B/valueset-characteristic-method.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-characteristic-method.json rename to crates/fhir/tests/data/json/R4B/valueset-characteristic-method.json diff --git a/crates/fhir/tests/data/R4B/valueset-chargeitem-billingcodes.json b/crates/fhir/tests/data/json/R4B/valueset-chargeitem-billingcodes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-chargeitem-billingcodes.json rename to crates/fhir/tests/data/json/R4B/valueset-chargeitem-billingcodes.json diff --git a/crates/fhir/tests/data/R4B/valueset-chargeitem-status.json b/crates/fhir/tests/data/json/R4B/valueset-chargeitem-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-chargeitem-status.json rename to crates/fhir/tests/data/json/R4B/valueset-chargeitem-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-chromosome-human.json b/crates/fhir/tests/data/json/R4B/valueset-chromosome-human.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-chromosome-human.json rename to crates/fhir/tests/data/json/R4B/valueset-chromosome-human.json diff --git a/crates/fhir/tests/data/R4B/valueset-citation-artifact-classifier.json b/crates/fhir/tests/data/json/R4B/valueset-citation-artifact-classifier.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-citation-artifact-classifier.json rename to crates/fhir/tests/data/json/R4B/valueset-citation-artifact-classifier.json diff --git a/crates/fhir/tests/data/R4B/valueset-citation-classification-type.json b/crates/fhir/tests/data/json/R4B/valueset-citation-classification-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-citation-classification-type.json rename to crates/fhir/tests/data/json/R4B/valueset-citation-classification-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-citation-status-type.json b/crates/fhir/tests/data/json/R4B/valueset-citation-status-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-citation-status-type.json rename to crates/fhir/tests/data/json/R4B/valueset-citation-status-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-citation-summary-style.json b/crates/fhir/tests/data/json/R4B/valueset-citation-summary-style.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-citation-summary-style.json rename to crates/fhir/tests/data/json/R4B/valueset-citation-summary-style.json diff --git a/crates/fhir/tests/data/R4B/valueset-cited-artifact-abstract-type.json b/crates/fhir/tests/data/json/R4B/valueset-cited-artifact-abstract-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-cited-artifact-abstract-type.json rename to crates/fhir/tests/data/json/R4B/valueset-cited-artifact-abstract-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-cited-artifact-classification-type.json b/crates/fhir/tests/data/json/R4B/valueset-cited-artifact-classification-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-cited-artifact-classification-type.json rename to crates/fhir/tests/data/json/R4B/valueset-cited-artifact-classification-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-cited-artifact-part-type.json b/crates/fhir/tests/data/json/R4B/valueset-cited-artifact-part-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-cited-artifact-part-type.json rename to crates/fhir/tests/data/json/R4B/valueset-cited-artifact-part-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-cited-artifact-status-type.json b/crates/fhir/tests/data/json/R4B/valueset-cited-artifact-status-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-cited-artifact-status-type.json rename to crates/fhir/tests/data/json/R4B/valueset-cited-artifact-status-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-cited-medium.json b/crates/fhir/tests/data/json/R4B/valueset-cited-medium.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-cited-medium.json rename to crates/fhir/tests/data/json/R4B/valueset-cited-medium.json diff --git a/crates/fhir/tests/data/R4B/valueset-claim-careteamrole.json b/crates/fhir/tests/data/json/R4B/valueset-claim-careteamrole.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-claim-careteamrole.json rename to crates/fhir/tests/data/json/R4B/valueset-claim-careteamrole.json diff --git a/crates/fhir/tests/data/R4B/valueset-claim-exception.json b/crates/fhir/tests/data/json/R4B/valueset-claim-exception.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-claim-exception.json rename to crates/fhir/tests/data/json/R4B/valueset-claim-exception.json diff --git a/crates/fhir/tests/data/R4B/valueset-claim-informationcategory.json b/crates/fhir/tests/data/json/R4B/valueset-claim-informationcategory.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-claim-informationcategory.json rename to crates/fhir/tests/data/json/R4B/valueset-claim-informationcategory.json diff --git a/crates/fhir/tests/data/R4B/valueset-claim-modifiers.json b/crates/fhir/tests/data/json/R4B/valueset-claim-modifiers.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-claim-modifiers.json rename to crates/fhir/tests/data/json/R4B/valueset-claim-modifiers.json diff --git a/crates/fhir/tests/data/R4B/valueset-claim-subtype.json b/crates/fhir/tests/data/json/R4B/valueset-claim-subtype.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-claim-subtype.json rename to crates/fhir/tests/data/json/R4B/valueset-claim-subtype.json diff --git a/crates/fhir/tests/data/R4B/valueset-claim-type.json b/crates/fhir/tests/data/json/R4B/valueset-claim-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-claim-type.json rename to crates/fhir/tests/data/json/R4B/valueset-claim-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-claim-use.json b/crates/fhir/tests/data/json/R4B/valueset-claim-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-claim-use.json rename to crates/fhir/tests/data/json/R4B/valueset-claim-use.json diff --git a/crates/fhir/tests/data/R4B/valueset-clinical-findings.json b/crates/fhir/tests/data/json/R4B/valueset-clinical-findings.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-clinical-findings.json rename to crates/fhir/tests/data/json/R4B/valueset-clinical-findings.json diff --git a/crates/fhir/tests/data/R4B/valueset-clinical-use-definition-category.json b/crates/fhir/tests/data/json/R4B/valueset-clinical-use-definition-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-clinical-use-definition-category.json rename to crates/fhir/tests/data/json/R4B/valueset-clinical-use-definition-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-clinical-use-definition-type.json b/crates/fhir/tests/data/json/R4B/valueset-clinical-use-definition-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-clinical-use-definition-type.json rename to crates/fhir/tests/data/json/R4B/valueset-clinical-use-definition-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-clinicalimpression-prognosis.json b/crates/fhir/tests/data/json/R4B/valueset-clinicalimpression-prognosis.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-clinicalimpression-prognosis.json rename to crates/fhir/tests/data/json/R4B/valueset-clinicalimpression-prognosis.json diff --git a/crates/fhir/tests/data/R4B/valueset-clinicalimpression-status.json b/crates/fhir/tests/data/json/R4B/valueset-clinicalimpression-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-clinicalimpression-status.json rename to crates/fhir/tests/data/json/R4B/valueset-clinicalimpression-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-clinvar.json b/crates/fhir/tests/data/json/R4B/valueset-clinvar.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-clinvar.json rename to crates/fhir/tests/data/json/R4B/valueset-clinvar.json diff --git a/crates/fhir/tests/data/R4B/valueset-code-search-support.json b/crates/fhir/tests/data/json/R4B/valueset-code-search-support.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-code-search-support.json rename to crates/fhir/tests/data/json/R4B/valueset-code-search-support.json diff --git a/crates/fhir/tests/data/R4B/valueset-codesystem-content-mode.json b/crates/fhir/tests/data/json/R4B/valueset-codesystem-content-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-codesystem-content-mode.json rename to crates/fhir/tests/data/json/R4B/valueset-codesystem-content-mode.json diff --git a/crates/fhir/tests/data/R4B/valueset-codesystem-hierarchy-meaning.json b/crates/fhir/tests/data/json/R4B/valueset-codesystem-hierarchy-meaning.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-codesystem-hierarchy-meaning.json rename to crates/fhir/tests/data/json/R4B/valueset-codesystem-hierarchy-meaning.json diff --git a/crates/fhir/tests/data/R4B/valueset-combined-dose-form.json b/crates/fhir/tests/data/json/R4B/valueset-combined-dose-form.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-combined-dose-form.json rename to crates/fhir/tests/data/json/R4B/valueset-combined-dose-form.json diff --git a/crates/fhir/tests/data/R4B/valueset-common-tags.json b/crates/fhir/tests/data/json/R4B/valueset-common-tags.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-common-tags.json rename to crates/fhir/tests/data/json/R4B/valueset-common-tags.json diff --git a/crates/fhir/tests/data/R4B/valueset-communication-category.json b/crates/fhir/tests/data/json/R4B/valueset-communication-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-communication-category.json rename to crates/fhir/tests/data/json/R4B/valueset-communication-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-communication-not-done-reason.json b/crates/fhir/tests/data/json/R4B/valueset-communication-not-done-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-communication-not-done-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-communication-not-done-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-communication-topic.json b/crates/fhir/tests/data/json/R4B/valueset-communication-topic.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-communication-topic.json rename to crates/fhir/tests/data/json/R4B/valueset-communication-topic.json diff --git a/crates/fhir/tests/data/R4B/valueset-compartment-type.json b/crates/fhir/tests/data/json/R4B/valueset-compartment-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-compartment-type.json rename to crates/fhir/tests/data/json/R4B/valueset-compartment-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-composite-measure-scoring.json b/crates/fhir/tests/data/json/R4B/valueset-composite-measure-scoring.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-composite-measure-scoring.json rename to crates/fhir/tests/data/json/R4B/valueset-composite-measure-scoring.json diff --git a/crates/fhir/tests/data/R4B/valueset-composition-attestation-mode.json b/crates/fhir/tests/data/json/R4B/valueset-composition-attestation-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-composition-attestation-mode.json rename to crates/fhir/tests/data/json/R4B/valueset-composition-attestation-mode.json diff --git a/crates/fhir/tests/data/R4B/valueset-composition-status.json b/crates/fhir/tests/data/json/R4B/valueset-composition-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-composition-status.json rename to crates/fhir/tests/data/json/R4B/valueset-composition-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-concept-map-equivalence.json b/crates/fhir/tests/data/json/R4B/valueset-concept-map-equivalence.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-concept-map-equivalence.json rename to crates/fhir/tests/data/json/R4B/valueset-concept-map-equivalence.json diff --git a/crates/fhir/tests/data/R4B/valueset-concept-property-type.json b/crates/fhir/tests/data/json/R4B/valueset-concept-property-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-concept-property-type.json rename to crates/fhir/tests/data/json/R4B/valueset-concept-property-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-concept-subsumption-outcome.json b/crates/fhir/tests/data/json/R4B/valueset-concept-subsumption-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-concept-subsumption-outcome.json rename to crates/fhir/tests/data/json/R4B/valueset-concept-subsumption-outcome.json diff --git a/crates/fhir/tests/data/R4B/valueset-conceptmap-unmapped-mode.json b/crates/fhir/tests/data/json/R4B/valueset-conceptmap-unmapped-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-conceptmap-unmapped-mode.json rename to crates/fhir/tests/data/json/R4B/valueset-conceptmap-unmapped-mode.json diff --git a/crates/fhir/tests/data/R4B/valueset-condition-category.json b/crates/fhir/tests/data/json/R4B/valueset-condition-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-condition-category.json rename to crates/fhir/tests/data/json/R4B/valueset-condition-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-condition-cause.json b/crates/fhir/tests/data/json/R4B/valueset-condition-cause.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-condition-cause.json rename to crates/fhir/tests/data/json/R4B/valueset-condition-cause.json diff --git a/crates/fhir/tests/data/R4B/valueset-condition-clinical.json b/crates/fhir/tests/data/json/R4B/valueset-condition-clinical.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-condition-clinical.json rename to crates/fhir/tests/data/json/R4B/valueset-condition-clinical.json diff --git a/crates/fhir/tests/data/R4B/valueset-condition-code.json b/crates/fhir/tests/data/json/R4B/valueset-condition-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-condition-code.json rename to crates/fhir/tests/data/json/R4B/valueset-condition-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-condition-outcome.json b/crates/fhir/tests/data/json/R4B/valueset-condition-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-condition-outcome.json rename to crates/fhir/tests/data/json/R4B/valueset-condition-outcome.json diff --git a/crates/fhir/tests/data/R4B/valueset-condition-predecessor.json b/crates/fhir/tests/data/json/R4B/valueset-condition-predecessor.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-condition-predecessor.json rename to crates/fhir/tests/data/json/R4B/valueset-condition-predecessor.json diff --git a/crates/fhir/tests/data/R4B/valueset-condition-severity.json b/crates/fhir/tests/data/json/R4B/valueset-condition-severity.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-condition-severity.json rename to crates/fhir/tests/data/json/R4B/valueset-condition-severity.json diff --git a/crates/fhir/tests/data/R4B/valueset-condition-stage-type.json b/crates/fhir/tests/data/json/R4B/valueset-condition-stage-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-condition-stage-type.json rename to crates/fhir/tests/data/json/R4B/valueset-condition-stage-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-condition-stage.json b/crates/fhir/tests/data/json/R4B/valueset-condition-stage.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-condition-stage.json rename to crates/fhir/tests/data/json/R4B/valueset-condition-stage.json diff --git a/crates/fhir/tests/data/R4B/valueset-condition-ver-status.json b/crates/fhir/tests/data/json/R4B/valueset-condition-ver-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-condition-ver-status.json rename to crates/fhir/tests/data/json/R4B/valueset-condition-ver-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-conditional-delete-status.json b/crates/fhir/tests/data/json/R4B/valueset-conditional-delete-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-conditional-delete-status.json rename to crates/fhir/tests/data/json/R4B/valueset-conditional-delete-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-conditional-read-status.json b/crates/fhir/tests/data/json/R4B/valueset-conditional-read-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-conditional-read-status.json rename to crates/fhir/tests/data/json/R4B/valueset-conditional-read-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-consent-action.json b/crates/fhir/tests/data/json/R4B/valueset-consent-action.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-consent-action.json rename to crates/fhir/tests/data/json/R4B/valueset-consent-action.json diff --git a/crates/fhir/tests/data/R4B/valueset-consent-category.json b/crates/fhir/tests/data/json/R4B/valueset-consent-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-consent-category.json rename to crates/fhir/tests/data/json/R4B/valueset-consent-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-consent-content-class.json b/crates/fhir/tests/data/json/R4B/valueset-consent-content-class.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-consent-content-class.json rename to crates/fhir/tests/data/json/R4B/valueset-consent-content-class.json diff --git a/crates/fhir/tests/data/R4B/valueset-consent-content-code.json b/crates/fhir/tests/data/json/R4B/valueset-consent-content-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-consent-content-code.json rename to crates/fhir/tests/data/json/R4B/valueset-consent-content-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-consent-data-meaning.json b/crates/fhir/tests/data/json/R4B/valueset-consent-data-meaning.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-consent-data-meaning.json rename to crates/fhir/tests/data/json/R4B/valueset-consent-data-meaning.json diff --git a/crates/fhir/tests/data/R4B/valueset-consent-policy.json b/crates/fhir/tests/data/json/R4B/valueset-consent-policy.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-consent-policy.json rename to crates/fhir/tests/data/json/R4B/valueset-consent-policy.json diff --git a/crates/fhir/tests/data/R4B/valueset-consent-provision-type.json b/crates/fhir/tests/data/json/R4B/valueset-consent-provision-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-consent-provision-type.json rename to crates/fhir/tests/data/json/R4B/valueset-consent-provision-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-consent-scope.json b/crates/fhir/tests/data/json/R4B/valueset-consent-scope.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-consent-scope.json rename to crates/fhir/tests/data/json/R4B/valueset-consent-scope.json diff --git a/crates/fhir/tests/data/R4B/valueset-consent-state-codes.json b/crates/fhir/tests/data/json/R4B/valueset-consent-state-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-consent-state-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-consent-state-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-consistency-type.json b/crates/fhir/tests/data/json/R4B/valueset-consistency-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-consistency-type.json rename to crates/fhir/tests/data/json/R4B/valueset-consistency-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-constraint-severity.json b/crates/fhir/tests/data/json/R4B/valueset-constraint-severity.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-constraint-severity.json rename to crates/fhir/tests/data/json/R4B/valueset-constraint-severity.json diff --git a/crates/fhir/tests/data/R4B/valueset-contact-point-system.json b/crates/fhir/tests/data/json/R4B/valueset-contact-point-system.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contact-point-system.json rename to crates/fhir/tests/data/json/R4B/valueset-contact-point-system.json diff --git a/crates/fhir/tests/data/R4B/valueset-contact-point-use.json b/crates/fhir/tests/data/json/R4B/valueset-contact-point-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contact-point-use.json rename to crates/fhir/tests/data/json/R4B/valueset-contact-point-use.json diff --git a/crates/fhir/tests/data/R4B/valueset-contactentity-type.json b/crates/fhir/tests/data/json/R4B/valueset-contactentity-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contactentity-type.json rename to crates/fhir/tests/data/json/R4B/valueset-contactentity-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-container-cap.json b/crates/fhir/tests/data/json/R4B/valueset-container-cap.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-container-cap.json rename to crates/fhir/tests/data/json/R4B/valueset-container-cap.json diff --git a/crates/fhir/tests/data/R4B/valueset-container-material.json b/crates/fhir/tests/data/json/R4B/valueset-container-material.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-container-material.json rename to crates/fhir/tests/data/json/R4B/valueset-container-material.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-action.json b/crates/fhir/tests/data/json/R4B/valueset-contract-action.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-action.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-action.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-actionstatus.json b/crates/fhir/tests/data/json/R4B/valueset-contract-actionstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-actionstatus.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-actionstatus.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-actorrole.json b/crates/fhir/tests/data/json/R4B/valueset-contract-actorrole.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-actorrole.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-actorrole.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-assetcontext.json b/crates/fhir/tests/data/json/R4B/valueset-contract-assetcontext.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-assetcontext.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-assetcontext.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-assetscope.json b/crates/fhir/tests/data/json/R4B/valueset-contract-assetscope.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-assetscope.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-assetscope.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-assetsubtype.json b/crates/fhir/tests/data/json/R4B/valueset-contract-assetsubtype.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-assetsubtype.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-assetsubtype.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-assettype.json b/crates/fhir/tests/data/json/R4B/valueset-contract-assettype.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-assettype.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-assettype.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-content-derivative.json b/crates/fhir/tests/data/json/R4B/valueset-contract-content-derivative.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-content-derivative.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-content-derivative.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-decision-mode.json b/crates/fhir/tests/data/json/R4B/valueset-contract-decision-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-decision-mode.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-decision-mode.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-definition-subtype.json b/crates/fhir/tests/data/json/R4B/valueset-contract-definition-subtype.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-definition-subtype.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-definition-subtype.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-definition-type.json b/crates/fhir/tests/data/json/R4B/valueset-contract-definition-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-definition-type.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-definition-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-expiration-type.json b/crates/fhir/tests/data/json/R4B/valueset-contract-expiration-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-expiration-type.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-expiration-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-legalstate.json b/crates/fhir/tests/data/json/R4B/valueset-contract-legalstate.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-legalstate.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-legalstate.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-party-role.json b/crates/fhir/tests/data/json/R4B/valueset-contract-party-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-party-role.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-party-role.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-publicationstatus.json b/crates/fhir/tests/data/json/R4B/valueset-contract-publicationstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-publicationstatus.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-publicationstatus.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-scope.json b/crates/fhir/tests/data/json/R4B/valueset-contract-scope.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-scope.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-scope.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-security-category.json b/crates/fhir/tests/data/json/R4B/valueset-contract-security-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-security-category.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-security-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-security-classification.json b/crates/fhir/tests/data/json/R4B/valueset-contract-security-classification.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-security-classification.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-security-classification.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-security-control.json b/crates/fhir/tests/data/json/R4B/valueset-contract-security-control.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-security-control.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-security-control.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-signer-type.json b/crates/fhir/tests/data/json/R4B/valueset-contract-signer-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-signer-type.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-signer-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-status.json b/crates/fhir/tests/data/json/R4B/valueset-contract-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-status.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-subtype.json b/crates/fhir/tests/data/json/R4B/valueset-contract-subtype.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-subtype.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-subtype.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-term-subtype.json b/crates/fhir/tests/data/json/R4B/valueset-contract-term-subtype.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-term-subtype.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-term-subtype.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-term-type.json b/crates/fhir/tests/data/json/R4B/valueset-contract-term-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-term-type.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-term-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-contract-type.json b/crates/fhir/tests/data/json/R4B/valueset-contract-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contract-type.json rename to crates/fhir/tests/data/json/R4B/valueset-contract-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-contributor-role.json b/crates/fhir/tests/data/json/R4B/valueset-contributor-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contributor-role.json rename to crates/fhir/tests/data/json/R4B/valueset-contributor-role.json diff --git a/crates/fhir/tests/data/R4B/valueset-contributor-summary-source.json b/crates/fhir/tests/data/json/R4B/valueset-contributor-summary-source.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contributor-summary-source.json rename to crates/fhir/tests/data/json/R4B/valueset-contributor-summary-source.json diff --git a/crates/fhir/tests/data/R4B/valueset-contributor-summary-style.json b/crates/fhir/tests/data/json/R4B/valueset-contributor-summary-style.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contributor-summary-style.json rename to crates/fhir/tests/data/json/R4B/valueset-contributor-summary-style.json diff --git a/crates/fhir/tests/data/R4B/valueset-contributor-summary-type.json b/crates/fhir/tests/data/json/R4B/valueset-contributor-summary-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contributor-summary-type.json rename to crates/fhir/tests/data/json/R4B/valueset-contributor-summary-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-contributor-type.json b/crates/fhir/tests/data/json/R4B/valueset-contributor-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-contributor-type.json rename to crates/fhir/tests/data/json/R4B/valueset-contributor-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-country.json b/crates/fhir/tests/data/json/R4B/valueset-country.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-country.json rename to crates/fhir/tests/data/json/R4B/valueset-country.json diff --git a/crates/fhir/tests/data/R4B/valueset-coverage-class.json b/crates/fhir/tests/data/json/R4B/valueset-coverage-class.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-coverage-class.json rename to crates/fhir/tests/data/json/R4B/valueset-coverage-class.json diff --git a/crates/fhir/tests/data/R4B/valueset-coverage-copay-type.json b/crates/fhir/tests/data/json/R4B/valueset-coverage-copay-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-coverage-copay-type.json rename to crates/fhir/tests/data/json/R4B/valueset-coverage-copay-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-coverage-financial-exception.json b/crates/fhir/tests/data/json/R4B/valueset-coverage-financial-exception.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-coverage-financial-exception.json rename to crates/fhir/tests/data/json/R4B/valueset-coverage-financial-exception.json diff --git a/crates/fhir/tests/data/R4B/valueset-coverage-type.json b/crates/fhir/tests/data/json/R4B/valueset-coverage-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-coverage-type.json rename to crates/fhir/tests/data/json/R4B/valueset-coverage-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-coverageeligibilityresponse-ex-auth-support.json b/crates/fhir/tests/data/json/R4B/valueset-coverageeligibilityresponse-ex-auth-support.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-coverageeligibilityresponse-ex-auth-support.json rename to crates/fhir/tests/data/json/R4B/valueset-coverageeligibilityresponse-ex-auth-support.json diff --git a/crates/fhir/tests/data/R4B/valueset-cpt-all.json b/crates/fhir/tests/data/json/R4B/valueset-cpt-all.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-cpt-all.json rename to crates/fhir/tests/data/json/R4B/valueset-cpt-all.json diff --git a/crates/fhir/tests/data/R4B/valueset-currencies.json b/crates/fhir/tests/data/json/R4B/valueset-currencies.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-currencies.json rename to crates/fhir/tests/data/json/R4B/valueset-currencies.json diff --git a/crates/fhir/tests/data/R4B/valueset-data-absent-reason.json b/crates/fhir/tests/data/json/R4B/valueset-data-absent-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-data-absent-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-data-absent-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-data-types.json b/crates/fhir/tests/data/json/R4B/valueset-data-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-data-types.json rename to crates/fhir/tests/data/json/R4B/valueset-data-types.json diff --git a/crates/fhir/tests/data/R4B/valueset-dataelement-sdcobjectclass.json b/crates/fhir/tests/data/json/R4B/valueset-dataelement-sdcobjectclass.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-dataelement-sdcobjectclass.json rename to crates/fhir/tests/data/json/R4B/valueset-dataelement-sdcobjectclass.json diff --git a/crates/fhir/tests/data/R4B/valueset-dataelement-sdcobjectclassproperty.json b/crates/fhir/tests/data/json/R4B/valueset-dataelement-sdcobjectclassproperty.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-dataelement-sdcobjectclassproperty.json rename to crates/fhir/tests/data/json/R4B/valueset-dataelement-sdcobjectclassproperty.json diff --git a/crates/fhir/tests/data/R4B/valueset-days-of-week.json b/crates/fhir/tests/data/json/R4B/valueset-days-of-week.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-days-of-week.json rename to crates/fhir/tests/data/json/R4B/valueset-days-of-week.json diff --git a/crates/fhir/tests/data/R4B/valueset-defined-types.json b/crates/fhir/tests/data/json/R4B/valueset-defined-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-defined-types.json rename to crates/fhir/tests/data/json/R4B/valueset-defined-types.json diff --git a/crates/fhir/tests/data/R4B/valueset-definition-resource-types.json b/crates/fhir/tests/data/json/R4B/valueset-definition-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-definition-resource-types.json rename to crates/fhir/tests/data/json/R4B/valueset-definition-resource-types.json diff --git a/crates/fhir/tests/data/R4B/valueset-definition-status.json b/crates/fhir/tests/data/json/R4B/valueset-definition-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-definition-status.json rename to crates/fhir/tests/data/json/R4B/valueset-definition-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-definition-topic.json b/crates/fhir/tests/data/json/R4B/valueset-definition-topic.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-definition-topic.json rename to crates/fhir/tests/data/json/R4B/valueset-definition-topic.json diff --git a/crates/fhir/tests/data/R4B/valueset-definition-use.json b/crates/fhir/tests/data/json/R4B/valueset-definition-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-definition-use.json rename to crates/fhir/tests/data/json/R4B/valueset-definition-use.json diff --git a/crates/fhir/tests/data/R4B/valueset-designation-use.json b/crates/fhir/tests/data/json/R4B/valueset-designation-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-designation-use.json rename to crates/fhir/tests/data/json/R4B/valueset-designation-use.json diff --git a/crates/fhir/tests/data/R4B/valueset-detectedissue-category.json b/crates/fhir/tests/data/json/R4B/valueset-detectedissue-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-detectedissue-category.json rename to crates/fhir/tests/data/json/R4B/valueset-detectedissue-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-detectedissue-mitigation-action.json b/crates/fhir/tests/data/json/R4B/valueset-detectedissue-mitigation-action.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-detectedissue-mitigation-action.json rename to crates/fhir/tests/data/json/R4B/valueset-detectedissue-mitigation-action.json diff --git a/crates/fhir/tests/data/R4B/valueset-detectedissue-severity.json b/crates/fhir/tests/data/json/R4B/valueset-detectedissue-severity.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-detectedissue-severity.json rename to crates/fhir/tests/data/json/R4B/valueset-detectedissue-severity.json diff --git a/crates/fhir/tests/data/R4B/valueset-device-action.json b/crates/fhir/tests/data/json/R4B/valueset-device-action.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-device-action.json rename to crates/fhir/tests/data/json/R4B/valueset-device-action.json diff --git a/crates/fhir/tests/data/R4B/valueset-device-kind.json b/crates/fhir/tests/data/json/R4B/valueset-device-kind.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-device-kind.json rename to crates/fhir/tests/data/json/R4B/valueset-device-kind.json diff --git a/crates/fhir/tests/data/R4B/valueset-device-nametype.json b/crates/fhir/tests/data/json/R4B/valueset-device-nametype.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-device-nametype.json rename to crates/fhir/tests/data/json/R4B/valueset-device-nametype.json diff --git a/crates/fhir/tests/data/R4B/valueset-device-statement-status.json b/crates/fhir/tests/data/json/R4B/valueset-device-statement-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-device-statement-status.json rename to crates/fhir/tests/data/json/R4B/valueset-device-statement-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-device-status-reason.json b/crates/fhir/tests/data/json/R4B/valueset-device-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-device-status-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-device-status-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-device-status.json b/crates/fhir/tests/data/json/R4B/valueset-device-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-device-status.json rename to crates/fhir/tests/data/json/R4B/valueset-device-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-device-type.json b/crates/fhir/tests/data/json/R4B/valueset-device-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-device-type.json rename to crates/fhir/tests/data/json/R4B/valueset-device-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-devicemetric-type.json b/crates/fhir/tests/data/json/R4B/valueset-devicemetric-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-devicemetric-type.json rename to crates/fhir/tests/data/json/R4B/valueset-devicemetric-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-diagnosis-role.json b/crates/fhir/tests/data/json/R4B/valueset-diagnosis-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-diagnosis-role.json rename to crates/fhir/tests/data/json/R4B/valueset-diagnosis-role.json diff --git a/crates/fhir/tests/data/R4B/valueset-diagnostic-based-on-snomed.json b/crates/fhir/tests/data/json/R4B/valueset-diagnostic-based-on-snomed.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-diagnostic-based-on-snomed.json rename to crates/fhir/tests/data/json/R4B/valueset-diagnostic-based-on-snomed.json diff --git a/crates/fhir/tests/data/R4B/valueset-diagnostic-report-status.json b/crates/fhir/tests/data/json/R4B/valueset-diagnostic-report-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-diagnostic-report-status.json rename to crates/fhir/tests/data/json/R4B/valueset-diagnostic-report-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-diagnostic-service-sections.json b/crates/fhir/tests/data/json/R4B/valueset-diagnostic-service-sections.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-diagnostic-service-sections.json rename to crates/fhir/tests/data/json/R4B/valueset-diagnostic-service-sections.json diff --git a/crates/fhir/tests/data/R4B/valueset-dicm-405-mediatype.json b/crates/fhir/tests/data/json/R4B/valueset-dicm-405-mediatype.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-dicm-405-mediatype.json rename to crates/fhir/tests/data/json/R4B/valueset-dicm-405-mediatype.json diff --git a/crates/fhir/tests/data/R4B/valueset-diet-type.json b/crates/fhir/tests/data/json/R4B/valueset-diet-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-diet-type.json rename to crates/fhir/tests/data/json/R4B/valueset-diet-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-directness.json b/crates/fhir/tests/data/json/R4B/valueset-directness.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-directness.json rename to crates/fhir/tests/data/json/R4B/valueset-directness.json diff --git a/crates/fhir/tests/data/R4B/valueset-discriminator-type.json b/crates/fhir/tests/data/json/R4B/valueset-discriminator-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-discriminator-type.json rename to crates/fhir/tests/data/json/R4B/valueset-discriminator-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-disease-status.json b/crates/fhir/tests/data/json/R4B/valueset-disease-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-disease-status.json rename to crates/fhir/tests/data/json/R4B/valueset-disease-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-disease-symptom-procedure.json b/crates/fhir/tests/data/json/R4B/valueset-disease-symptom-procedure.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-disease-symptom-procedure.json rename to crates/fhir/tests/data/json/R4B/valueset-disease-symptom-procedure.json diff --git a/crates/fhir/tests/data/R4B/valueset-distance-units.json b/crates/fhir/tests/data/json/R4B/valueset-distance-units.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-distance-units.json rename to crates/fhir/tests/data/json/R4B/valueset-distance-units.json diff --git a/crates/fhir/tests/data/R4B/valueset-doc-classcodes.json b/crates/fhir/tests/data/json/R4B/valueset-doc-classcodes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-doc-classcodes.json rename to crates/fhir/tests/data/json/R4B/valueset-doc-classcodes.json diff --git a/crates/fhir/tests/data/R4B/valueset-doc-section-codes.json b/crates/fhir/tests/data/json/R4B/valueset-doc-section-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-doc-section-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-doc-section-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-doc-typecodes.json b/crates/fhir/tests/data/json/R4B/valueset-doc-typecodes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-doc-typecodes.json rename to crates/fhir/tests/data/json/R4B/valueset-doc-typecodes.json diff --git a/crates/fhir/tests/data/R4B/valueset-document-mode.json b/crates/fhir/tests/data/json/R4B/valueset-document-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-document-mode.json rename to crates/fhir/tests/data/json/R4B/valueset-document-mode.json diff --git a/crates/fhir/tests/data/R4B/valueset-document-reference-status.json b/crates/fhir/tests/data/json/R4B/valueset-document-reference-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-document-reference-status.json rename to crates/fhir/tests/data/json/R4B/valueset-document-reference-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-document-relationship-type.json b/crates/fhir/tests/data/json/R4B/valueset-document-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-document-relationship-type.json rename to crates/fhir/tests/data/json/R4B/valueset-document-relationship-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-dose-rate-type.json b/crates/fhir/tests/data/json/R4B/valueset-dose-rate-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-dose-rate-type.json rename to crates/fhir/tests/data/json/R4B/valueset-dose-rate-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-duration-units.json b/crates/fhir/tests/data/json/R4B/valueset-duration-units.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-duration-units.json rename to crates/fhir/tests/data/json/R4B/valueset-duration-units.json diff --git a/crates/fhir/tests/data/R4B/valueset-eligibilityrequest-purpose.json b/crates/fhir/tests/data/json/R4B/valueset-eligibilityrequest-purpose.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-eligibilityrequest-purpose.json rename to crates/fhir/tests/data/json/R4B/valueset-eligibilityrequest-purpose.json diff --git a/crates/fhir/tests/data/R4B/valueset-eligibilityresponse-purpose.json b/crates/fhir/tests/data/json/R4B/valueset-eligibilityresponse-purpose.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-eligibilityresponse-purpose.json rename to crates/fhir/tests/data/json/R4B/valueset-eligibilityresponse-purpose.json diff --git a/crates/fhir/tests/data/R4B/valueset-encounter-admit-source.json b/crates/fhir/tests/data/json/R4B/valueset-encounter-admit-source.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-encounter-admit-source.json rename to crates/fhir/tests/data/json/R4B/valueset-encounter-admit-source.json diff --git a/crates/fhir/tests/data/R4B/valueset-encounter-diet.json b/crates/fhir/tests/data/json/R4B/valueset-encounter-diet.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-encounter-diet.json rename to crates/fhir/tests/data/json/R4B/valueset-encounter-diet.json diff --git a/crates/fhir/tests/data/R4B/valueset-encounter-discharge-disposition.json b/crates/fhir/tests/data/json/R4B/valueset-encounter-discharge-disposition.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-encounter-discharge-disposition.json rename to crates/fhir/tests/data/json/R4B/valueset-encounter-discharge-disposition.json diff --git a/crates/fhir/tests/data/R4B/valueset-encounter-location-status.json b/crates/fhir/tests/data/json/R4B/valueset-encounter-location-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-encounter-location-status.json rename to crates/fhir/tests/data/json/R4B/valueset-encounter-location-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-encounter-participant-type.json b/crates/fhir/tests/data/json/R4B/valueset-encounter-participant-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-encounter-participant-type.json rename to crates/fhir/tests/data/json/R4B/valueset-encounter-participant-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-encounter-reason.json b/crates/fhir/tests/data/json/R4B/valueset-encounter-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-encounter-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-encounter-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-encounter-special-arrangements.json b/crates/fhir/tests/data/json/R4B/valueset-encounter-special-arrangements.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-encounter-special-arrangements.json rename to crates/fhir/tests/data/json/R4B/valueset-encounter-special-arrangements.json diff --git a/crates/fhir/tests/data/R4B/valueset-encounter-special-courtesy.json b/crates/fhir/tests/data/json/R4B/valueset-encounter-special-courtesy.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-encounter-special-courtesy.json rename to crates/fhir/tests/data/json/R4B/valueset-encounter-special-courtesy.json diff --git a/crates/fhir/tests/data/R4B/valueset-encounter-status.json b/crates/fhir/tests/data/json/R4B/valueset-encounter-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-encounter-status.json rename to crates/fhir/tests/data/json/R4B/valueset-encounter-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-encounter-type.json b/crates/fhir/tests/data/json/R4B/valueset-encounter-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-encounter-type.json rename to crates/fhir/tests/data/json/R4B/valueset-encounter-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-endpoint-connection-type.json b/crates/fhir/tests/data/json/R4B/valueset-endpoint-connection-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-endpoint-connection-type.json rename to crates/fhir/tests/data/json/R4B/valueset-endpoint-connection-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-endpoint-payload-type.json b/crates/fhir/tests/data/json/R4B/valueset-endpoint-payload-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-endpoint-payload-type.json rename to crates/fhir/tests/data/json/R4B/valueset-endpoint-payload-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-endpoint-status.json b/crates/fhir/tests/data/json/R4B/valueset-endpoint-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-endpoint-status.json rename to crates/fhir/tests/data/json/R4B/valueset-endpoint-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-enteral-route.json b/crates/fhir/tests/data/json/R4B/valueset-enteral-route.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-enteral-route.json rename to crates/fhir/tests/data/json/R4B/valueset-enteral-route.json diff --git a/crates/fhir/tests/data/R4B/valueset-entformula-additive.json b/crates/fhir/tests/data/json/R4B/valueset-entformula-additive.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-entformula-additive.json rename to crates/fhir/tests/data/json/R4B/valueset-entformula-additive.json diff --git a/crates/fhir/tests/data/R4B/valueset-entformula-type.json b/crates/fhir/tests/data/json/R4B/valueset-entformula-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-entformula-type.json rename to crates/fhir/tests/data/json/R4B/valueset-entformula-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-episode-of-care-status.json b/crates/fhir/tests/data/json/R4B/valueset-episode-of-care-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-episode-of-care-status.json rename to crates/fhir/tests/data/json/R4B/valueset-episode-of-care-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-episodeofcare-type.json b/crates/fhir/tests/data/json/R4B/valueset-episodeofcare-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-episodeofcare-type.json rename to crates/fhir/tests/data/json/R4B/valueset-episodeofcare-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-event-capability-mode.json b/crates/fhir/tests/data/json/R4B/valueset-event-capability-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-event-capability-mode.json rename to crates/fhir/tests/data/json/R4B/valueset-event-capability-mode.json diff --git a/crates/fhir/tests/data/R4B/valueset-event-or-request-resource-types.json b/crates/fhir/tests/data/json/R4B/valueset-event-or-request-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-event-or-request-resource-types.json rename to crates/fhir/tests/data/json/R4B/valueset-event-or-request-resource-types.json diff --git a/crates/fhir/tests/data/R4B/valueset-event-resource-types.json b/crates/fhir/tests/data/json/R4B/valueset-event-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-event-resource-types.json rename to crates/fhir/tests/data/json/R4B/valueset-event-resource-types.json diff --git a/crates/fhir/tests/data/R4B/valueset-event-status.json b/crates/fhir/tests/data/json/R4B/valueset-event-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-event-status.json rename to crates/fhir/tests/data/json/R4B/valueset-event-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-event-timing.json b/crates/fhir/tests/data/json/R4B/valueset-event-timing.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-event-timing.json rename to crates/fhir/tests/data/json/R4B/valueset-event-timing.json diff --git a/crates/fhir/tests/data/R4B/valueset-evidence-classifier-code.json b/crates/fhir/tests/data/json/R4B/valueset-evidence-classifier-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-evidence-classifier-code.json rename to crates/fhir/tests/data/json/R4B/valueset-evidence-classifier-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-evidence-quality.json b/crates/fhir/tests/data/json/R4B/valueset-evidence-quality.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-evidence-quality.json rename to crates/fhir/tests/data/json/R4B/valueset-evidence-quality.json diff --git a/crates/fhir/tests/data/R4B/valueset-evidence-report-section.json b/crates/fhir/tests/data/json/R4B/valueset-evidence-report-section.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-evidence-report-section.json rename to crates/fhir/tests/data/json/R4B/valueset-evidence-report-section.json diff --git a/crates/fhir/tests/data/R4B/valueset-evidence-report-type.json b/crates/fhir/tests/data/json/R4B/valueset-evidence-report-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-evidence-report-type.json rename to crates/fhir/tests/data/json/R4B/valueset-evidence-report-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-ex-benefitcategory.json b/crates/fhir/tests/data/json/R4B/valueset-ex-benefitcategory.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-ex-benefitcategory.json rename to crates/fhir/tests/data/json/R4B/valueset-ex-benefitcategory.json diff --git a/crates/fhir/tests/data/R4B/valueset-ex-diagnosis-on-admission.json b/crates/fhir/tests/data/json/R4B/valueset-ex-diagnosis-on-admission.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-ex-diagnosis-on-admission.json rename to crates/fhir/tests/data/json/R4B/valueset-ex-diagnosis-on-admission.json diff --git a/crates/fhir/tests/data/R4B/valueset-ex-diagnosisrelatedgroup.json b/crates/fhir/tests/data/json/R4B/valueset-ex-diagnosisrelatedgroup.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-ex-diagnosisrelatedgroup.json rename to crates/fhir/tests/data/json/R4B/valueset-ex-diagnosisrelatedgroup.json diff --git a/crates/fhir/tests/data/R4B/valueset-ex-diagnosistype.json b/crates/fhir/tests/data/json/R4B/valueset-ex-diagnosistype.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-ex-diagnosistype.json rename to crates/fhir/tests/data/json/R4B/valueset-ex-diagnosistype.json diff --git a/crates/fhir/tests/data/R4B/valueset-ex-paymenttype.json b/crates/fhir/tests/data/json/R4B/valueset-ex-paymenttype.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-ex-paymenttype.json rename to crates/fhir/tests/data/json/R4B/valueset-ex-paymenttype.json diff --git a/crates/fhir/tests/data/R4B/valueset-ex-procedure-type.json b/crates/fhir/tests/data/json/R4B/valueset-ex-procedure-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-ex-procedure-type.json rename to crates/fhir/tests/data/json/R4B/valueset-ex-procedure-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-ex-program-code.json b/crates/fhir/tests/data/json/R4B/valueset-ex-program-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-ex-program-code.json rename to crates/fhir/tests/data/json/R4B/valueset-ex-program-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-ex-revenue-center.json b/crates/fhir/tests/data/json/R4B/valueset-ex-revenue-center.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-ex-revenue-center.json rename to crates/fhir/tests/data/json/R4B/valueset-ex-revenue-center.json diff --git a/crates/fhir/tests/data/R4B/valueset-example-expansion.json b/crates/fhir/tests/data/json/R4B/valueset-example-expansion.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-example-expansion.json rename to crates/fhir/tests/data/json/R4B/valueset-example-expansion.json diff --git a/crates/fhir/tests/data/R4B/valueset-example-filter.json b/crates/fhir/tests/data/json/R4B/valueset-example-filter.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-example-filter.json rename to crates/fhir/tests/data/json/R4B/valueset-example-filter.json diff --git a/crates/fhir/tests/data/R4B/valueset-example-hierarchical.json b/crates/fhir/tests/data/json/R4B/valueset-example-hierarchical.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-example-hierarchical.json rename to crates/fhir/tests/data/json/R4B/valueset-example-hierarchical.json diff --git a/crates/fhir/tests/data/R4B/valueset-example-inactive.json b/crates/fhir/tests/data/json/R4B/valueset-example-inactive.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-example-inactive.json rename to crates/fhir/tests/data/json/R4B/valueset-example-inactive.json diff --git a/crates/fhir/tests/data/R4B/valueset-example-intensional.json b/crates/fhir/tests/data/json/R4B/valueset-example-intensional.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-example-intensional.json rename to crates/fhir/tests/data/json/R4B/valueset-example-intensional.json diff --git a/crates/fhir/tests/data/R4B/valueset-example-yesnodontknow.json b/crates/fhir/tests/data/json/R4B/valueset-example-yesnodontknow.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-example-yesnodontknow.json rename to crates/fhir/tests/data/json/R4B/valueset-example-yesnodontknow.json diff --git a/crates/fhir/tests/data/R4B/valueset-example.json b/crates/fhir/tests/data/json/R4B/valueset-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-example.json rename to crates/fhir/tests/data/json/R4B/valueset-example.json diff --git a/crates/fhir/tests/data/R4B/valueset-examplescenario-actor-type.json b/crates/fhir/tests/data/json/R4B/valueset-examplescenario-actor-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-examplescenario-actor-type.json rename to crates/fhir/tests/data/json/R4B/valueset-examplescenario-actor-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-explanationofbenefit-status.json b/crates/fhir/tests/data/json/R4B/valueset-explanationofbenefit-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-explanationofbenefit-status.json rename to crates/fhir/tests/data/json/R4B/valueset-explanationofbenefit-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-expression-language.json b/crates/fhir/tests/data/json/R4B/valueset-expression-language.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-expression-language.json rename to crates/fhir/tests/data/json/R4B/valueset-expression-language.json diff --git a/crates/fhir/tests/data/R4B/valueset-extension-context-type.json b/crates/fhir/tests/data/json/R4B/valueset-extension-context-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-extension-context-type.json rename to crates/fhir/tests/data/json/R4B/valueset-extension-context-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-extensions-ValueSet-author.json b/crates/fhir/tests/data/json/R4B/valueset-extensions-ValueSet-author.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-extensions-ValueSet-author.json rename to crates/fhir/tests/data/json/R4B/valueset-extensions-ValueSet-author.json diff --git a/crates/fhir/tests/data/R4B/valueset-extensions-ValueSet-effective.json b/crates/fhir/tests/data/json/R4B/valueset-extensions-ValueSet-effective.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-extensions-ValueSet-effective.json rename to crates/fhir/tests/data/json/R4B/valueset-extensions-ValueSet-effective.json diff --git a/crates/fhir/tests/data/R4B/valueset-extensions-ValueSet-end.json b/crates/fhir/tests/data/json/R4B/valueset-extensions-ValueSet-end.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-extensions-ValueSet-end.json rename to crates/fhir/tests/data/json/R4B/valueset-extensions-ValueSet-end.json diff --git a/crates/fhir/tests/data/R4B/valueset-extensions-ValueSet-keyword.json b/crates/fhir/tests/data/json/R4B/valueset-extensions-ValueSet-keyword.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-extensions-ValueSet-keyword.json rename to crates/fhir/tests/data/json/R4B/valueset-extensions-ValueSet-keyword.json diff --git a/crates/fhir/tests/data/R4B/valueset-extensions-ValueSet-workflow.json b/crates/fhir/tests/data/json/R4B/valueset-extensions-ValueSet-workflow.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-extensions-ValueSet-workflow.json rename to crates/fhir/tests/data/json/R4B/valueset-extensions-ValueSet-workflow.json diff --git a/crates/fhir/tests/data/R4B/valueset-feeding-device.json b/crates/fhir/tests/data/json/R4B/valueset-feeding-device.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-feeding-device.json rename to crates/fhir/tests/data/json/R4B/valueset-feeding-device.json diff --git a/crates/fhir/tests/data/R4B/valueset-fhir-element-types.json b/crates/fhir/tests/data/json/R4B/valueset-fhir-element-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-fhir-element-types.json rename to crates/fhir/tests/data/json/R4B/valueset-fhir-element-types.json diff --git a/crates/fhir/tests/data/R4B/valueset-fhirpath-types.json b/crates/fhir/tests/data/json/R4B/valueset-fhirpath-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-fhirpath-types.json rename to crates/fhir/tests/data/json/R4B/valueset-fhirpath-types.json diff --git a/crates/fhir/tests/data/R4B/valueset-filter-operator.json b/crates/fhir/tests/data/json/R4B/valueset-filter-operator.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-filter-operator.json rename to crates/fhir/tests/data/json/R4B/valueset-filter-operator.json diff --git a/crates/fhir/tests/data/R4B/valueset-flag-category.json b/crates/fhir/tests/data/json/R4B/valueset-flag-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-flag-category.json rename to crates/fhir/tests/data/json/R4B/valueset-flag-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-flag-code.json b/crates/fhir/tests/data/json/R4B/valueset-flag-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-flag-code.json rename to crates/fhir/tests/data/json/R4B/valueset-flag-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-flag-priority.json b/crates/fhir/tests/data/json/R4B/valueset-flag-priority.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-flag-priority.json rename to crates/fhir/tests/data/json/R4B/valueset-flag-priority.json diff --git a/crates/fhir/tests/data/R4B/valueset-flag-status.json b/crates/fhir/tests/data/json/R4B/valueset-flag-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-flag-status.json rename to crates/fhir/tests/data/json/R4B/valueset-flag-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-fm-status.json b/crates/fhir/tests/data/json/R4B/valueset-fm-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-fm-status.json rename to crates/fhir/tests/data/json/R4B/valueset-fm-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-focal-subject.json b/crates/fhir/tests/data/json/R4B/valueset-focal-subject.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-focal-subject.json rename to crates/fhir/tests/data/json/R4B/valueset-focal-subject.json diff --git a/crates/fhir/tests/data/R4B/valueset-focus-characteristic-code.json b/crates/fhir/tests/data/json/R4B/valueset-focus-characteristic-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-focus-characteristic-code.json rename to crates/fhir/tests/data/json/R4B/valueset-focus-characteristic-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-food-type.json b/crates/fhir/tests/data/json/R4B/valueset-food-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-food-type.json rename to crates/fhir/tests/data/json/R4B/valueset-food-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-formatcodes.json b/crates/fhir/tests/data/json/R4B/valueset-formatcodes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-formatcodes.json rename to crates/fhir/tests/data/json/R4B/valueset-formatcodes.json diff --git a/crates/fhir/tests/data/R4B/valueset-forms.json b/crates/fhir/tests/data/json/R4B/valueset-forms.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-forms.json rename to crates/fhir/tests/data/json/R4B/valueset-forms.json diff --git a/crates/fhir/tests/data/R4B/valueset-fundsreserve.json b/crates/fhir/tests/data/json/R4B/valueset-fundsreserve.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-fundsreserve.json rename to crates/fhir/tests/data/json/R4B/valueset-fundsreserve.json diff --git a/crates/fhir/tests/data/R4B/valueset-gender-identity.json b/crates/fhir/tests/data/json/R4B/valueset-gender-identity.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-gender-identity.json rename to crates/fhir/tests/data/json/R4B/valueset-gender-identity.json diff --git a/crates/fhir/tests/data/R4B/valueset-genenames.json b/crates/fhir/tests/data/json/R4B/valueset-genenames.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-genenames.json rename to crates/fhir/tests/data/json/R4B/valueset-genenames.json diff --git a/crates/fhir/tests/data/R4B/valueset-goal-achievement.json b/crates/fhir/tests/data/json/R4B/valueset-goal-achievement.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-goal-achievement.json rename to crates/fhir/tests/data/json/R4B/valueset-goal-achievement.json diff --git a/crates/fhir/tests/data/R4B/valueset-goal-category.json b/crates/fhir/tests/data/json/R4B/valueset-goal-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-goal-category.json rename to crates/fhir/tests/data/json/R4B/valueset-goal-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-goal-priority.json b/crates/fhir/tests/data/json/R4B/valueset-goal-priority.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-goal-priority.json rename to crates/fhir/tests/data/json/R4B/valueset-goal-priority.json diff --git a/crates/fhir/tests/data/R4B/valueset-goal-start-event.json b/crates/fhir/tests/data/json/R4B/valueset-goal-start-event.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-goal-start-event.json rename to crates/fhir/tests/data/json/R4B/valueset-goal-start-event.json diff --git a/crates/fhir/tests/data/R4B/valueset-goal-status.json b/crates/fhir/tests/data/json/R4B/valueset-goal-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-goal-status.json rename to crates/fhir/tests/data/json/R4B/valueset-goal-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-graph-compartment-rule.json b/crates/fhir/tests/data/json/R4B/valueset-graph-compartment-rule.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-graph-compartment-rule.json rename to crates/fhir/tests/data/json/R4B/valueset-graph-compartment-rule.json diff --git a/crates/fhir/tests/data/R4B/valueset-graph-compartment-use.json b/crates/fhir/tests/data/json/R4B/valueset-graph-compartment-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-graph-compartment-use.json rename to crates/fhir/tests/data/json/R4B/valueset-graph-compartment-use.json diff --git a/crates/fhir/tests/data/R4B/valueset-group-measure.json b/crates/fhir/tests/data/json/R4B/valueset-group-measure.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-group-measure.json rename to crates/fhir/tests/data/json/R4B/valueset-group-measure.json diff --git a/crates/fhir/tests/data/R4B/valueset-group-type.json b/crates/fhir/tests/data/json/R4B/valueset-group-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-group-type.json rename to crates/fhir/tests/data/json/R4B/valueset-group-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-guidance-response-status.json b/crates/fhir/tests/data/json/R4B/valueset-guidance-response-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-guidance-response-status.json rename to crates/fhir/tests/data/json/R4B/valueset-guidance-response-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-guide-page-generation.json b/crates/fhir/tests/data/json/R4B/valueset-guide-page-generation.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-guide-page-generation.json rename to crates/fhir/tests/data/json/R4B/valueset-guide-page-generation.json diff --git a/crates/fhir/tests/data/R4B/valueset-guide-parameter-code.json b/crates/fhir/tests/data/json/R4B/valueset-guide-parameter-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-guide-parameter-code.json rename to crates/fhir/tests/data/json/R4B/valueset-guide-parameter-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-handling-condition.json b/crates/fhir/tests/data/json/R4B/valueset-handling-condition.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-handling-condition.json rename to crates/fhir/tests/data/json/R4B/valueset-handling-condition.json diff --git a/crates/fhir/tests/data/R4B/valueset-history-absent-reason.json b/crates/fhir/tests/data/json/R4B/valueset-history-absent-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-history-absent-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-history-absent-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-history-status.json b/crates/fhir/tests/data/json/R4B/valueset-history-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-history-status.json rename to crates/fhir/tests/data/json/R4B/valueset-history-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-http-operations.json b/crates/fhir/tests/data/json/R4B/valueset-http-operations.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-http-operations.json rename to crates/fhir/tests/data/json/R4B/valueset-http-operations.json diff --git a/crates/fhir/tests/data/R4B/valueset-http-verb.json b/crates/fhir/tests/data/json/R4B/valueset-http-verb.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-http-verb.json rename to crates/fhir/tests/data/json/R4B/valueset-http-verb.json diff --git a/crates/fhir/tests/data/R4B/valueset-icd-10-procedures.json b/crates/fhir/tests/data/json/R4B/valueset-icd-10-procedures.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-icd-10-procedures.json rename to crates/fhir/tests/data/json/R4B/valueset-icd-10-procedures.json diff --git a/crates/fhir/tests/data/R4B/valueset-icd-10.json b/crates/fhir/tests/data/json/R4B/valueset-icd-10.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-icd-10.json rename to crates/fhir/tests/data/json/R4B/valueset-icd-10.json diff --git a/crates/fhir/tests/data/R4B/valueset-identifier-type.json b/crates/fhir/tests/data/json/R4B/valueset-identifier-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-identifier-type.json rename to crates/fhir/tests/data/json/R4B/valueset-identifier-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-identifier-use.json b/crates/fhir/tests/data/json/R4B/valueset-identifier-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-identifier-use.json rename to crates/fhir/tests/data/json/R4B/valueset-identifier-use.json diff --git a/crates/fhir/tests/data/R4B/valueset-identity-assuranceLevel.json b/crates/fhir/tests/data/json/R4B/valueset-identity-assuranceLevel.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-identity-assuranceLevel.json rename to crates/fhir/tests/data/json/R4B/valueset-identity-assuranceLevel.json diff --git a/crates/fhir/tests/data/R4B/valueset-imagingstudy-status.json b/crates/fhir/tests/data/json/R4B/valueset-imagingstudy-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-imagingstudy-status.json rename to crates/fhir/tests/data/json/R4B/valueset-imagingstudy-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-immunization-evaluation-dose-status-reason.json b/crates/fhir/tests/data/json/R4B/valueset-immunization-evaluation-dose-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-immunization-evaluation-dose-status-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-immunization-evaluation-dose-status-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-immunization-evaluation-dose-status.json b/crates/fhir/tests/data/json/R4B/valueset-immunization-evaluation-dose-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-immunization-evaluation-dose-status.json rename to crates/fhir/tests/data/json/R4B/valueset-immunization-evaluation-dose-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-immunization-evaluation-status.json b/crates/fhir/tests/data/json/R4B/valueset-immunization-evaluation-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-immunization-evaluation-status.json rename to crates/fhir/tests/data/json/R4B/valueset-immunization-evaluation-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-immunization-evaluation-target-disease.json b/crates/fhir/tests/data/json/R4B/valueset-immunization-evaluation-target-disease.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-immunization-evaluation-target-disease.json rename to crates/fhir/tests/data/json/R4B/valueset-immunization-evaluation-target-disease.json diff --git a/crates/fhir/tests/data/R4B/valueset-immunization-function.json b/crates/fhir/tests/data/json/R4B/valueset-immunization-function.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-immunization-function.json rename to crates/fhir/tests/data/json/R4B/valueset-immunization-function.json diff --git a/crates/fhir/tests/data/R4B/valueset-immunization-funding-source.json b/crates/fhir/tests/data/json/R4B/valueset-immunization-funding-source.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-immunization-funding-source.json rename to crates/fhir/tests/data/json/R4B/valueset-immunization-funding-source.json diff --git a/crates/fhir/tests/data/R4B/valueset-immunization-origin.json b/crates/fhir/tests/data/json/R4B/valueset-immunization-origin.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-immunization-origin.json rename to crates/fhir/tests/data/json/R4B/valueset-immunization-origin.json diff --git a/crates/fhir/tests/data/R4B/valueset-immunization-program-eligibility.json b/crates/fhir/tests/data/json/R4B/valueset-immunization-program-eligibility.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-immunization-program-eligibility.json rename to crates/fhir/tests/data/json/R4B/valueset-immunization-program-eligibility.json diff --git a/crates/fhir/tests/data/R4B/valueset-immunization-reason.json b/crates/fhir/tests/data/json/R4B/valueset-immunization-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-immunization-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-immunization-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-immunization-recommendation-date-criterion.json b/crates/fhir/tests/data/json/R4B/valueset-immunization-recommendation-date-criterion.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-immunization-recommendation-date-criterion.json rename to crates/fhir/tests/data/json/R4B/valueset-immunization-recommendation-date-criterion.json diff --git a/crates/fhir/tests/data/R4B/valueset-immunization-recommendation-reason.json b/crates/fhir/tests/data/json/R4B/valueset-immunization-recommendation-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-immunization-recommendation-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-immunization-recommendation-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-immunization-recommendation-status.json b/crates/fhir/tests/data/json/R4B/valueset-immunization-recommendation-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-immunization-recommendation-status.json rename to crates/fhir/tests/data/json/R4B/valueset-immunization-recommendation-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-immunization-recommendation-target-disease.json b/crates/fhir/tests/data/json/R4B/valueset-immunization-recommendation-target-disease.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-immunization-recommendation-target-disease.json rename to crates/fhir/tests/data/json/R4B/valueset-immunization-recommendation-target-disease.json diff --git a/crates/fhir/tests/data/R4B/valueset-immunization-route.json b/crates/fhir/tests/data/json/R4B/valueset-immunization-route.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-immunization-route.json rename to crates/fhir/tests/data/json/R4B/valueset-immunization-route.json diff --git a/crates/fhir/tests/data/R4B/valueset-immunization-site.json b/crates/fhir/tests/data/json/R4B/valueset-immunization-site.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-immunization-site.json rename to crates/fhir/tests/data/json/R4B/valueset-immunization-site.json diff --git a/crates/fhir/tests/data/R4B/valueset-immunization-status-reason.json b/crates/fhir/tests/data/json/R4B/valueset-immunization-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-immunization-status-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-immunization-status-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-immunization-status.json b/crates/fhir/tests/data/json/R4B/valueset-immunization-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-immunization-status.json rename to crates/fhir/tests/data/json/R4B/valueset-immunization-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-immunization-subpotent-reason.json b/crates/fhir/tests/data/json/R4B/valueset-immunization-subpotent-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-immunization-subpotent-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-immunization-subpotent-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-immunization-target-disease.json b/crates/fhir/tests/data/json/R4B/valueset-immunization-target-disease.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-immunization-target-disease.json rename to crates/fhir/tests/data/json/R4B/valueset-immunization-target-disease.json diff --git a/crates/fhir/tests/data/R4B/valueset-ingredient-function.json b/crates/fhir/tests/data/json/R4B/valueset-ingredient-function.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-ingredient-function.json rename to crates/fhir/tests/data/json/R4B/valueset-ingredient-function.json diff --git a/crates/fhir/tests/data/R4B/valueset-ingredient-manufacturer-role.json b/crates/fhir/tests/data/json/R4B/valueset-ingredient-manufacturer-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-ingredient-manufacturer-role.json rename to crates/fhir/tests/data/json/R4B/valueset-ingredient-manufacturer-role.json diff --git a/crates/fhir/tests/data/R4B/valueset-ingredient-role.json b/crates/fhir/tests/data/json/R4B/valueset-ingredient-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-ingredient-role.json rename to crates/fhir/tests/data/json/R4B/valueset-ingredient-role.json diff --git a/crates/fhir/tests/data/R4B/valueset-insuranceplan-applicability.json b/crates/fhir/tests/data/json/R4B/valueset-insuranceplan-applicability.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-insuranceplan-applicability.json rename to crates/fhir/tests/data/json/R4B/valueset-insuranceplan-applicability.json diff --git a/crates/fhir/tests/data/R4B/valueset-insuranceplan-type.json b/crates/fhir/tests/data/json/R4B/valueset-insuranceplan-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-insuranceplan-type.json rename to crates/fhir/tests/data/json/R4B/valueset-insuranceplan-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-interactant.json b/crates/fhir/tests/data/json/R4B/valueset-interactant.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-interactant.json rename to crates/fhir/tests/data/json/R4B/valueset-interactant.json diff --git a/crates/fhir/tests/data/R4B/valueset-interaction-effect.json b/crates/fhir/tests/data/json/R4B/valueset-interaction-effect.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-interaction-effect.json rename to crates/fhir/tests/data/json/R4B/valueset-interaction-effect.json diff --git a/crates/fhir/tests/data/R4B/valueset-interaction-incidence.json b/crates/fhir/tests/data/json/R4B/valueset-interaction-incidence.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-interaction-incidence.json rename to crates/fhir/tests/data/json/R4B/valueset-interaction-incidence.json diff --git a/crates/fhir/tests/data/R4B/valueset-interaction-management.json b/crates/fhir/tests/data/json/R4B/valueset-interaction-management.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-interaction-management.json rename to crates/fhir/tests/data/json/R4B/valueset-interaction-management.json diff --git a/crates/fhir/tests/data/R4B/valueset-interaction-trigger.json b/crates/fhir/tests/data/json/R4B/valueset-interaction-trigger.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-interaction-trigger.json rename to crates/fhir/tests/data/json/R4B/valueset-interaction-trigger.json diff --git a/crates/fhir/tests/data/R4B/valueset-interaction-type.json b/crates/fhir/tests/data/json/R4B/valueset-interaction-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-interaction-type.json rename to crates/fhir/tests/data/json/R4B/valueset-interaction-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-investigation-sets.json b/crates/fhir/tests/data/json/R4B/valueset-investigation-sets.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-investigation-sets.json rename to crates/fhir/tests/data/json/R4B/valueset-investigation-sets.json diff --git a/crates/fhir/tests/data/R4B/valueset-invoice-priceComponentType.json b/crates/fhir/tests/data/json/R4B/valueset-invoice-priceComponentType.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-invoice-priceComponentType.json rename to crates/fhir/tests/data/json/R4B/valueset-invoice-priceComponentType.json diff --git a/crates/fhir/tests/data/R4B/valueset-invoice-status.json b/crates/fhir/tests/data/json/R4B/valueset-invoice-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-invoice-status.json rename to crates/fhir/tests/data/json/R4B/valueset-invoice-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-iso3166-1-2.json b/crates/fhir/tests/data/json/R4B/valueset-iso3166-1-2.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-iso3166-1-2.json rename to crates/fhir/tests/data/json/R4B/valueset-iso3166-1-2.json diff --git a/crates/fhir/tests/data/R4B/valueset-iso3166-1-3.json b/crates/fhir/tests/data/json/R4B/valueset-iso3166-1-3.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-iso3166-1-3.json rename to crates/fhir/tests/data/json/R4B/valueset-iso3166-1-3.json diff --git a/crates/fhir/tests/data/R4B/valueset-iso3166-1-N.json b/crates/fhir/tests/data/json/R4B/valueset-iso3166-1-N.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-iso3166-1-N.json rename to crates/fhir/tests/data/json/R4B/valueset-iso3166-1-N.json diff --git a/crates/fhir/tests/data/R4B/valueset-issue-severity.json b/crates/fhir/tests/data/json/R4B/valueset-issue-severity.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-issue-severity.json rename to crates/fhir/tests/data/json/R4B/valueset-issue-severity.json diff --git a/crates/fhir/tests/data/R4B/valueset-issue-type.json b/crates/fhir/tests/data/json/R4B/valueset-issue-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-issue-type.json rename to crates/fhir/tests/data/json/R4B/valueset-issue-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-item-type.json b/crates/fhir/tests/data/json/R4B/valueset-item-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-item-type.json rename to crates/fhir/tests/data/json/R4B/valueset-item-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-jurisdiction.json b/crates/fhir/tests/data/json/R4B/valueset-jurisdiction.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-jurisdiction.json rename to crates/fhir/tests/data/json/R4B/valueset-jurisdiction.json diff --git a/crates/fhir/tests/data/R4B/valueset-knowledge-resource-types.json b/crates/fhir/tests/data/json/R4B/valueset-knowledge-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-knowledge-resource-types.json rename to crates/fhir/tests/data/json/R4B/valueset-knowledge-resource-types.json diff --git a/crates/fhir/tests/data/R4B/valueset-language-preference-type.json b/crates/fhir/tests/data/json/R4B/valueset-language-preference-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-language-preference-type.json rename to crates/fhir/tests/data/json/R4B/valueset-language-preference-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-languages.json b/crates/fhir/tests/data/json/R4B/valueset-languages.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-languages.json rename to crates/fhir/tests/data/json/R4B/valueset-languages.json diff --git a/crates/fhir/tests/data/R4B/valueset-legal-status-of-supply.json b/crates/fhir/tests/data/json/R4B/valueset-legal-status-of-supply.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-legal-status-of-supply.json rename to crates/fhir/tests/data/json/R4B/valueset-legal-status-of-supply.json diff --git a/crates/fhir/tests/data/R4B/valueset-library-type.json b/crates/fhir/tests/data/json/R4B/valueset-library-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-library-type.json rename to crates/fhir/tests/data/json/R4B/valueset-library-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-link-type.json b/crates/fhir/tests/data/json/R4B/valueset-link-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-link-type.json rename to crates/fhir/tests/data/json/R4B/valueset-link-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-linkage-type.json b/crates/fhir/tests/data/json/R4B/valueset-linkage-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-linkage-type.json rename to crates/fhir/tests/data/json/R4B/valueset-linkage-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-lipid-ldl-codes.json b/crates/fhir/tests/data/json/R4B/valueset-lipid-ldl-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-lipid-ldl-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-lipid-ldl-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-list-empty-reason.json b/crates/fhir/tests/data/json/R4B/valueset-list-empty-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-list-empty-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-list-empty-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-list-example-codes.json b/crates/fhir/tests/data/json/R4B/valueset-list-example-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-list-example-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-list-example-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-list-item-flag.json b/crates/fhir/tests/data/json/R4B/valueset-list-item-flag.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-list-item-flag.json rename to crates/fhir/tests/data/json/R4B/valueset-list-item-flag.json diff --git a/crates/fhir/tests/data/R4B/valueset-list-mode.json b/crates/fhir/tests/data/json/R4B/valueset-list-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-list-mode.json rename to crates/fhir/tests/data/json/R4B/valueset-list-mode.json diff --git a/crates/fhir/tests/data/R4B/valueset-list-order.json b/crates/fhir/tests/data/json/R4B/valueset-list-order.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-list-order.json rename to crates/fhir/tests/data/json/R4B/valueset-list-order.json diff --git a/crates/fhir/tests/data/R4B/valueset-list-status.json b/crates/fhir/tests/data/json/R4B/valueset-list-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-list-status.json rename to crates/fhir/tests/data/json/R4B/valueset-list-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-location-mode.json b/crates/fhir/tests/data/json/R4B/valueset-location-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-location-mode.json rename to crates/fhir/tests/data/json/R4B/valueset-location-mode.json diff --git a/crates/fhir/tests/data/R4B/valueset-location-physical-type.json b/crates/fhir/tests/data/json/R4B/valueset-location-physical-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-location-physical-type.json rename to crates/fhir/tests/data/json/R4B/valueset-location-physical-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-location-status.json b/crates/fhir/tests/data/json/R4B/valueset-location-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-location-status.json rename to crates/fhir/tests/data/json/R4B/valueset-location-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-manifestation-or-symptom.json b/crates/fhir/tests/data/json/R4B/valueset-manifestation-or-symptom.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-manifestation-or-symptom.json rename to crates/fhir/tests/data/json/R4B/valueset-manifestation-or-symptom.json diff --git a/crates/fhir/tests/data/R4B/valueset-map-context-type.json b/crates/fhir/tests/data/json/R4B/valueset-map-context-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-map-context-type.json rename to crates/fhir/tests/data/json/R4B/valueset-map-context-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-map-group-type-mode.json b/crates/fhir/tests/data/json/R4B/valueset-map-group-type-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-map-group-type-mode.json rename to crates/fhir/tests/data/json/R4B/valueset-map-group-type-mode.json diff --git a/crates/fhir/tests/data/R4B/valueset-map-input-mode.json b/crates/fhir/tests/data/json/R4B/valueset-map-input-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-map-input-mode.json rename to crates/fhir/tests/data/json/R4B/valueset-map-input-mode.json diff --git a/crates/fhir/tests/data/R4B/valueset-map-model-mode.json b/crates/fhir/tests/data/json/R4B/valueset-map-model-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-map-model-mode.json rename to crates/fhir/tests/data/json/R4B/valueset-map-model-mode.json diff --git a/crates/fhir/tests/data/R4B/valueset-map-source-list-mode.json b/crates/fhir/tests/data/json/R4B/valueset-map-source-list-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-map-source-list-mode.json rename to crates/fhir/tests/data/json/R4B/valueset-map-source-list-mode.json diff --git a/crates/fhir/tests/data/R4B/valueset-map-target-list-mode.json b/crates/fhir/tests/data/json/R4B/valueset-map-target-list-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-map-target-list-mode.json rename to crates/fhir/tests/data/json/R4B/valueset-map-target-list-mode.json diff --git a/crates/fhir/tests/data/R4B/valueset-map-transform.json b/crates/fhir/tests/data/json/R4B/valueset-map-transform.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-map-transform.json rename to crates/fhir/tests/data/json/R4B/valueset-map-transform.json diff --git a/crates/fhir/tests/data/R4B/valueset-marital-status.json b/crates/fhir/tests/data/json/R4B/valueset-marital-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-marital-status.json rename to crates/fhir/tests/data/json/R4B/valueset-marital-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-measure-data-usage.json b/crates/fhir/tests/data/json/R4B/valueset-measure-data-usage.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-measure-data-usage.json rename to crates/fhir/tests/data/json/R4B/valueset-measure-data-usage.json diff --git a/crates/fhir/tests/data/R4B/valueset-measure-group-example.json b/crates/fhir/tests/data/json/R4B/valueset-measure-group-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-measure-group-example.json rename to crates/fhir/tests/data/json/R4B/valueset-measure-group-example.json diff --git a/crates/fhir/tests/data/R4B/valueset-measure-improvement-notation.json b/crates/fhir/tests/data/json/R4B/valueset-measure-improvement-notation.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-measure-improvement-notation.json rename to crates/fhir/tests/data/json/R4B/valueset-measure-improvement-notation.json diff --git a/crates/fhir/tests/data/R4B/valueset-measure-population.json b/crates/fhir/tests/data/json/R4B/valueset-measure-population.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-measure-population.json rename to crates/fhir/tests/data/json/R4B/valueset-measure-population.json diff --git a/crates/fhir/tests/data/R4B/valueset-measure-report-status.json b/crates/fhir/tests/data/json/R4B/valueset-measure-report-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-measure-report-status.json rename to crates/fhir/tests/data/json/R4B/valueset-measure-report-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-measure-report-type.json b/crates/fhir/tests/data/json/R4B/valueset-measure-report-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-measure-report-type.json rename to crates/fhir/tests/data/json/R4B/valueset-measure-report-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-measure-scoring.json b/crates/fhir/tests/data/json/R4B/valueset-measure-scoring.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-measure-scoring.json rename to crates/fhir/tests/data/json/R4B/valueset-measure-scoring.json diff --git a/crates/fhir/tests/data/R4B/valueset-measure-stratifier-example.json b/crates/fhir/tests/data/json/R4B/valueset-measure-stratifier-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-measure-stratifier-example.json rename to crates/fhir/tests/data/json/R4B/valueset-measure-stratifier-example.json diff --git a/crates/fhir/tests/data/R4B/valueset-measure-supplemental-data-example.json b/crates/fhir/tests/data/json/R4B/valueset-measure-supplemental-data-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-measure-supplemental-data-example.json rename to crates/fhir/tests/data/json/R4B/valueset-measure-supplemental-data-example.json diff --git a/crates/fhir/tests/data/R4B/valueset-measure-type.json b/crates/fhir/tests/data/json/R4B/valueset-measure-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-measure-type.json rename to crates/fhir/tests/data/json/R4B/valueset-measure-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-measurement-property.json b/crates/fhir/tests/data/json/R4B/valueset-measurement-property.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-measurement-property.json rename to crates/fhir/tests/data/json/R4B/valueset-measurement-property.json diff --git a/crates/fhir/tests/data/R4B/valueset-measurereport-stratifier-value-example.json b/crates/fhir/tests/data/json/R4B/valueset-measurereport-stratifier-value-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-measurereport-stratifier-value-example.json rename to crates/fhir/tests/data/json/R4B/valueset-measurereport-stratifier-value-example.json diff --git a/crates/fhir/tests/data/R4B/valueset-med-admin-perform-function.json b/crates/fhir/tests/data/json/R4B/valueset-med-admin-perform-function.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-med-admin-perform-function.json rename to crates/fhir/tests/data/json/R4B/valueset-med-admin-perform-function.json diff --git a/crates/fhir/tests/data/R4B/valueset-media-modality.json b/crates/fhir/tests/data/json/R4B/valueset-media-modality.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-media-modality.json rename to crates/fhir/tests/data/json/R4B/valueset-media-modality.json diff --git a/crates/fhir/tests/data/R4B/valueset-media-type.json b/crates/fhir/tests/data/json/R4B/valueset-media-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-media-type.json rename to crates/fhir/tests/data/json/R4B/valueset-media-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-media-view.json b/crates/fhir/tests/data/json/R4B/valueset-media-view.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-media-view.json rename to crates/fhir/tests/data/json/R4B/valueset-media-view.json diff --git a/crates/fhir/tests/data/R4B/valueset-medication-admin-category.json b/crates/fhir/tests/data/json/R4B/valueset-medication-admin-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medication-admin-category.json rename to crates/fhir/tests/data/json/R4B/valueset-medication-admin-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-medication-admin-status.json b/crates/fhir/tests/data/json/R4B/valueset-medication-admin-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medication-admin-status.json rename to crates/fhir/tests/data/json/R4B/valueset-medication-admin-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-medication-as-needed-reason.json b/crates/fhir/tests/data/json/R4B/valueset-medication-as-needed-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medication-as-needed-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-medication-as-needed-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-medication-codes.json b/crates/fhir/tests/data/json/R4B/valueset-medication-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medication-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-medication-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-medication-form-codes.json b/crates/fhir/tests/data/json/R4B/valueset-medication-form-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medication-form-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-medication-form-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-medication-statement-category.json b/crates/fhir/tests/data/json/R4B/valueset-medication-statement-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medication-statement-category.json rename to crates/fhir/tests/data/json/R4B/valueset-medication-statement-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-medication-statement-status.json b/crates/fhir/tests/data/json/R4B/valueset-medication-statement-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medication-statement-status.json rename to crates/fhir/tests/data/json/R4B/valueset-medication-statement-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-medication-status.json b/crates/fhir/tests/data/json/R4B/valueset-medication-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medication-status.json rename to crates/fhir/tests/data/json/R4B/valueset-medication-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicationdispense-category.json b/crates/fhir/tests/data/json/R4B/valueset-medicationdispense-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicationdispense-category.json rename to crates/fhir/tests/data/json/R4B/valueset-medicationdispense-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicationdispense-performer-function.json b/crates/fhir/tests/data/json/R4B/valueset-medicationdispense-performer-function.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicationdispense-performer-function.json rename to crates/fhir/tests/data/json/R4B/valueset-medicationdispense-performer-function.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicationdispense-status-reason.json b/crates/fhir/tests/data/json/R4B/valueset-medicationdispense-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicationdispense-status-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-medicationdispense-status-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicationdispense-status.json b/crates/fhir/tests/data/json/R4B/valueset-medicationdispense-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicationdispense-status.json rename to crates/fhir/tests/data/json/R4B/valueset-medicationdispense-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicationknowledge-characteristic.json b/crates/fhir/tests/data/json/R4B/valueset-medicationknowledge-characteristic.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicationknowledge-characteristic.json rename to crates/fhir/tests/data/json/R4B/valueset-medicationknowledge-characteristic.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicationknowledge-package-type.json b/crates/fhir/tests/data/json/R4B/valueset-medicationknowledge-package-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicationknowledge-package-type.json rename to crates/fhir/tests/data/json/R4B/valueset-medicationknowledge-package-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicationknowledge-status.json b/crates/fhir/tests/data/json/R4B/valueset-medicationknowledge-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicationknowledge-status.json rename to crates/fhir/tests/data/json/R4B/valueset-medicationknowledge-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicationrequest-category.json b/crates/fhir/tests/data/json/R4B/valueset-medicationrequest-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicationrequest-category.json rename to crates/fhir/tests/data/json/R4B/valueset-medicationrequest-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicationrequest-course-of-therapy.json b/crates/fhir/tests/data/json/R4B/valueset-medicationrequest-course-of-therapy.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicationrequest-course-of-therapy.json rename to crates/fhir/tests/data/json/R4B/valueset-medicationrequest-course-of-therapy.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicationrequest-intent.json b/crates/fhir/tests/data/json/R4B/valueset-medicationrequest-intent.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicationrequest-intent.json rename to crates/fhir/tests/data/json/R4B/valueset-medicationrequest-intent.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicationrequest-status-reason.json b/crates/fhir/tests/data/json/R4B/valueset-medicationrequest-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicationrequest-status-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-medicationrequest-status-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicationrequest-status.json b/crates/fhir/tests/data/json/R4B/valueset-medicationrequest-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicationrequest-status.json rename to crates/fhir/tests/data/json/R4B/valueset-medicationrequest-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicinal-product-additional-monitoring.json b/crates/fhir/tests/data/json/R4B/valueset-medicinal-product-additional-monitoring.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicinal-product-additional-monitoring.json rename to crates/fhir/tests/data/json/R4B/valueset-medicinal-product-additional-monitoring.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicinal-product-confidentiality.json b/crates/fhir/tests/data/json/R4B/valueset-medicinal-product-confidentiality.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicinal-product-confidentiality.json rename to crates/fhir/tests/data/json/R4B/valueset-medicinal-product-confidentiality.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicinal-product-contact-type.json b/crates/fhir/tests/data/json/R4B/valueset-medicinal-product-contact-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicinal-product-contact-type.json rename to crates/fhir/tests/data/json/R4B/valueset-medicinal-product-contact-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicinal-product-cross-reference-type.json b/crates/fhir/tests/data/json/R4B/valueset-medicinal-product-cross-reference-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicinal-product-cross-reference-type.json rename to crates/fhir/tests/data/json/R4B/valueset-medicinal-product-cross-reference-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicinal-product-domain.json b/crates/fhir/tests/data/json/R4B/valueset-medicinal-product-domain.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicinal-product-domain.json rename to crates/fhir/tests/data/json/R4B/valueset-medicinal-product-domain.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicinal-product-name-part-type.json b/crates/fhir/tests/data/json/R4B/valueset-medicinal-product-name-part-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicinal-product-name-part-type.json rename to crates/fhir/tests/data/json/R4B/valueset-medicinal-product-name-part-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicinal-product-name-type.json b/crates/fhir/tests/data/json/R4B/valueset-medicinal-product-name-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicinal-product-name-type.json rename to crates/fhir/tests/data/json/R4B/valueset-medicinal-product-name-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicinal-product-package-type.json b/crates/fhir/tests/data/json/R4B/valueset-medicinal-product-package-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicinal-product-package-type.json rename to crates/fhir/tests/data/json/R4B/valueset-medicinal-product-package-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicinal-product-pediatric-use.json b/crates/fhir/tests/data/json/R4B/valueset-medicinal-product-pediatric-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicinal-product-pediatric-use.json rename to crates/fhir/tests/data/json/R4B/valueset-medicinal-product-pediatric-use.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicinal-product-special-measures.json b/crates/fhir/tests/data/json/R4B/valueset-medicinal-product-special-measures.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicinal-product-special-measures.json rename to crates/fhir/tests/data/json/R4B/valueset-medicinal-product-special-measures.json diff --git a/crates/fhir/tests/data/R4B/valueset-medicinal-product-type.json b/crates/fhir/tests/data/json/R4B/valueset-medicinal-product-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-medicinal-product-type.json rename to crates/fhir/tests/data/json/R4B/valueset-medicinal-product-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-message-events.json b/crates/fhir/tests/data/json/R4B/valueset-message-events.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-message-events.json rename to crates/fhir/tests/data/json/R4B/valueset-message-events.json diff --git a/crates/fhir/tests/data/R4B/valueset-message-reason-encounter.json b/crates/fhir/tests/data/json/R4B/valueset-message-reason-encounter.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-message-reason-encounter.json rename to crates/fhir/tests/data/json/R4B/valueset-message-reason-encounter.json diff --git a/crates/fhir/tests/data/R4B/valueset-message-significance-category.json b/crates/fhir/tests/data/json/R4B/valueset-message-significance-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-message-significance-category.json rename to crates/fhir/tests/data/json/R4B/valueset-message-significance-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-message-transport.json b/crates/fhir/tests/data/json/R4B/valueset-message-transport.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-message-transport.json rename to crates/fhir/tests/data/json/R4B/valueset-message-transport.json diff --git a/crates/fhir/tests/data/R4B/valueset-messageheader-response-request.json b/crates/fhir/tests/data/json/R4B/valueset-messageheader-response-request.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-messageheader-response-request.json rename to crates/fhir/tests/data/json/R4B/valueset-messageheader-response-request.json diff --git a/crates/fhir/tests/data/R4B/valueset-metric-calibration-state.json b/crates/fhir/tests/data/json/R4B/valueset-metric-calibration-state.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-metric-calibration-state.json rename to crates/fhir/tests/data/json/R4B/valueset-metric-calibration-state.json diff --git a/crates/fhir/tests/data/R4B/valueset-metric-calibration-type.json b/crates/fhir/tests/data/json/R4B/valueset-metric-calibration-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-metric-calibration-type.json rename to crates/fhir/tests/data/json/R4B/valueset-metric-calibration-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-metric-category.json b/crates/fhir/tests/data/json/R4B/valueset-metric-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-metric-category.json rename to crates/fhir/tests/data/json/R4B/valueset-metric-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-metric-color.json b/crates/fhir/tests/data/json/R4B/valueset-metric-color.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-metric-color.json rename to crates/fhir/tests/data/json/R4B/valueset-metric-color.json diff --git a/crates/fhir/tests/data/R4B/valueset-metric-operational-status.json b/crates/fhir/tests/data/json/R4B/valueset-metric-operational-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-metric-operational-status.json rename to crates/fhir/tests/data/json/R4B/valueset-metric-operational-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-mimetypes.json b/crates/fhir/tests/data/json/R4B/valueset-mimetypes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-mimetypes.json rename to crates/fhir/tests/data/json/R4B/valueset-mimetypes.json diff --git a/crates/fhir/tests/data/R4B/valueset-missing-tooth-reason.json b/crates/fhir/tests/data/json/R4B/valueset-missing-tooth-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-missing-tooth-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-missing-tooth-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-modified-foodtype.json b/crates/fhir/tests/data/json/R4B/valueset-modified-foodtype.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-modified-foodtype.json rename to crates/fhir/tests/data/json/R4B/valueset-modified-foodtype.json diff --git a/crates/fhir/tests/data/R4B/valueset-name-assembly-order.json b/crates/fhir/tests/data/json/R4B/valueset-name-assembly-order.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-name-assembly-order.json rename to crates/fhir/tests/data/json/R4B/valueset-name-assembly-order.json diff --git a/crates/fhir/tests/data/R4B/valueset-name-part-qualifier.json b/crates/fhir/tests/data/json/R4B/valueset-name-part-qualifier.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-name-part-qualifier.json rename to crates/fhir/tests/data/json/R4B/valueset-name-part-qualifier.json diff --git a/crates/fhir/tests/data/R4B/valueset-name-use.json b/crates/fhir/tests/data/json/R4B/valueset-name-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-name-use.json rename to crates/fhir/tests/data/json/R4B/valueset-name-use.json diff --git a/crates/fhir/tests/data/R4B/valueset-name-v3-representation.json b/crates/fhir/tests/data/json/R4B/valueset-name-v3-representation.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-name-v3-representation.json rename to crates/fhir/tests/data/json/R4B/valueset-name-v3-representation.json diff --git a/crates/fhir/tests/data/R4B/valueset-namingsystem-identifier-type.json b/crates/fhir/tests/data/json/R4B/valueset-namingsystem-identifier-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-namingsystem-identifier-type.json rename to crates/fhir/tests/data/json/R4B/valueset-namingsystem-identifier-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-namingsystem-type.json b/crates/fhir/tests/data/json/R4B/valueset-namingsystem-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-namingsystem-type.json rename to crates/fhir/tests/data/json/R4B/valueset-namingsystem-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-narrative-status.json b/crates/fhir/tests/data/json/R4B/valueset-narrative-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-narrative-status.json rename to crates/fhir/tests/data/json/R4B/valueset-narrative-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-network-type.json b/crates/fhir/tests/data/json/R4B/valueset-network-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-network-type.json rename to crates/fhir/tests/data/json/R4B/valueset-network-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-nhin-purposeofuse.json b/crates/fhir/tests/data/json/R4B/valueset-nhin-purposeofuse.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-nhin-purposeofuse.json rename to crates/fhir/tests/data/json/R4B/valueset-nhin-purposeofuse.json diff --git a/crates/fhir/tests/data/R4B/valueset-note-type.json b/crates/fhir/tests/data/json/R4B/valueset-note-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-note-type.json rename to crates/fhir/tests/data/json/R4B/valueset-note-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-nutrient-code.json b/crates/fhir/tests/data/json/R4B/valueset-nutrient-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-nutrient-code.json rename to crates/fhir/tests/data/json/R4B/valueset-nutrient-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-nutrition-product-category.json b/crates/fhir/tests/data/json/R4B/valueset-nutrition-product-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-nutrition-product-category.json rename to crates/fhir/tests/data/json/R4B/valueset-nutrition-product-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-nutrition-product-nutrient.json b/crates/fhir/tests/data/json/R4B/valueset-nutrition-product-nutrient.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-nutrition-product-nutrient.json rename to crates/fhir/tests/data/json/R4B/valueset-nutrition-product-nutrient.json diff --git a/crates/fhir/tests/data/R4B/valueset-nutritionproduct-status.json b/crates/fhir/tests/data/json/R4B/valueset-nutritionproduct-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-nutritionproduct-status.json rename to crates/fhir/tests/data/json/R4B/valueset-nutritionproduct-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-object-lifecycle-events.json b/crates/fhir/tests/data/json/R4B/valueset-object-lifecycle-events.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-object-lifecycle-events.json rename to crates/fhir/tests/data/json/R4B/valueset-object-lifecycle-events.json diff --git a/crates/fhir/tests/data/R4B/valueset-object-role.json b/crates/fhir/tests/data/json/R4B/valueset-object-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-object-role.json rename to crates/fhir/tests/data/json/R4B/valueset-object-role.json diff --git a/crates/fhir/tests/data/R4B/valueset-observation-category.json b/crates/fhir/tests/data/json/R4B/valueset-observation-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-observation-category.json rename to crates/fhir/tests/data/json/R4B/valueset-observation-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-observation-codes.json b/crates/fhir/tests/data/json/R4B/valueset-observation-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-observation-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-observation-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-observation-interpretation.json b/crates/fhir/tests/data/json/R4B/valueset-observation-interpretation.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-observation-interpretation.json rename to crates/fhir/tests/data/json/R4B/valueset-observation-interpretation.json diff --git a/crates/fhir/tests/data/R4B/valueset-observation-methods.json b/crates/fhir/tests/data/json/R4B/valueset-observation-methods.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-observation-methods.json rename to crates/fhir/tests/data/json/R4B/valueset-observation-methods.json diff --git a/crates/fhir/tests/data/R4B/valueset-observation-range-category.json b/crates/fhir/tests/data/json/R4B/valueset-observation-range-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-observation-range-category.json rename to crates/fhir/tests/data/json/R4B/valueset-observation-range-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-observation-statistics.json b/crates/fhir/tests/data/json/R4B/valueset-observation-statistics.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-observation-statistics.json rename to crates/fhir/tests/data/json/R4B/valueset-observation-statistics.json diff --git a/crates/fhir/tests/data/R4B/valueset-observation-status.json b/crates/fhir/tests/data/json/R4B/valueset-observation-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-observation-status.json rename to crates/fhir/tests/data/json/R4B/valueset-observation-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-observation-vitalsignresult.json b/crates/fhir/tests/data/json/R4B/valueset-observation-vitalsignresult.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-observation-vitalsignresult.json rename to crates/fhir/tests/data/json/R4B/valueset-observation-vitalsignresult.json diff --git a/crates/fhir/tests/data/R4B/valueset-operation-kind.json b/crates/fhir/tests/data/json/R4B/valueset-operation-kind.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-operation-kind.json rename to crates/fhir/tests/data/json/R4B/valueset-operation-kind.json diff --git a/crates/fhir/tests/data/R4B/valueset-operation-parameter-use.json b/crates/fhir/tests/data/json/R4B/valueset-operation-parameter-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-operation-parameter-use.json rename to crates/fhir/tests/data/json/R4B/valueset-operation-parameter-use.json diff --git a/crates/fhir/tests/data/R4B/valueset-organization-role.json b/crates/fhir/tests/data/json/R4B/valueset-organization-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-organization-role.json rename to crates/fhir/tests/data/json/R4B/valueset-organization-role.json diff --git a/crates/fhir/tests/data/R4B/valueset-organization-type.json b/crates/fhir/tests/data/json/R4B/valueset-organization-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-organization-type.json rename to crates/fhir/tests/data/json/R4B/valueset-organization-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-orientation-type.json b/crates/fhir/tests/data/json/R4B/valueset-orientation-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-orientation-type.json rename to crates/fhir/tests/data/json/R4B/valueset-orientation-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-package-characteristic.json b/crates/fhir/tests/data/json/R4B/valueset-package-characteristic.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-package-characteristic.json rename to crates/fhir/tests/data/json/R4B/valueset-package-characteristic.json diff --git a/crates/fhir/tests/data/R4B/valueset-package-material.json b/crates/fhir/tests/data/json/R4B/valueset-package-material.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-package-material.json rename to crates/fhir/tests/data/json/R4B/valueset-package-material.json diff --git a/crates/fhir/tests/data/R4B/valueset-package-type.json b/crates/fhir/tests/data/json/R4B/valueset-package-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-package-type.json rename to crates/fhir/tests/data/json/R4B/valueset-package-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-packaging-type.json b/crates/fhir/tests/data/json/R4B/valueset-packaging-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-packaging-type.json rename to crates/fhir/tests/data/json/R4B/valueset-packaging-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-parent-relationship-codes.json b/crates/fhir/tests/data/json/R4B/valueset-parent-relationship-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-parent-relationship-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-parent-relationship-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-participantrequired.json b/crates/fhir/tests/data/json/R4B/valueset-participantrequired.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-participantrequired.json rename to crates/fhir/tests/data/json/R4B/valueset-participantrequired.json diff --git a/crates/fhir/tests/data/R4B/valueset-participation-role-type.json b/crates/fhir/tests/data/json/R4B/valueset-participation-role-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-participation-role-type.json rename to crates/fhir/tests/data/json/R4B/valueset-participation-role-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-participationstatus.json b/crates/fhir/tests/data/json/R4B/valueset-participationstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-participationstatus.json rename to crates/fhir/tests/data/json/R4B/valueset-participationstatus.json diff --git a/crates/fhir/tests/data/R4B/valueset-patient-contactrelationship.json b/crates/fhir/tests/data/json/R4B/valueset-patient-contactrelationship.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-patient-contactrelationship.json rename to crates/fhir/tests/data/json/R4B/valueset-patient-contactrelationship.json diff --git a/crates/fhir/tests/data/R4B/valueset-payeetype.json b/crates/fhir/tests/data/json/R4B/valueset-payeetype.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-payeetype.json rename to crates/fhir/tests/data/json/R4B/valueset-payeetype.json diff --git a/crates/fhir/tests/data/R4B/valueset-payment-adjustment-reason.json b/crates/fhir/tests/data/json/R4B/valueset-payment-adjustment-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-payment-adjustment-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-payment-adjustment-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-payment-status.json b/crates/fhir/tests/data/json/R4B/valueset-payment-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-payment-status.json rename to crates/fhir/tests/data/json/R4B/valueset-payment-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-payment-type.json b/crates/fhir/tests/data/json/R4B/valueset-payment-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-payment-type.json rename to crates/fhir/tests/data/json/R4B/valueset-payment-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-performer-function.json b/crates/fhir/tests/data/json/R4B/valueset-performer-function.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-performer-function.json rename to crates/fhir/tests/data/json/R4B/valueset-performer-function.json diff --git a/crates/fhir/tests/data/R4B/valueset-performer-role.json b/crates/fhir/tests/data/json/R4B/valueset-performer-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-performer-role.json rename to crates/fhir/tests/data/json/R4B/valueset-performer-role.json diff --git a/crates/fhir/tests/data/R4B/valueset-permitted-data-type.json b/crates/fhir/tests/data/json/R4B/valueset-permitted-data-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-permitted-data-type.json rename to crates/fhir/tests/data/json/R4B/valueset-permitted-data-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-plan-definition-type.json b/crates/fhir/tests/data/json/R4B/valueset-plan-definition-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-plan-definition-type.json rename to crates/fhir/tests/data/json/R4B/valueset-plan-definition-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-postal-address-use.json b/crates/fhir/tests/data/json/R4B/valueset-postal-address-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-postal-address-use.json rename to crates/fhir/tests/data/json/R4B/valueset-postal-address-use.json diff --git a/crates/fhir/tests/data/R4B/valueset-prepare-patient-prior-specimen-collection.json b/crates/fhir/tests/data/json/R4B/valueset-prepare-patient-prior-specimen-collection.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-prepare-patient-prior-specimen-collection.json rename to crates/fhir/tests/data/json/R4B/valueset-prepare-patient-prior-specimen-collection.json diff --git a/crates/fhir/tests/data/R4B/valueset-probability-distribution-type.json b/crates/fhir/tests/data/json/R4B/valueset-probability-distribution-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-probability-distribution-type.json rename to crates/fhir/tests/data/json/R4B/valueset-probability-distribution-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-procedure-category.json b/crates/fhir/tests/data/json/R4B/valueset-procedure-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-procedure-category.json rename to crates/fhir/tests/data/json/R4B/valueset-procedure-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-procedure-code.json b/crates/fhir/tests/data/json/R4B/valueset-procedure-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-procedure-code.json rename to crates/fhir/tests/data/json/R4B/valueset-procedure-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-procedure-followup.json b/crates/fhir/tests/data/json/R4B/valueset-procedure-followup.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-procedure-followup.json rename to crates/fhir/tests/data/json/R4B/valueset-procedure-followup.json diff --git a/crates/fhir/tests/data/R4B/valueset-procedure-not-performed-reason.json b/crates/fhir/tests/data/json/R4B/valueset-procedure-not-performed-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-procedure-not-performed-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-procedure-not-performed-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-procedure-outcome.json b/crates/fhir/tests/data/json/R4B/valueset-procedure-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-procedure-outcome.json rename to crates/fhir/tests/data/json/R4B/valueset-procedure-outcome.json diff --git a/crates/fhir/tests/data/R4B/valueset-procedure-progress-status-codes.json b/crates/fhir/tests/data/json/R4B/valueset-procedure-progress-status-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-procedure-progress-status-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-procedure-progress-status-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-procedure-reason.json b/crates/fhir/tests/data/json/R4B/valueset-procedure-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-procedure-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-procedure-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-process-priority.json b/crates/fhir/tests/data/json/R4B/valueset-process-priority.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-process-priority.json rename to crates/fhir/tests/data/json/R4B/valueset-process-priority.json diff --git a/crates/fhir/tests/data/R4B/valueset-product-category.json b/crates/fhir/tests/data/json/R4B/valueset-product-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-product-category.json rename to crates/fhir/tests/data/json/R4B/valueset-product-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-product-intended-use.json b/crates/fhir/tests/data/json/R4B/valueset-product-intended-use.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-product-intended-use.json rename to crates/fhir/tests/data/json/R4B/valueset-product-intended-use.json diff --git a/crates/fhir/tests/data/R4B/valueset-product-status.json b/crates/fhir/tests/data/json/R4B/valueset-product-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-product-status.json rename to crates/fhir/tests/data/json/R4B/valueset-product-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-product-storage-scale.json b/crates/fhir/tests/data/json/R4B/valueset-product-storage-scale.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-product-storage-scale.json rename to crates/fhir/tests/data/json/R4B/valueset-product-storage-scale.json diff --git a/crates/fhir/tests/data/R4B/valueset-program.json b/crates/fhir/tests/data/json/R4B/valueset-program.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-program.json rename to crates/fhir/tests/data/json/R4B/valueset-program.json diff --git a/crates/fhir/tests/data/R4B/valueset-property-representation.json b/crates/fhir/tests/data/json/R4B/valueset-property-representation.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-property-representation.json rename to crates/fhir/tests/data/json/R4B/valueset-property-representation.json diff --git a/crates/fhir/tests/data/R4B/valueset-provenance-activity-type.json b/crates/fhir/tests/data/json/R4B/valueset-provenance-activity-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-provenance-activity-type.json rename to crates/fhir/tests/data/json/R4B/valueset-provenance-activity-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-provenance-agent-type.json b/crates/fhir/tests/data/json/R4B/valueset-provenance-agent-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-provenance-agent-type.json rename to crates/fhir/tests/data/json/R4B/valueset-provenance-agent-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-provenance-entity-role.json b/crates/fhir/tests/data/json/R4B/valueset-provenance-entity-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-provenance-entity-role.json rename to crates/fhir/tests/data/json/R4B/valueset-provenance-entity-role.json diff --git a/crates/fhir/tests/data/R4B/valueset-provenance-history-agent-type.json b/crates/fhir/tests/data/json/R4B/valueset-provenance-history-agent-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-provenance-history-agent-type.json rename to crates/fhir/tests/data/json/R4B/valueset-provenance-history-agent-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-provenance-history-record-activity.json b/crates/fhir/tests/data/json/R4B/valueset-provenance-history-record-activity.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-provenance-history-record-activity.json rename to crates/fhir/tests/data/json/R4B/valueset-provenance-history-record-activity.json diff --git a/crates/fhir/tests/data/R4B/valueset-provenance-participant-role.json b/crates/fhir/tests/data/json/R4B/valueset-provenance-participant-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-provenance-participant-role.json rename to crates/fhir/tests/data/json/R4B/valueset-provenance-participant-role.json diff --git a/crates/fhir/tests/data/R4B/valueset-provenance-participant-type.json b/crates/fhir/tests/data/json/R4B/valueset-provenance-participant-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-provenance-participant-type.json rename to crates/fhir/tests/data/json/R4B/valueset-provenance-participant-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-provider-qualification.json b/crates/fhir/tests/data/json/R4B/valueset-provider-qualification.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-provider-qualification.json rename to crates/fhir/tests/data/json/R4B/valueset-provider-qualification.json diff --git a/crates/fhir/tests/data/R4B/valueset-provider-taxonomy.json b/crates/fhir/tests/data/json/R4B/valueset-provider-taxonomy.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-provider-taxonomy.json rename to crates/fhir/tests/data/json/R4B/valueset-provider-taxonomy.json diff --git a/crates/fhir/tests/data/R4B/valueset-publication-status.json b/crates/fhir/tests/data/json/R4B/valueset-publication-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-publication-status.json rename to crates/fhir/tests/data/json/R4B/valueset-publication-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-published-in-type.json b/crates/fhir/tests/data/json/R4B/valueset-published-in-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-published-in-type.json rename to crates/fhir/tests/data/json/R4B/valueset-published-in-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-quality-type.json b/crates/fhir/tests/data/json/R4B/valueset-quality-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-quality-type.json rename to crates/fhir/tests/data/json/R4B/valueset-quality-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-quantity-comparator.json b/crates/fhir/tests/data/json/R4B/valueset-quantity-comparator.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-quantity-comparator.json rename to crates/fhir/tests/data/json/R4B/valueset-quantity-comparator.json diff --git a/crates/fhir/tests/data/R4B/valueset-questionnaire-answers-status.json b/crates/fhir/tests/data/json/R4B/valueset-questionnaire-answers-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-questionnaire-answers-status.json rename to crates/fhir/tests/data/json/R4B/valueset-questionnaire-answers-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-questionnaire-answers.json b/crates/fhir/tests/data/json/R4B/valueset-questionnaire-answers.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-questionnaire-answers.json rename to crates/fhir/tests/data/json/R4B/valueset-questionnaire-answers.json diff --git a/crates/fhir/tests/data/R4B/valueset-questionnaire-display-category.json b/crates/fhir/tests/data/json/R4B/valueset-questionnaire-display-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-questionnaire-display-category.json rename to crates/fhir/tests/data/json/R4B/valueset-questionnaire-display-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-questionnaire-enable-behavior.json b/crates/fhir/tests/data/json/R4B/valueset-questionnaire-enable-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-questionnaire-enable-behavior.json rename to crates/fhir/tests/data/json/R4B/valueset-questionnaire-enable-behavior.json diff --git a/crates/fhir/tests/data/R4B/valueset-questionnaire-enable-operator.json b/crates/fhir/tests/data/json/R4B/valueset-questionnaire-enable-operator.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-questionnaire-enable-operator.json rename to crates/fhir/tests/data/json/R4B/valueset-questionnaire-enable-operator.json diff --git a/crates/fhir/tests/data/R4B/valueset-questionnaire-item-control.json b/crates/fhir/tests/data/json/R4B/valueset-questionnaire-item-control.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-questionnaire-item-control.json rename to crates/fhir/tests/data/json/R4B/valueset-questionnaire-item-control.json diff --git a/crates/fhir/tests/data/R4B/valueset-questionnaire-questions.json b/crates/fhir/tests/data/json/R4B/valueset-questionnaire-questions.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-questionnaire-questions.json rename to crates/fhir/tests/data/json/R4B/valueset-questionnaire-questions.json diff --git a/crates/fhir/tests/data/R4B/valueset-questionnaire.json b/crates/fhir/tests/data/json/R4B/valueset-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-questionnaire.json rename to crates/fhir/tests/data/json/R4B/valueset-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/valueset-questionnaireresponse-mode.json b/crates/fhir/tests/data/json/R4B/valueset-questionnaireresponse-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-questionnaireresponse-mode.json rename to crates/fhir/tests/data/json/R4B/valueset-questionnaireresponse-mode.json diff --git a/crates/fhir/tests/data/R4B/valueset-reaction-event-certainty.json b/crates/fhir/tests/data/json/R4B/valueset-reaction-event-certainty.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-reaction-event-certainty.json rename to crates/fhir/tests/data/json/R4B/valueset-reaction-event-certainty.json diff --git a/crates/fhir/tests/data/R4B/valueset-reaction-event-severity.json b/crates/fhir/tests/data/json/R4B/valueset-reaction-event-severity.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-reaction-event-severity.json rename to crates/fhir/tests/data/json/R4B/valueset-reaction-event-severity.json diff --git a/crates/fhir/tests/data/R4B/valueset-reason-medication-given-codes.json b/crates/fhir/tests/data/json/R4B/valueset-reason-medication-given-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-reason-medication-given-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-reason-medication-given-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-reason-medication-not-given-codes.json b/crates/fhir/tests/data/json/R4B/valueset-reason-medication-not-given-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-reason-medication-not-given-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-reason-medication-not-given-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-reason-medication-status-codes.json b/crates/fhir/tests/data/json/R4B/valueset-reason-medication-status-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-reason-medication-status-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-reason-medication-status-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-recommendation-strength.json b/crates/fhir/tests/data/json/R4B/valueset-recommendation-strength.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-recommendation-strength.json rename to crates/fhir/tests/data/json/R4B/valueset-recommendation-strength.json diff --git a/crates/fhir/tests/data/R4B/valueset-reference-handling-policy.json b/crates/fhir/tests/data/json/R4B/valueset-reference-handling-policy.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-reference-handling-policy.json rename to crates/fhir/tests/data/json/R4B/valueset-reference-handling-policy.json diff --git a/crates/fhir/tests/data/R4B/valueset-reference-version-rules.json b/crates/fhir/tests/data/json/R4B/valueset-reference-version-rules.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-reference-version-rules.json rename to crates/fhir/tests/data/json/R4B/valueset-reference-version-rules.json diff --git a/crates/fhir/tests/data/R4B/valueset-referencerange-appliesto.json b/crates/fhir/tests/data/json/R4B/valueset-referencerange-appliesto.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-referencerange-appliesto.json rename to crates/fhir/tests/data/json/R4B/valueset-referencerange-appliesto.json diff --git a/crates/fhir/tests/data/R4B/valueset-referencerange-meaning.json b/crates/fhir/tests/data/json/R4B/valueset-referencerange-meaning.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-referencerange-meaning.json rename to crates/fhir/tests/data/json/R4B/valueset-referencerange-meaning.json diff --git a/crates/fhir/tests/data/R4B/valueset-regulated-authorization-basis.json b/crates/fhir/tests/data/json/R4B/valueset-regulated-authorization-basis.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-regulated-authorization-basis.json rename to crates/fhir/tests/data/json/R4B/valueset-regulated-authorization-basis.json diff --git a/crates/fhir/tests/data/R4B/valueset-regulated-authorization-case-type.json b/crates/fhir/tests/data/json/R4B/valueset-regulated-authorization-case-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-regulated-authorization-case-type.json rename to crates/fhir/tests/data/json/R4B/valueset-regulated-authorization-case-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-regulated-authorization-type.json b/crates/fhir/tests/data/json/R4B/valueset-regulated-authorization-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-regulated-authorization-type.json rename to crates/fhir/tests/data/json/R4B/valueset-regulated-authorization-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-rejection-criteria.json b/crates/fhir/tests/data/json/R4B/valueset-rejection-criteria.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-rejection-criteria.json rename to crates/fhir/tests/data/json/R4B/valueset-rejection-criteria.json diff --git a/crates/fhir/tests/data/R4B/valueset-related-artifact-type.json b/crates/fhir/tests/data/json/R4B/valueset-related-artifact-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-related-artifact-type.json rename to crates/fhir/tests/data/json/R4B/valueset-related-artifact-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-related-claim-relationship.json b/crates/fhir/tests/data/json/R4B/valueset-related-claim-relationship.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-related-claim-relationship.json rename to crates/fhir/tests/data/json/R4B/valueset-related-claim-relationship.json diff --git a/crates/fhir/tests/data/R4B/valueset-relatedperson-relationshiptype.json b/crates/fhir/tests/data/json/R4B/valueset-relatedperson-relationshiptype.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-relatedperson-relationshiptype.json rename to crates/fhir/tests/data/json/R4B/valueset-relatedperson-relationshiptype.json diff --git a/crates/fhir/tests/data/R4B/valueset-relation-type.json b/crates/fhir/tests/data/json/R4B/valueset-relation-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-relation-type.json rename to crates/fhir/tests/data/json/R4B/valueset-relation-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-relationship.json b/crates/fhir/tests/data/json/R4B/valueset-relationship.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-relationship.json rename to crates/fhir/tests/data/json/R4B/valueset-relationship.json diff --git a/crates/fhir/tests/data/R4B/valueset-remittance-outcome.json b/crates/fhir/tests/data/json/R4B/valueset-remittance-outcome.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-remittance-outcome.json rename to crates/fhir/tests/data/json/R4B/valueset-remittance-outcome.json diff --git a/crates/fhir/tests/data/R4B/valueset-report-action-result-codes.json b/crates/fhir/tests/data/json/R4B/valueset-report-action-result-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-report-action-result-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-report-action-result-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-report-codes.json b/crates/fhir/tests/data/json/R4B/valueset-report-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-report-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-report-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-report-participant-type.json b/crates/fhir/tests/data/json/R4B/valueset-report-participant-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-report-participant-type.json rename to crates/fhir/tests/data/json/R4B/valueset-report-participant-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-report-relation-type.json b/crates/fhir/tests/data/json/R4B/valueset-report-relation-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-report-relation-type.json rename to crates/fhir/tests/data/json/R4B/valueset-report-relation-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-report-result-codes.json b/crates/fhir/tests/data/json/R4B/valueset-report-result-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-report-result-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-report-result-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-report-status-codes.json b/crates/fhir/tests/data/json/R4B/valueset-report-status-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-report-status-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-report-status-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-repository-type.json b/crates/fhir/tests/data/json/R4B/valueset-repository-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-repository-type.json rename to crates/fhir/tests/data/json/R4B/valueset-repository-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-request-intent.json b/crates/fhir/tests/data/json/R4B/valueset-request-intent.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-request-intent.json rename to crates/fhir/tests/data/json/R4B/valueset-request-intent.json diff --git a/crates/fhir/tests/data/R4B/valueset-request-priority.json b/crates/fhir/tests/data/json/R4B/valueset-request-priority.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-request-priority.json rename to crates/fhir/tests/data/json/R4B/valueset-request-priority.json diff --git a/crates/fhir/tests/data/R4B/valueset-request-resource-types.json b/crates/fhir/tests/data/json/R4B/valueset-request-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-request-resource-types.json rename to crates/fhir/tests/data/json/R4B/valueset-request-resource-types.json diff --git a/crates/fhir/tests/data/R4B/valueset-request-status.json b/crates/fhir/tests/data/json/R4B/valueset-request-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-request-status.json rename to crates/fhir/tests/data/json/R4B/valueset-request-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-research-element-type.json b/crates/fhir/tests/data/json/R4B/valueset-research-element-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-research-element-type.json rename to crates/fhir/tests/data/json/R4B/valueset-research-element-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-research-study-objective-type.json b/crates/fhir/tests/data/json/R4B/valueset-research-study-objective-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-research-study-objective-type.json rename to crates/fhir/tests/data/json/R4B/valueset-research-study-objective-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-research-study-phase.json b/crates/fhir/tests/data/json/R4B/valueset-research-study-phase.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-research-study-phase.json rename to crates/fhir/tests/data/json/R4B/valueset-research-study-phase.json diff --git a/crates/fhir/tests/data/R4B/valueset-research-study-prim-purp-type.json b/crates/fhir/tests/data/json/R4B/valueset-research-study-prim-purp-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-research-study-prim-purp-type.json rename to crates/fhir/tests/data/json/R4B/valueset-research-study-prim-purp-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-research-study-reason-stopped.json b/crates/fhir/tests/data/json/R4B/valueset-research-study-reason-stopped.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-research-study-reason-stopped.json rename to crates/fhir/tests/data/json/R4B/valueset-research-study-reason-stopped.json diff --git a/crates/fhir/tests/data/R4B/valueset-research-study-status.json b/crates/fhir/tests/data/json/R4B/valueset-research-study-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-research-study-status.json rename to crates/fhir/tests/data/json/R4B/valueset-research-study-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-research-subject-status.json b/crates/fhir/tests/data/json/R4B/valueset-research-subject-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-research-subject-status.json rename to crates/fhir/tests/data/json/R4B/valueset-research-subject-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-resource-aggregation-mode.json b/crates/fhir/tests/data/json/R4B/valueset-resource-aggregation-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-resource-aggregation-mode.json rename to crates/fhir/tests/data/json/R4B/valueset-resource-aggregation-mode.json diff --git a/crates/fhir/tests/data/R4B/valueset-resource-security-category.json b/crates/fhir/tests/data/json/R4B/valueset-resource-security-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-resource-security-category.json rename to crates/fhir/tests/data/json/R4B/valueset-resource-security-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-resource-slicing-rules.json b/crates/fhir/tests/data/json/R4B/valueset-resource-slicing-rules.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-resource-slicing-rules.json rename to crates/fhir/tests/data/json/R4B/valueset-resource-slicing-rules.json diff --git a/crates/fhir/tests/data/R4B/valueset-resource-status.json b/crates/fhir/tests/data/json/R4B/valueset-resource-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-resource-status.json rename to crates/fhir/tests/data/json/R4B/valueset-resource-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-resource-types.json b/crates/fhir/tests/data/json/R4B/valueset-resource-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-resource-types.json rename to crates/fhir/tests/data/json/R4B/valueset-resource-types.json diff --git a/crates/fhir/tests/data/R4B/valueset-resource-validation-mode.json b/crates/fhir/tests/data/json/R4B/valueset-resource-validation-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-resource-validation-mode.json rename to crates/fhir/tests/data/json/R4B/valueset-resource-validation-mode.json diff --git a/crates/fhir/tests/data/R4B/valueset-response-code.json b/crates/fhir/tests/data/json/R4B/valueset-response-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-response-code.json rename to crates/fhir/tests/data/json/R4B/valueset-response-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-restful-capability-mode.json b/crates/fhir/tests/data/json/R4B/valueset-restful-capability-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-restful-capability-mode.json rename to crates/fhir/tests/data/json/R4B/valueset-restful-capability-mode.json diff --git a/crates/fhir/tests/data/R4B/valueset-restful-security-service.json b/crates/fhir/tests/data/json/R4B/valueset-restful-security-service.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-restful-security-service.json rename to crates/fhir/tests/data/json/R4B/valueset-restful-security-service.json diff --git a/crates/fhir/tests/data/R4B/valueset-risk-probability.json b/crates/fhir/tests/data/json/R4B/valueset-risk-probability.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-risk-probability.json rename to crates/fhir/tests/data/json/R4B/valueset-risk-probability.json diff --git a/crates/fhir/tests/data/R4B/valueset-route-codes.json b/crates/fhir/tests/data/json/R4B/valueset-route-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-route-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-route-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-search-comparator.json b/crates/fhir/tests/data/json/R4B/valueset-search-comparator.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-search-comparator.json rename to crates/fhir/tests/data/json/R4B/valueset-search-comparator.json diff --git a/crates/fhir/tests/data/R4B/valueset-search-entry-mode.json b/crates/fhir/tests/data/json/R4B/valueset-search-entry-mode.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-search-entry-mode.json rename to crates/fhir/tests/data/json/R4B/valueset-search-entry-mode.json diff --git a/crates/fhir/tests/data/R4B/valueset-search-modifier-code.json b/crates/fhir/tests/data/json/R4B/valueset-search-modifier-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-search-modifier-code.json rename to crates/fhir/tests/data/json/R4B/valueset-search-modifier-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-search-param-type.json b/crates/fhir/tests/data/json/R4B/valueset-search-param-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-search-param-type.json rename to crates/fhir/tests/data/json/R4B/valueset-search-param-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-search-xpath-usage.json b/crates/fhir/tests/data/json/R4B/valueset-search-xpath-usage.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-search-xpath-usage.json rename to crates/fhir/tests/data/json/R4B/valueset-search-xpath-usage.json diff --git a/crates/fhir/tests/data/R4B/valueset-secondary-finding.json b/crates/fhir/tests/data/json/R4B/valueset-secondary-finding.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-secondary-finding.json rename to crates/fhir/tests/data/json/R4B/valueset-secondary-finding.json diff --git a/crates/fhir/tests/data/R4B/valueset-security-labels.json b/crates/fhir/tests/data/json/R4B/valueset-security-labels.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-security-labels.json rename to crates/fhir/tests/data/json/R4B/valueset-security-labels.json diff --git a/crates/fhir/tests/data/R4B/valueset-security-role-type.json b/crates/fhir/tests/data/json/R4B/valueset-security-role-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-security-role-type.json rename to crates/fhir/tests/data/json/R4B/valueset-security-role-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-sequence-quality-method.json b/crates/fhir/tests/data/json/R4B/valueset-sequence-quality-method.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-sequence-quality-method.json rename to crates/fhir/tests/data/json/R4B/valueset-sequence-quality-method.json diff --git a/crates/fhir/tests/data/R4B/valueset-sequence-quality-standardSequence.json b/crates/fhir/tests/data/json/R4B/valueset-sequence-quality-standardSequence.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-sequence-quality-standardSequence.json rename to crates/fhir/tests/data/json/R4B/valueset-sequence-quality-standardSequence.json diff --git a/crates/fhir/tests/data/R4B/valueset-sequence-referenceSeq.json b/crates/fhir/tests/data/json/R4B/valueset-sequence-referenceSeq.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-sequence-referenceSeq.json rename to crates/fhir/tests/data/json/R4B/valueset-sequence-referenceSeq.json diff --git a/crates/fhir/tests/data/R4B/valueset-sequence-type.json b/crates/fhir/tests/data/json/R4B/valueset-sequence-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-sequence-type.json rename to crates/fhir/tests/data/json/R4B/valueset-sequence-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-series-performer-function.json b/crates/fhir/tests/data/json/R4B/valueset-series-performer-function.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-series-performer-function.json rename to crates/fhir/tests/data/json/R4B/valueset-series-performer-function.json diff --git a/crates/fhir/tests/data/R4B/valueset-service-category.json b/crates/fhir/tests/data/json/R4B/valueset-service-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-service-category.json rename to crates/fhir/tests/data/json/R4B/valueset-service-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-service-place.json b/crates/fhir/tests/data/json/R4B/valueset-service-place.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-service-place.json rename to crates/fhir/tests/data/json/R4B/valueset-service-place.json diff --git a/crates/fhir/tests/data/R4B/valueset-service-provision-conditions.json b/crates/fhir/tests/data/json/R4B/valueset-service-provision-conditions.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-service-provision-conditions.json rename to crates/fhir/tests/data/json/R4B/valueset-service-provision-conditions.json diff --git a/crates/fhir/tests/data/R4B/valueset-service-referral-method.json b/crates/fhir/tests/data/json/R4B/valueset-service-referral-method.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-service-referral-method.json rename to crates/fhir/tests/data/json/R4B/valueset-service-referral-method.json diff --git a/crates/fhir/tests/data/R4B/valueset-service-type.json b/crates/fhir/tests/data/json/R4B/valueset-service-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-service-type.json rename to crates/fhir/tests/data/json/R4B/valueset-service-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-service-uscls.json b/crates/fhir/tests/data/json/R4B/valueset-service-uscls.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-service-uscls.json rename to crates/fhir/tests/data/json/R4B/valueset-service-uscls.json diff --git a/crates/fhir/tests/data/R4B/valueset-servicerequest-category.json b/crates/fhir/tests/data/json/R4B/valueset-servicerequest-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-servicerequest-category.json rename to crates/fhir/tests/data/json/R4B/valueset-servicerequest-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-servicerequest-orderdetail.json b/crates/fhir/tests/data/json/R4B/valueset-servicerequest-orderdetail.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-servicerequest-orderdetail.json rename to crates/fhir/tests/data/json/R4B/valueset-servicerequest-orderdetail.json diff --git a/crates/fhir/tests/data/R4B/valueset-sibling-relationship-codes.json b/crates/fhir/tests/data/json/R4B/valueset-sibling-relationship-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-sibling-relationship-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-sibling-relationship-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-signature-type.json b/crates/fhir/tests/data/json/R4B/valueset-signature-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-signature-type.json rename to crates/fhir/tests/data/json/R4B/valueset-signature-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-slotstatus.json b/crates/fhir/tests/data/json/R4B/valueset-slotstatus.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-slotstatus.json rename to crates/fhir/tests/data/json/R4B/valueset-slotstatus.json diff --git a/crates/fhir/tests/data/R4B/valueset-smart-capabilities.json b/crates/fhir/tests/data/json/R4B/valueset-smart-capabilities.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-smart-capabilities.json rename to crates/fhir/tests/data/json/R4B/valueset-smart-capabilities.json diff --git a/crates/fhir/tests/data/R4B/valueset-sort-direction.json b/crates/fhir/tests/data/json/R4B/valueset-sort-direction.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-sort-direction.json rename to crates/fhir/tests/data/json/R4B/valueset-sort-direction.json diff --git a/crates/fhir/tests/data/R4B/valueset-spdx-license.json b/crates/fhir/tests/data/json/R4B/valueset-spdx-license.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-spdx-license.json rename to crates/fhir/tests/data/json/R4B/valueset-spdx-license.json diff --git a/crates/fhir/tests/data/R4B/valueset-special-values.json b/crates/fhir/tests/data/json/R4B/valueset-special-values.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-special-values.json rename to crates/fhir/tests/data/json/R4B/valueset-special-values.json diff --git a/crates/fhir/tests/data/R4B/valueset-specimen-collection-method.json b/crates/fhir/tests/data/json/R4B/valueset-specimen-collection-method.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-specimen-collection-method.json rename to crates/fhir/tests/data/json/R4B/valueset-specimen-collection-method.json diff --git a/crates/fhir/tests/data/R4B/valueset-specimen-collection-priority.json b/crates/fhir/tests/data/json/R4B/valueset-specimen-collection-priority.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-specimen-collection-priority.json rename to crates/fhir/tests/data/json/R4B/valueset-specimen-collection-priority.json diff --git a/crates/fhir/tests/data/R4B/valueset-specimen-collection.json b/crates/fhir/tests/data/json/R4B/valueset-specimen-collection.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-specimen-collection.json rename to crates/fhir/tests/data/json/R4B/valueset-specimen-collection.json diff --git a/crates/fhir/tests/data/R4B/valueset-specimen-contained-preference.json b/crates/fhir/tests/data/json/R4B/valueset-specimen-contained-preference.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-specimen-contained-preference.json rename to crates/fhir/tests/data/json/R4B/valueset-specimen-contained-preference.json diff --git a/crates/fhir/tests/data/R4B/valueset-specimen-container-type.json b/crates/fhir/tests/data/json/R4B/valueset-specimen-container-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-specimen-container-type.json rename to crates/fhir/tests/data/json/R4B/valueset-specimen-container-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-specimen-processing-procedure.json b/crates/fhir/tests/data/json/R4B/valueset-specimen-processing-procedure.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-specimen-processing-procedure.json rename to crates/fhir/tests/data/json/R4B/valueset-specimen-processing-procedure.json diff --git a/crates/fhir/tests/data/R4B/valueset-specimen-status.json b/crates/fhir/tests/data/json/R4B/valueset-specimen-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-specimen-status.json rename to crates/fhir/tests/data/json/R4B/valueset-specimen-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-standards-status.json b/crates/fhir/tests/data/json/R4B/valueset-standards-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-standards-status.json rename to crates/fhir/tests/data/json/R4B/valueset-standards-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-statistic-model-code.json b/crates/fhir/tests/data/json/R4B/valueset-statistic-model-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-statistic-model-code.json rename to crates/fhir/tests/data/json/R4B/valueset-statistic-model-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-statistic-type.json b/crates/fhir/tests/data/json/R4B/valueset-statistic-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-statistic-type.json rename to crates/fhir/tests/data/json/R4B/valueset-statistic-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-strand-type.json b/crates/fhir/tests/data/json/R4B/valueset-strand-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-strand-type.json rename to crates/fhir/tests/data/json/R4B/valueset-strand-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-structure-definition-kind.json b/crates/fhir/tests/data/json/R4B/valueset-structure-definition-kind.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-structure-definition-kind.json rename to crates/fhir/tests/data/json/R4B/valueset-structure-definition-kind.json diff --git a/crates/fhir/tests/data/R4B/valueset-study-type.json b/crates/fhir/tests/data/json/R4B/valueset-study-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-study-type.json rename to crates/fhir/tests/data/json/R4B/valueset-study-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-subject-type.json b/crates/fhir/tests/data/json/R4B/valueset-subject-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-subject-type.json rename to crates/fhir/tests/data/json/R4B/valueset-subject-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-subscriber-relationship.json b/crates/fhir/tests/data/json/R4B/valueset-subscriber-relationship.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-subscriber-relationship.json rename to crates/fhir/tests/data/json/R4B/valueset-subscriber-relationship.json diff --git a/crates/fhir/tests/data/R4B/valueset-subscription-channel-type.json b/crates/fhir/tests/data/json/R4B/valueset-subscription-channel-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-subscription-channel-type.json rename to crates/fhir/tests/data/json/R4B/valueset-subscription-channel-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-subscription-error.json b/crates/fhir/tests/data/json/R4B/valueset-subscription-error.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-subscription-error.json rename to crates/fhir/tests/data/json/R4B/valueset-subscription-error.json diff --git a/crates/fhir/tests/data/R4B/valueset-subscription-notification-type.json b/crates/fhir/tests/data/json/R4B/valueset-subscription-notification-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-subscription-notification-type.json rename to crates/fhir/tests/data/json/R4B/valueset-subscription-notification-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-subscription-search-modifier.json b/crates/fhir/tests/data/json/R4B/valueset-subscription-search-modifier.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-subscription-search-modifier.json rename to crates/fhir/tests/data/json/R4B/valueset-subscription-search-modifier.json diff --git a/crates/fhir/tests/data/R4B/valueset-subscription-status.json b/crates/fhir/tests/data/json/R4B/valueset-subscription-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-subscription-status.json rename to crates/fhir/tests/data/json/R4B/valueset-subscription-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-subscriptiontopic-cr-behavior.json b/crates/fhir/tests/data/json/R4B/valueset-subscriptiontopic-cr-behavior.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-subscriptiontopic-cr-behavior.json rename to crates/fhir/tests/data/json/R4B/valueset-subscriptiontopic-cr-behavior.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-amount-type.json b/crates/fhir/tests/data/json/R4B/valueset-substance-amount-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-amount-type.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-amount-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-category.json b/crates/fhir/tests/data/json/R4B/valueset-substance-category.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-category.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-category.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-code.json b/crates/fhir/tests/data/json/R4B/valueset-substance-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-code.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-grade.json b/crates/fhir/tests/data/json/R4B/valueset-substance-grade.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-grade.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-grade.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-name-authority.json b/crates/fhir/tests/data/json/R4B/valueset-substance-name-authority.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-name-authority.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-name-authority.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-name-domain.json b/crates/fhir/tests/data/json/R4B/valueset-substance-name-domain.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-name-domain.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-name-domain.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-name-type.json b/crates/fhir/tests/data/json/R4B/valueset-substance-name-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-name-type.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-name-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-optical-activity.json b/crates/fhir/tests/data/json/R4B/valueset-substance-optical-activity.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-optical-activity.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-optical-activity.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-relationship-type.json b/crates/fhir/tests/data/json/R4B/valueset-substance-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-relationship-type.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-relationship-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-representation-format.json b/crates/fhir/tests/data/json/R4B/valueset-substance-representation-format.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-representation-format.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-representation-format.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-representation-type.json b/crates/fhir/tests/data/json/R4B/valueset-substance-representation-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-representation-type.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-representation-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-source-material-genus.json b/crates/fhir/tests/data/json/R4B/valueset-substance-source-material-genus.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-source-material-genus.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-source-material-genus.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-source-material-part.json b/crates/fhir/tests/data/json/R4B/valueset-substance-source-material-part.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-source-material-part.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-source-material-part.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-source-material-species.json b/crates/fhir/tests/data/json/R4B/valueset-substance-source-material-species.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-source-material-species.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-source-material-species.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-source-material-type.json b/crates/fhir/tests/data/json/R4B/valueset-substance-source-material-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-source-material-type.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-source-material-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-status.json b/crates/fhir/tests/data/json/R4B/valueset-substance-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-status.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-stereochemistry.json b/crates/fhir/tests/data/json/R4B/valueset-substance-stereochemistry.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-stereochemistry.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-stereochemistry.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-structure-technique.json b/crates/fhir/tests/data/json/R4B/valueset-substance-structure-technique.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-structure-technique.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-structure-technique.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-weight-method.json b/crates/fhir/tests/data/json/R4B/valueset-substance-weight-method.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-weight-method.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-weight-method.json diff --git a/crates/fhir/tests/data/R4B/valueset-substance-weight-type.json b/crates/fhir/tests/data/json/R4B/valueset-substance-weight-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-substance-weight-type.json rename to crates/fhir/tests/data/json/R4B/valueset-substance-weight-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-supplement-type.json b/crates/fhir/tests/data/json/R4B/valueset-supplement-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-supplement-type.json rename to crates/fhir/tests/data/json/R4B/valueset-supplement-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-supply-item.json b/crates/fhir/tests/data/json/R4B/valueset-supply-item.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-supply-item.json rename to crates/fhir/tests/data/json/R4B/valueset-supply-item.json diff --git a/crates/fhir/tests/data/R4B/valueset-supplydelivery-status.json b/crates/fhir/tests/data/json/R4B/valueset-supplydelivery-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-supplydelivery-status.json rename to crates/fhir/tests/data/json/R4B/valueset-supplydelivery-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-supplydelivery-type.json b/crates/fhir/tests/data/json/R4B/valueset-supplydelivery-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-supplydelivery-type.json rename to crates/fhir/tests/data/json/R4B/valueset-supplydelivery-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-supplyrequest-kind.json b/crates/fhir/tests/data/json/R4B/valueset-supplyrequest-kind.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-supplyrequest-kind.json rename to crates/fhir/tests/data/json/R4B/valueset-supplyrequest-kind.json diff --git a/crates/fhir/tests/data/R4B/valueset-supplyrequest-reason.json b/crates/fhir/tests/data/json/R4B/valueset-supplyrequest-reason.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-supplyrequest-reason.json rename to crates/fhir/tests/data/json/R4B/valueset-supplyrequest-reason.json diff --git a/crates/fhir/tests/data/R4B/valueset-supplyrequest-status.json b/crates/fhir/tests/data/json/R4B/valueset-supplyrequest-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-supplyrequest-status.json rename to crates/fhir/tests/data/json/R4B/valueset-supplyrequest-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-surface.json b/crates/fhir/tests/data/json/R4B/valueset-surface.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-surface.json rename to crates/fhir/tests/data/json/R4B/valueset-surface.json diff --git a/crates/fhir/tests/data/R4B/valueset-synthesis-type.json b/crates/fhir/tests/data/json/R4B/valueset-synthesis-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-synthesis-type.json rename to crates/fhir/tests/data/json/R4B/valueset-synthesis-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-system-restful-interaction.json b/crates/fhir/tests/data/json/R4B/valueset-system-restful-interaction.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-system-restful-interaction.json rename to crates/fhir/tests/data/json/R4B/valueset-system-restful-interaction.json diff --git a/crates/fhir/tests/data/R4B/valueset-target-species.json b/crates/fhir/tests/data/json/R4B/valueset-target-species.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-target-species.json rename to crates/fhir/tests/data/json/R4B/valueset-target-species.json diff --git a/crates/fhir/tests/data/R4B/valueset-task-code.json b/crates/fhir/tests/data/json/R4B/valueset-task-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-task-code.json rename to crates/fhir/tests/data/json/R4B/valueset-task-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-task-intent.json b/crates/fhir/tests/data/json/R4B/valueset-task-intent.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-task-intent.json rename to crates/fhir/tests/data/json/R4B/valueset-task-intent.json diff --git a/crates/fhir/tests/data/R4B/valueset-task-status.json b/crates/fhir/tests/data/json/R4B/valueset-task-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-task-status.json rename to crates/fhir/tests/data/json/R4B/valueset-task-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-template-status-code.json b/crates/fhir/tests/data/json/R4B/valueset-template-status-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-template-status-code.json rename to crates/fhir/tests/data/json/R4B/valueset-template-status-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-testscript-operation-codes.json b/crates/fhir/tests/data/json/R4B/valueset-testscript-operation-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-testscript-operation-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-testscript-operation-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-testscript-profile-destination-types.json b/crates/fhir/tests/data/json/R4B/valueset-testscript-profile-destination-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-testscript-profile-destination-types.json rename to crates/fhir/tests/data/json/R4B/valueset-testscript-profile-destination-types.json diff --git a/crates/fhir/tests/data/R4B/valueset-testscript-profile-origin-types.json b/crates/fhir/tests/data/json/R4B/valueset-testscript-profile-origin-types.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-testscript-profile-origin-types.json rename to crates/fhir/tests/data/json/R4B/valueset-testscript-profile-origin-types.json diff --git a/crates/fhir/tests/data/R4B/valueset-texture-code.json b/crates/fhir/tests/data/json/R4B/valueset-texture-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-texture-code.json rename to crates/fhir/tests/data/json/R4B/valueset-texture-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-therapy-relationship-type.json b/crates/fhir/tests/data/json/R4B/valueset-therapy-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-therapy-relationship-type.json rename to crates/fhir/tests/data/json/R4B/valueset-therapy-relationship-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-therapy.json b/crates/fhir/tests/data/json/R4B/valueset-therapy.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-therapy.json rename to crates/fhir/tests/data/json/R4B/valueset-therapy.json diff --git a/crates/fhir/tests/data/R4B/valueset-timezones.json b/crates/fhir/tests/data/json/R4B/valueset-timezones.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-timezones.json rename to crates/fhir/tests/data/json/R4B/valueset-timezones.json diff --git a/crates/fhir/tests/data/R4B/valueset-timing-abbreviation.json b/crates/fhir/tests/data/json/R4B/valueset-timing-abbreviation.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-timing-abbreviation.json rename to crates/fhir/tests/data/json/R4B/valueset-timing-abbreviation.json diff --git a/crates/fhir/tests/data/R4B/valueset-title-type.json b/crates/fhir/tests/data/json/R4B/valueset-title-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-title-type.json rename to crates/fhir/tests/data/json/R4B/valueset-title-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-tooth.json b/crates/fhir/tests/data/json/R4B/valueset-tooth.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-tooth.json rename to crates/fhir/tests/data/json/R4B/valueset-tooth.json diff --git a/crates/fhir/tests/data/R4B/valueset-trigger-type.json b/crates/fhir/tests/data/json/R4B/valueset-trigger-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-trigger-type.json rename to crates/fhir/tests/data/json/R4B/valueset-trigger-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-type-derivation-rule.json b/crates/fhir/tests/data/json/R4B/valueset-type-derivation-rule.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-type-derivation-rule.json rename to crates/fhir/tests/data/json/R4B/valueset-type-derivation-rule.json diff --git a/crates/fhir/tests/data/R4B/valueset-type-restful-interaction.json b/crates/fhir/tests/data/json/R4B/valueset-type-restful-interaction.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-type-restful-interaction.json rename to crates/fhir/tests/data/json/R4B/valueset-type-restful-interaction.json diff --git a/crates/fhir/tests/data/R4B/valueset-ucum-bodylength.json b/crates/fhir/tests/data/json/R4B/valueset-ucum-bodylength.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-ucum-bodylength.json rename to crates/fhir/tests/data/json/R4B/valueset-ucum-bodylength.json diff --git a/crates/fhir/tests/data/R4B/valueset-ucum-bodytemp.json b/crates/fhir/tests/data/json/R4B/valueset-ucum-bodytemp.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-ucum-bodytemp.json rename to crates/fhir/tests/data/json/R4B/valueset-ucum-bodytemp.json diff --git a/crates/fhir/tests/data/R4B/valueset-ucum-bodyweight.json b/crates/fhir/tests/data/json/R4B/valueset-ucum-bodyweight.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-ucum-bodyweight.json rename to crates/fhir/tests/data/json/R4B/valueset-ucum-bodyweight.json diff --git a/crates/fhir/tests/data/R4B/valueset-ucum-common.json b/crates/fhir/tests/data/json/R4B/valueset-ucum-common.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-ucum-common.json rename to crates/fhir/tests/data/json/R4B/valueset-ucum-common.json diff --git a/crates/fhir/tests/data/R4B/valueset-ucum-units.json b/crates/fhir/tests/data/json/R4B/valueset-ucum-units.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-ucum-units.json rename to crates/fhir/tests/data/json/R4B/valueset-ucum-units.json diff --git a/crates/fhir/tests/data/R4B/valueset-ucum-vitals-common.json b/crates/fhir/tests/data/json/R4B/valueset-ucum-vitals-common.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-ucum-vitals-common.json rename to crates/fhir/tests/data/json/R4B/valueset-ucum-vitals-common.json diff --git a/crates/fhir/tests/data/R4B/valueset-udi-entry-type.json b/crates/fhir/tests/data/json/R4B/valueset-udi-entry-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-udi-entry-type.json rename to crates/fhir/tests/data/json/R4B/valueset-udi-entry-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-undesirable-effect-classification.json b/crates/fhir/tests/data/json/R4B/valueset-undesirable-effect-classification.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-undesirable-effect-classification.json rename to crates/fhir/tests/data/json/R4B/valueset-undesirable-effect-classification.json diff --git a/crates/fhir/tests/data/R4B/valueset-undesirable-effect-frequency.json b/crates/fhir/tests/data/json/R4B/valueset-undesirable-effect-frequency.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-undesirable-effect-frequency.json rename to crates/fhir/tests/data/json/R4B/valueset-undesirable-effect-frequency.json diff --git a/crates/fhir/tests/data/R4B/valueset-undesirable-effect-symptom.json b/crates/fhir/tests/data/json/R4B/valueset-undesirable-effect-symptom.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-undesirable-effect-symptom.json rename to crates/fhir/tests/data/json/R4B/valueset-undesirable-effect-symptom.json diff --git a/crates/fhir/tests/data/R4B/valueset-unit-of-presentation.json b/crates/fhir/tests/data/json/R4B/valueset-unit-of-presentation.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-unit-of-presentation.json rename to crates/fhir/tests/data/json/R4B/valueset-unit-of-presentation.json diff --git a/crates/fhir/tests/data/R4B/valueset-units-of-time.json b/crates/fhir/tests/data/json/R4B/valueset-units-of-time.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-units-of-time.json rename to crates/fhir/tests/data/json/R4B/valueset-units-of-time.json diff --git a/crates/fhir/tests/data/R4B/valueset-usage-context-type.json b/crates/fhir/tests/data/json/R4B/valueset-usage-context-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-usage-context-type.json rename to crates/fhir/tests/data/json/R4B/valueset-usage-context-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-use-context.json b/crates/fhir/tests/data/json/R4B/valueset-use-context.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-use-context.json rename to crates/fhir/tests/data/json/R4B/valueset-use-context.json diff --git a/crates/fhir/tests/data/R4B/valueset-vaccine-code.json b/crates/fhir/tests/data/json/R4B/valueset-vaccine-code.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-vaccine-code.json rename to crates/fhir/tests/data/json/R4B/valueset-vaccine-code.json diff --git a/crates/fhir/tests/data/R4B/valueset-variable-handling.json b/crates/fhir/tests/data/json/R4B/valueset-variable-handling.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-variable-handling.json rename to crates/fhir/tests/data/json/R4B/valueset-variable-handling.json diff --git a/crates/fhir/tests/data/R4B/valueset-variable-role.json b/crates/fhir/tests/data/json/R4B/valueset-variable-role.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-variable-role.json rename to crates/fhir/tests/data/json/R4B/valueset-variable-role.json diff --git a/crates/fhir/tests/data/R4B/valueset-variable-type.json b/crates/fhir/tests/data/json/R4B/valueset-variable-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-variable-type.json rename to crates/fhir/tests/data/json/R4B/valueset-variable-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-verificationresult-can-push-updates.json b/crates/fhir/tests/data/json/R4B/valueset-verificationresult-can-push-updates.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-verificationresult-can-push-updates.json rename to crates/fhir/tests/data/json/R4B/valueset-verificationresult-can-push-updates.json diff --git a/crates/fhir/tests/data/R4B/valueset-verificationresult-communication-method.json b/crates/fhir/tests/data/json/R4B/valueset-verificationresult-communication-method.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-verificationresult-communication-method.json rename to crates/fhir/tests/data/json/R4B/valueset-verificationresult-communication-method.json diff --git a/crates/fhir/tests/data/R4B/valueset-verificationresult-failure-action.json b/crates/fhir/tests/data/json/R4B/valueset-verificationresult-failure-action.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-verificationresult-failure-action.json rename to crates/fhir/tests/data/json/R4B/valueset-verificationresult-failure-action.json diff --git a/crates/fhir/tests/data/R4B/valueset-verificationresult-need.json b/crates/fhir/tests/data/json/R4B/valueset-verificationresult-need.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-verificationresult-need.json rename to crates/fhir/tests/data/json/R4B/valueset-verificationresult-need.json diff --git a/crates/fhir/tests/data/R4B/valueset-verificationresult-primary-source-type.json b/crates/fhir/tests/data/json/R4B/valueset-verificationresult-primary-source-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-verificationresult-primary-source-type.json rename to crates/fhir/tests/data/json/R4B/valueset-verificationresult-primary-source-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-verificationresult-push-type-available.json b/crates/fhir/tests/data/json/R4B/valueset-verificationresult-push-type-available.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-verificationresult-push-type-available.json rename to crates/fhir/tests/data/json/R4B/valueset-verificationresult-push-type-available.json diff --git a/crates/fhir/tests/data/R4B/valueset-verificationresult-status.json b/crates/fhir/tests/data/json/R4B/valueset-verificationresult-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-verificationresult-status.json rename to crates/fhir/tests/data/json/R4B/valueset-verificationresult-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-verificationresult-validation-process.json b/crates/fhir/tests/data/json/R4B/valueset-verificationresult-validation-process.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-verificationresult-validation-process.json rename to crates/fhir/tests/data/json/R4B/valueset-verificationresult-validation-process.json diff --git a/crates/fhir/tests/data/R4B/valueset-verificationresult-validation-status.json b/crates/fhir/tests/data/json/R4B/valueset-verificationresult-validation-status.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-verificationresult-validation-status.json rename to crates/fhir/tests/data/json/R4B/valueset-verificationresult-validation-status.json diff --git a/crates/fhir/tests/data/R4B/valueset-verificationresult-validation-type.json b/crates/fhir/tests/data/json/R4B/valueset-verificationresult-validation-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-verificationresult-validation-type.json rename to crates/fhir/tests/data/json/R4B/valueset-verificationresult-validation-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-versioning-policy.json b/crates/fhir/tests/data/json/R4B/valueset-versioning-policy.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-versioning-policy.json rename to crates/fhir/tests/data/json/R4B/valueset-versioning-policy.json diff --git a/crates/fhir/tests/data/R4B/valueset-vision-base-codes.json b/crates/fhir/tests/data/json/R4B/valueset-vision-base-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-vision-base-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-vision-base-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-vision-eye-codes.json b/crates/fhir/tests/data/json/R4B/valueset-vision-eye-codes.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-vision-eye-codes.json rename to crates/fhir/tests/data/json/R4B/valueset-vision-eye-codes.json diff --git a/crates/fhir/tests/data/R4B/valueset-vision-product.json b/crates/fhir/tests/data/json/R4B/valueset-vision-product.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-vision-product.json rename to crates/fhir/tests/data/json/R4B/valueset-vision-product.json diff --git a/crates/fhir/tests/data/R4B/valueset-warning-type.json b/crates/fhir/tests/data/json/R4B/valueset-warning-type.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-warning-type.json rename to crates/fhir/tests/data/json/R4B/valueset-warning-type.json diff --git a/crates/fhir/tests/data/R4B/valueset-written-language.json b/crates/fhir/tests/data/json/R4B/valueset-written-language.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset-written-language.json rename to crates/fhir/tests/data/json/R4B/valueset-written-language.json diff --git a/crates/fhir/tests/data/R4B/valueset.profile.json b/crates/fhir/tests/data/json/R4B/valueset.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/valueset.profile.json rename to crates/fhir/tests/data/json/R4B/valueset.profile.json diff --git a/crates/fhir/tests/data/R4B/valuesets.json b/crates/fhir/tests/data/json/R4B/valuesets.json similarity index 100% rename from crates/fhir/tests/data/R4B/valuesets.json rename to crates/fhir/tests/data/json/R4B/valuesets.json diff --git a/crates/fhir/tests/data/R4B/verificationresult-example.json b/crates/fhir/tests/data/json/R4B/verificationresult-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/verificationresult-example.json rename to crates/fhir/tests/data/json/R4B/verificationresult-example.json diff --git a/crates/fhir/tests/data/R4B/verificationresult-questionnaire.json b/crates/fhir/tests/data/json/R4B/verificationresult-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/verificationresult-questionnaire.json rename to crates/fhir/tests/data/json/R4B/verificationresult-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/verificationresult.profile.json b/crates/fhir/tests/data/json/R4B/verificationresult.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/verificationresult.profile.json rename to crates/fhir/tests/data/json/R4B/verificationresult.profile.json diff --git a/crates/fhir/tests/data/R4B/visionprescription-example-1.json b/crates/fhir/tests/data/json/R4B/visionprescription-example-1.json similarity index 100% rename from crates/fhir/tests/data/R4B/visionprescription-example-1.json rename to crates/fhir/tests/data/json/R4B/visionprescription-example-1.json diff --git a/crates/fhir/tests/data/R4B/visionprescription-example.json b/crates/fhir/tests/data/json/R4B/visionprescription-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/visionprescription-example.json rename to crates/fhir/tests/data/json/R4B/visionprescription-example.json diff --git a/crates/fhir/tests/data/R4B/visionprescription-questionnaire.json b/crates/fhir/tests/data/json/R4B/visionprescription-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/visionprescription-questionnaire.json rename to crates/fhir/tests/data/json/R4B/visionprescription-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/visionprescription.profile.json b/crates/fhir/tests/data/json/R4B/visionprescription.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/visionprescription.profile.json rename to crates/fhir/tests/data/json/R4B/visionprescription.profile.json diff --git a/crates/fhir/tests/data/R4B/vitalsigns-questionnaire.json b/crates/fhir/tests/data/json/R4B/vitalsigns-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/vitalsigns-questionnaire.json rename to crates/fhir/tests/data/json/R4B/vitalsigns-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/vitalsigns.profile.json b/crates/fhir/tests/data/json/R4B/vitalsigns.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/vitalsigns.profile.json rename to crates/fhir/tests/data/json/R4B/vitalsigns.profile.json diff --git a/crates/fhir/tests/data/R4B/vitalspanel-questionnaire.json b/crates/fhir/tests/data/json/R4B/vitalspanel-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R4B/vitalspanel-questionnaire.json rename to crates/fhir/tests/data/json/R4B/vitalspanel-questionnaire.json diff --git a/crates/fhir/tests/data/R4B/vitalspanel.profile.json b/crates/fhir/tests/data/json/R4B/vitalspanel.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/vitalspanel.profile.json rename to crates/fhir/tests/data/json/R4B/vitalspanel.profile.json diff --git a/crates/fhir/tests/data/R4B/xds-example.json b/crates/fhir/tests/data/json/R4B/xds-example.json similarity index 100% rename from crates/fhir/tests/data/R4B/xds-example.json rename to crates/fhir/tests/data/json/R4B/xds-example.json diff --git a/crates/fhir/tests/data/R4B/xhtml.profile.json b/crates/fhir/tests/data/json/R4B/xhtml.profile.json similarity index 100% rename from crates/fhir/tests/data/R4B/xhtml.profile.json rename to crates/fhir/tests/data/json/R4B/xhtml.profile.json diff --git a/crates/fhir/tests/data/R5/Device-NGS-device.json b/crates/fhir/tests/data/json/R5/Device-NGS-device.json similarity index 100% rename from crates/fhir/tests/data/R5/Device-NGS-device.json rename to crates/fhir/tests/data/json/R5/Device-NGS-device.json diff --git a/crates/fhir/tests/data/R5/Device-Triodenovo-SW.json b/crates/fhir/tests/data/json/R5/Device-Triodenovo-SW.json similarity index 100% rename from crates/fhir/tests/data/R5/Device-Triodenovo-SW.json rename to crates/fhir/tests/data/json/R5/Device-Triodenovo-SW.json diff --git a/crates/fhir/tests/data/R5/DocumentReference-CNVAnalysis_called.json b/crates/fhir/tests/data/json/R5/DocumentReference-CNVAnalysis_called.json similarity index 100% rename from crates/fhir/tests/data/R5/DocumentReference-CNVAnalysis_called.json rename to crates/fhir/tests/data/json/R5/DocumentReference-CNVAnalysis_called.json diff --git a/crates/fhir/tests/data/R5/DocumentReference-SimpleVariantAnalysis_called.json b/crates/fhir/tests/data/json/R5/DocumentReference-SimpleVariantAnalysis_called.json similarity index 100% rename from crates/fhir/tests/data/R5/DocumentReference-SimpleVariantAnalysis_called.json rename to crates/fhir/tests/data/json/R5/DocumentReference-SimpleVariantAnalysis_called.json diff --git a/crates/fhir/tests/data/R5/DocumentReference-WES_FullSequencedRegion_GRCh38.json b/crates/fhir/tests/data/json/R5/DocumentReference-WES_FullSequencedRegion_GRCh38.json similarity index 100% rename from crates/fhir/tests/data/R5/DocumentReference-WES_FullSequencedRegion_GRCh38.json rename to crates/fhir/tests/data/json/R5/DocumentReference-WES_FullSequencedRegion_GRCh38.json diff --git a/crates/fhir/tests/data/R5/DocumentReference-genomicBEDfile.json b/crates/fhir/tests/data/json/R5/DocumentReference-genomicBEDfile.json similarity index 100% rename from crates/fhir/tests/data/R5/DocumentReference-genomicBEDfile.json rename to crates/fhir/tests/data/json/R5/DocumentReference-genomicBEDfile.json diff --git a/crates/fhir/tests/data/R5/DocumentReference-genomicFile1.json b/crates/fhir/tests/data/json/R5/DocumentReference-genomicFile1.json similarity index 100% rename from crates/fhir/tests/data/R5/DocumentReference-genomicFile1.json rename to crates/fhir/tests/data/json/R5/DocumentReference-genomicFile1.json diff --git a/crates/fhir/tests/data/R5/DocumentReference-genomicFile2.json b/crates/fhir/tests/data/json/R5/DocumentReference-genomicFile2.json similarity index 100% rename from crates/fhir/tests/data/R5/DocumentReference-genomicFile2.json rename to crates/fhir/tests/data/json/R5/DocumentReference-genomicFile2.json diff --git a/crates/fhir/tests/data/R5/DocumentReference-genomicFile3.json b/crates/fhir/tests/data/json/R5/DocumentReference-genomicFile3.json similarity index 100% rename from crates/fhir/tests/data/R5/DocumentReference-genomicFile3.json rename to crates/fhir/tests/data/json/R5/DocumentReference-genomicFile3.json diff --git a/crates/fhir/tests/data/R5/DocumentReference-genomicFile4.json b/crates/fhir/tests/data/json/R5/DocumentReference-genomicFile4.json similarity index 100% rename from crates/fhir/tests/data/R5/DocumentReference-genomicFile4.json rename to crates/fhir/tests/data/json/R5/DocumentReference-genomicFile4.json diff --git a/crates/fhir/tests/data/R5/DocumentReference-genomicFileFather.json b/crates/fhir/tests/data/json/R5/DocumentReference-genomicFileFather.json similarity index 100% rename from crates/fhir/tests/data/R5/DocumentReference-genomicFileFather.json rename to crates/fhir/tests/data/json/R5/DocumentReference-genomicFileFather.json diff --git a/crates/fhir/tests/data/R5/DocumentReference-genomicFileGroupAsSubject.json b/crates/fhir/tests/data/json/R5/DocumentReference-genomicFileGroupAsSubject.json similarity index 100% rename from crates/fhir/tests/data/R5/DocumentReference-genomicFileGroupAsSubject.json rename to crates/fhir/tests/data/json/R5/DocumentReference-genomicFileGroupAsSubject.json diff --git a/crates/fhir/tests/data/R5/DocumentReference-genomicFileMother.json b/crates/fhir/tests/data/json/R5/DocumentReference-genomicFileMother.json similarity index 100% rename from crates/fhir/tests/data/R5/DocumentReference-genomicFileMother.json rename to crates/fhir/tests/data/json/R5/DocumentReference-genomicFileMother.json diff --git a/crates/fhir/tests/data/R5/DocumentReference-genomicFileProband.json b/crates/fhir/tests/data/json/R5/DocumentReference-genomicFileProband.json similarity index 100% rename from crates/fhir/tests/data/R5/DocumentReference-genomicFileProband.json rename to crates/fhir/tests/data/json/R5/DocumentReference-genomicFileProband.json diff --git a/crates/fhir/tests/data/R5/DocumentReference-genomicVCFfile.json b/crates/fhir/tests/data/json/R5/DocumentReference-genomicVCFfile.json similarity index 100% rename from crates/fhir/tests/data/R5/DocumentReference-genomicVCFfile.json rename to crates/fhir/tests/data/json/R5/DocumentReference-genomicVCFfile.json diff --git a/crates/fhir/tests/data/R5/DocumentReference-genomicVCFfile_cnv.json b/crates/fhir/tests/data/json/R5/DocumentReference-genomicVCFfile_cnv.json similarity index 100% rename from crates/fhir/tests/data/R5/DocumentReference-genomicVCFfile_cnv.json rename to crates/fhir/tests/data/json/R5/DocumentReference-genomicVCFfile_cnv.json diff --git a/crates/fhir/tests/data/R5/DocumentReference-genomicVCFfile_simple.json b/crates/fhir/tests/data/json/R5/DocumentReference-genomicVCFfile_simple.json similarity index 100% rename from crates/fhir/tests/data/R5/DocumentReference-genomicVCFfile_simple.json rename to crates/fhir/tests/data/json/R5/DocumentReference-genomicVCFfile_simple.json diff --git a/crates/fhir/tests/data/R5/Encounter-denovoEncounter.json b/crates/fhir/tests/data/json/R5/Encounter-denovoEncounter.json similarity index 100% rename from crates/fhir/tests/data/R5/Encounter-denovoEncounter.json rename to crates/fhir/tests/data/json/R5/Encounter-denovoEncounter.json diff --git a/crates/fhir/tests/data/R5/Encounter-genomicEncounter.json b/crates/fhir/tests/data/json/R5/Encounter-genomicEncounter.json similarity index 100% rename from crates/fhir/tests/data/R5/Encounter-genomicEncounter.json rename to crates/fhir/tests/data/json/R5/Encounter-genomicEncounter.json diff --git a/crates/fhir/tests/data/R5/Group-denovoFamily.json b/crates/fhir/tests/data/json/R5/Group-denovoFamily.json similarity index 100% rename from crates/fhir/tests/data/R5/Group-denovoFamily.json rename to crates/fhir/tests/data/json/R5/Group-denovoFamily.json diff --git a/crates/fhir/tests/data/R5/Patient-denovoChild.json b/crates/fhir/tests/data/json/R5/Patient-denovoChild.json similarity index 100% rename from crates/fhir/tests/data/R5/Patient-denovoChild.json rename to crates/fhir/tests/data/json/R5/Patient-denovoChild.json diff --git a/crates/fhir/tests/data/R5/Patient-denovoFather.json b/crates/fhir/tests/data/json/R5/Patient-denovoFather.json similarity index 100% rename from crates/fhir/tests/data/R5/Patient-denovoFather.json rename to crates/fhir/tests/data/json/R5/Patient-denovoFather.json diff --git a/crates/fhir/tests/data/R5/Patient-denovoMother.json b/crates/fhir/tests/data/json/R5/Patient-denovoMother.json similarity index 100% rename from crates/fhir/tests/data/R5/Patient-denovoMother.json rename to crates/fhir/tests/data/json/R5/Patient-denovoMother.json diff --git a/crates/fhir/tests/data/R5/Patient-genomicPatient.json b/crates/fhir/tests/data/json/R5/Patient-genomicPatient.json similarity index 100% rename from crates/fhir/tests/data/R5/Patient-genomicPatient.json rename to crates/fhir/tests/data/json/R5/Patient-genomicPatient.json diff --git a/crates/fhir/tests/data/R5/Practitioner-practitioner01.json b/crates/fhir/tests/data/json/R5/Practitioner-practitioner01.json similarity index 100% rename from crates/fhir/tests/data/R5/Practitioner-practitioner01.json rename to crates/fhir/tests/data/json/R5/Practitioner-practitioner01.json diff --git a/crates/fhir/tests/data/R5/Practitioner-practitioner02.json b/crates/fhir/tests/data/json/R5/Practitioner-practitioner02.json similarity index 100% rename from crates/fhir/tests/data/R5/Practitioner-practitioner02.json rename to crates/fhir/tests/data/json/R5/Practitioner-practitioner02.json diff --git a/crates/fhir/tests/data/R5/RelatedPerson-denovoFather.json b/crates/fhir/tests/data/json/R5/RelatedPerson-denovoFather.json similarity index 100% rename from crates/fhir/tests/data/R5/RelatedPerson-denovoFather.json rename to crates/fhir/tests/data/json/R5/RelatedPerson-denovoFather.json diff --git a/crates/fhir/tests/data/R5/RelatedPerson-denovoMother.json b/crates/fhir/tests/data/json/R5/RelatedPerson-denovoMother.json similarity index 100% rename from crates/fhir/tests/data/R5/RelatedPerson-denovoMother.json rename to crates/fhir/tests/data/json/R5/RelatedPerson-denovoMother.json diff --git a/crates/fhir/tests/data/R5/Requirements-example1.json b/crates/fhir/tests/data/json/R5/Requirements-example1.json similarity index 100% rename from crates/fhir/tests/data/R5/Requirements-example1.json rename to crates/fhir/tests/data/json/R5/Requirements-example1.json diff --git a/crates/fhir/tests/data/R5/Requirements-example2.json b/crates/fhir/tests/data/json/R5/Requirements-example2.json similarity index 100% rename from crates/fhir/tests/data/R5/Requirements-example2.json rename to crates/fhir/tests/data/json/R5/Requirements-example2.json diff --git a/crates/fhir/tests/data/R5/ServiceRequest-genomicSRFather.json b/crates/fhir/tests/data/json/R5/ServiceRequest-genomicSRFather.json similarity index 100% rename from crates/fhir/tests/data/R5/ServiceRequest-genomicSRFather.json rename to crates/fhir/tests/data/json/R5/ServiceRequest-genomicSRFather.json diff --git a/crates/fhir/tests/data/R5/ServiceRequest-genomicSRMother.json b/crates/fhir/tests/data/json/R5/ServiceRequest-genomicSRMother.json similarity index 100% rename from crates/fhir/tests/data/R5/ServiceRequest-genomicSRMother.json rename to crates/fhir/tests/data/json/R5/ServiceRequest-genomicSRMother.json diff --git a/crates/fhir/tests/data/R5/ServiceRequest-genomicSRProband.json b/crates/fhir/tests/data/json/R5/ServiceRequest-genomicSRProband.json similarity index 100% rename from crates/fhir/tests/data/R5/ServiceRequest-genomicSRProband.json rename to crates/fhir/tests/data/json/R5/ServiceRequest-genomicSRProband.json diff --git a/crates/fhir/tests/data/R5/ServiceRequest-genomicServiceRequest.json b/crates/fhir/tests/data/json/R5/ServiceRequest-genomicServiceRequest.json similarity index 100% rename from crates/fhir/tests/data/R5/ServiceRequest-genomicServiceRequest.json rename to crates/fhir/tests/data/json/R5/ServiceRequest-genomicServiceRequest.json diff --git a/crates/fhir/tests/data/R5/ServiceRequest-genomicServiceRequest2.json b/crates/fhir/tests/data/json/R5/ServiceRequest-genomicServiceRequest2.json similarity index 100% rename from crates/fhir/tests/data/R5/ServiceRequest-genomicServiceRequest2.json rename to crates/fhir/tests/data/json/R5/ServiceRequest-genomicServiceRequest2.json diff --git a/crates/fhir/tests/data/R5/ServiceRequest-genomicServiceRequest3.json b/crates/fhir/tests/data/json/R5/ServiceRequest-genomicServiceRequest3.json similarity index 100% rename from crates/fhir/tests/data/R5/ServiceRequest-genomicServiceRequest3.json rename to crates/fhir/tests/data/json/R5/ServiceRequest-genomicServiceRequest3.json diff --git a/crates/fhir/tests/data/R5/ServiceRequest-genomicServiceRequest4.json b/crates/fhir/tests/data/json/R5/ServiceRequest-genomicServiceRequest4.json similarity index 100% rename from crates/fhir/tests/data/R5/ServiceRequest-genomicServiceRequest4.json rename to crates/fhir/tests/data/json/R5/ServiceRequest-genomicServiceRequest4.json diff --git a/crates/fhir/tests/data/R5/Specimen-denovo-1.json b/crates/fhir/tests/data/json/R5/Specimen-denovo-1.json similarity index 100% rename from crates/fhir/tests/data/R5/Specimen-denovo-1.json rename to crates/fhir/tests/data/json/R5/Specimen-denovo-1.json diff --git a/crates/fhir/tests/data/R5/Specimen-denovo-2.json b/crates/fhir/tests/data/json/R5/Specimen-denovo-2.json similarity index 100% rename from crates/fhir/tests/data/R5/Specimen-denovo-2.json rename to crates/fhir/tests/data/json/R5/Specimen-denovo-2.json diff --git a/crates/fhir/tests/data/R5/Specimen-denovo-3.json b/crates/fhir/tests/data/json/R5/Specimen-denovo-3.json similarity index 100% rename from crates/fhir/tests/data/R5/Specimen-denovo-3.json rename to crates/fhir/tests/data/json/R5/Specimen-denovo-3.json diff --git a/crates/fhir/tests/data/R5/Specimen-genomicSpecimen.json b/crates/fhir/tests/data/json/R5/Specimen-genomicSpecimen.json similarity index 100% rename from crates/fhir/tests/data/R5/Specimen-genomicSpecimen.json rename to crates/fhir/tests/data/json/R5/Specimen-genomicSpecimen.json diff --git a/crates/fhir/tests/data/R5/Specimen-specimenFather.json b/crates/fhir/tests/data/json/R5/Specimen-specimenFather.json similarity index 100% rename from crates/fhir/tests/data/R5/Specimen-specimenFather.json rename to crates/fhir/tests/data/json/R5/Specimen-specimenFather.json diff --git a/crates/fhir/tests/data/R5/Specimen-specimenMother.json b/crates/fhir/tests/data/json/R5/Specimen-specimenMother.json similarity index 100% rename from crates/fhir/tests/data/R5/Specimen-specimenMother.json rename to crates/fhir/tests/data/json/R5/Specimen-specimenMother.json diff --git a/crates/fhir/tests/data/R5/Specimen-specimenProband.json b/crates/fhir/tests/data/json/R5/Specimen-specimenProband.json similarity index 100% rename from crates/fhir/tests/data/R5/Specimen-specimenProband.json rename to crates/fhir/tests/data/json/R5/Specimen-specimenProband.json diff --git a/crates/fhir/tests/data/R5/account-example-with-guarantor.json b/crates/fhir/tests/data/json/R5/account-example-with-guarantor.json similarity index 100% rename from crates/fhir/tests/data/R5/account-example-with-guarantor.json rename to crates/fhir/tests/data/json/R5/account-example-with-guarantor.json diff --git a/crates/fhir/tests/data/R5/account-example.json b/crates/fhir/tests/data/json/R5/account-example.json similarity index 100% rename from crates/fhir/tests/data/R5/account-example.json rename to crates/fhir/tests/data/json/R5/account-example.json diff --git a/crates/fhir/tests/data/R5/account-questionnaire.json b/crates/fhir/tests/data/json/R5/account-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/account-questionnaire.json rename to crates/fhir/tests/data/json/R5/account-questionnaire.json diff --git a/crates/fhir/tests/data/R5/account.profile.json b/crates/fhir/tests/data/json/R5/account.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/account.profile.json rename to crates/fhir/tests/data/json/R5/account.profile.json diff --git a/crates/fhir/tests/data/R5/activitydefinition-administer-zika-virus-exposure-assessment.json b/crates/fhir/tests/data/json/R5/activitydefinition-administer-zika-virus-exposure-assessment.json similarity index 100% rename from crates/fhir/tests/data/R5/activitydefinition-administer-zika-virus-exposure-assessment.json rename to crates/fhir/tests/data/json/R5/activitydefinition-administer-zika-virus-exposure-assessment.json diff --git a/crates/fhir/tests/data/R5/activitydefinition-example-alteplase-dosing.json b/crates/fhir/tests/data/json/R5/activitydefinition-example-alteplase-dosing.json similarity index 100% rename from crates/fhir/tests/data/R5/activitydefinition-example-alteplase-dosing.json rename to crates/fhir/tests/data/json/R5/activitydefinition-example-alteplase-dosing.json diff --git a/crates/fhir/tests/data/R5/activitydefinition-example.json b/crates/fhir/tests/data/json/R5/activitydefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R5/activitydefinition-example.json rename to crates/fhir/tests/data/json/R5/activitydefinition-example.json diff --git a/crates/fhir/tests/data/R5/activitydefinition-medicationorder-example.json b/crates/fhir/tests/data/json/R5/activitydefinition-medicationorder-example.json similarity index 100% rename from crates/fhir/tests/data/R5/activitydefinition-medicationorder-example.json rename to crates/fhir/tests/data/json/R5/activitydefinition-medicationorder-example.json diff --git a/crates/fhir/tests/data/R5/activitydefinition-order-serum-dengue-virus-igm.json b/crates/fhir/tests/data/json/R5/activitydefinition-order-serum-dengue-virus-igm.json similarity index 100% rename from crates/fhir/tests/data/R5/activitydefinition-order-serum-dengue-virus-igm.json rename to crates/fhir/tests/data/json/R5/activitydefinition-order-serum-dengue-virus-igm.json diff --git a/crates/fhir/tests/data/R5/activitydefinition-order-serum-zika-dengue-virus-igm.json b/crates/fhir/tests/data/json/R5/activitydefinition-order-serum-zika-dengue-virus-igm.json similarity index 100% rename from crates/fhir/tests/data/R5/activitydefinition-order-serum-zika-dengue-virus-igm.json rename to crates/fhir/tests/data/json/R5/activitydefinition-order-serum-zika-dengue-virus-igm.json diff --git a/crates/fhir/tests/data/R5/activitydefinition-predecessor-example.json b/crates/fhir/tests/data/json/R5/activitydefinition-predecessor-example.json similarity index 100% rename from crates/fhir/tests/data/R5/activitydefinition-predecessor-example.json rename to crates/fhir/tests/data/json/R5/activitydefinition-predecessor-example.json diff --git a/crates/fhir/tests/data/R5/activitydefinition-provide-mosquito-prevention-advice.json b/crates/fhir/tests/data/json/R5/activitydefinition-provide-mosquito-prevention-advice.json similarity index 100% rename from crates/fhir/tests/data/R5/activitydefinition-provide-mosquito-prevention-advice.json rename to crates/fhir/tests/data/json/R5/activitydefinition-provide-mosquito-prevention-advice.json diff --git a/crates/fhir/tests/data/R5/activitydefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/activitydefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/activitydefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/activitydefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/activitydefinition-servicerequest-example.json b/crates/fhir/tests/data/json/R5/activitydefinition-servicerequest-example.json similarity index 100% rename from crates/fhir/tests/data/R5/activitydefinition-servicerequest-example.json rename to crates/fhir/tests/data/json/R5/activitydefinition-servicerequest-example.json diff --git a/crates/fhir/tests/data/R5/activitydefinition-supplyrequest-example.json b/crates/fhir/tests/data/json/R5/activitydefinition-supplyrequest-example.json similarity index 100% rename from crates/fhir/tests/data/R5/activitydefinition-supplyrequest-example.json rename to crates/fhir/tests/data/json/R5/activitydefinition-supplyrequest-example.json diff --git a/crates/fhir/tests/data/R5/activitydefinition.profile.json b/crates/fhir/tests/data/json/R5/activitydefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/activitydefinition.profile.json rename to crates/fhir/tests/data/json/R5/activitydefinition.profile.json diff --git a/crates/fhir/tests/data/R5/actordefinition-client.json b/crates/fhir/tests/data/json/R5/actordefinition-client.json similarity index 100% rename from crates/fhir/tests/data/R5/actordefinition-client.json rename to crates/fhir/tests/data/json/R5/actordefinition-client.json diff --git a/crates/fhir/tests/data/R5/actordefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/actordefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/actordefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/actordefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/actordefinition-server.json b/crates/fhir/tests/data/json/R5/actordefinition-server.json similarity index 100% rename from crates/fhir/tests/data/R5/actordefinition-server.json rename to crates/fhir/tests/data/json/R5/actordefinition-server.json diff --git a/crates/fhir/tests/data/R5/actordefinition.profile.json b/crates/fhir/tests/data/json/R5/actordefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/actordefinition.profile.json rename to crates/fhir/tests/data/json/R5/actordefinition.profile.json diff --git a/crates/fhir/tests/data/R5/actualgroup-questionnaire.json b/crates/fhir/tests/data/json/R5/actualgroup-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/actualgroup-questionnaire.json rename to crates/fhir/tests/data/json/R5/actualgroup-questionnaire.json diff --git a/crates/fhir/tests/data/R5/actualgroup.profile.json b/crates/fhir/tests/data/json/R5/actualgroup.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/actualgroup.profile.json rename to crates/fhir/tests/data/json/R5/actualgroup.profile.json diff --git a/crates/fhir/tests/data/R5/address.profile.json b/crates/fhir/tests/data/json/R5/address.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/address.profile.json rename to crates/fhir/tests/data/json/R5/address.profile.json diff --git a/crates/fhir/tests/data/R5/administrableproductdefinition-example.json b/crates/fhir/tests/data/json/R5/administrableproductdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R5/administrableproductdefinition-example.json rename to crates/fhir/tests/data/json/R5/administrableproductdefinition-example.json diff --git a/crates/fhir/tests/data/R5/administrableproductdefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/administrableproductdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/administrableproductdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/administrableproductdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/administrableproductdefinition.profile.json b/crates/fhir/tests/data/json/R5/administrableproductdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/administrableproductdefinition.profile.json rename to crates/fhir/tests/data/json/R5/administrableproductdefinition.profile.json diff --git a/crates/fhir/tests/data/R5/adverseevent-questionnaire.json b/crates/fhir/tests/data/json/R5/adverseevent-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/adverseevent-questionnaire.json rename to crates/fhir/tests/data/json/R5/adverseevent-questionnaire.json diff --git a/crates/fhir/tests/data/R5/adverseevent.profile.json b/crates/fhir/tests/data/json/R5/adverseevent.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/adverseevent.profile.json rename to crates/fhir/tests/data/json/R5/adverseevent.profile.json diff --git a/crates/fhir/tests/data/R5/age.profile.json b/crates/fhir/tests/data/json/R5/age.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/age.profile.json rename to crates/fhir/tests/data/json/R5/age.profile.json diff --git a/crates/fhir/tests/data/R5/allergyintolerance-example.json b/crates/fhir/tests/data/json/R5/allergyintolerance-example.json similarity index 100% rename from crates/fhir/tests/data/R5/allergyintolerance-example.json rename to crates/fhir/tests/data/json/R5/allergyintolerance-example.json diff --git a/crates/fhir/tests/data/R5/allergyintolerance-fishallergy.json b/crates/fhir/tests/data/json/R5/allergyintolerance-fishallergy.json similarity index 100% rename from crates/fhir/tests/data/R5/allergyintolerance-fishallergy.json rename to crates/fhir/tests/data/json/R5/allergyintolerance-fishallergy.json diff --git a/crates/fhir/tests/data/R5/allergyintolerance-medication.json b/crates/fhir/tests/data/json/R5/allergyintolerance-medication.json similarity index 100% rename from crates/fhir/tests/data/R5/allergyintolerance-medication.json rename to crates/fhir/tests/data/json/R5/allergyintolerance-medication.json diff --git a/crates/fhir/tests/data/R5/allergyintolerance-nka.json b/crates/fhir/tests/data/json/R5/allergyintolerance-nka.json similarity index 100% rename from crates/fhir/tests/data/R5/allergyintolerance-nka.json rename to crates/fhir/tests/data/json/R5/allergyintolerance-nka.json diff --git a/crates/fhir/tests/data/R5/allergyintolerance-nkda.json b/crates/fhir/tests/data/json/R5/allergyintolerance-nkda.json similarity index 100% rename from crates/fhir/tests/data/R5/allergyintolerance-nkda.json rename to crates/fhir/tests/data/json/R5/allergyintolerance-nkda.json diff --git a/crates/fhir/tests/data/R5/allergyintolerance-nkla.json b/crates/fhir/tests/data/json/R5/allergyintolerance-nkla.json similarity index 100% rename from crates/fhir/tests/data/R5/allergyintolerance-nkla.json rename to crates/fhir/tests/data/json/R5/allergyintolerance-nkla.json diff --git a/crates/fhir/tests/data/R5/allergyintolerance-questionnaire.json b/crates/fhir/tests/data/json/R5/allergyintolerance-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/allergyintolerance-questionnaire.json rename to crates/fhir/tests/data/json/R5/allergyintolerance-questionnaire.json diff --git a/crates/fhir/tests/data/R5/allergyintolerance.profile.json b/crates/fhir/tests/data/json/R5/allergyintolerance.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/allergyintolerance.profile.json rename to crates/fhir/tests/data/json/R5/allergyintolerance.profile.json diff --git a/crates/fhir/tests/data/R5/annotation.profile.json b/crates/fhir/tests/data/json/R5/annotation.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/annotation.profile.json rename to crates/fhir/tests/data/json/R5/annotation.profile.json diff --git a/crates/fhir/tests/data/R5/appointment-example-request.json b/crates/fhir/tests/data/json/R5/appointment-example-request.json similarity index 100% rename from crates/fhir/tests/data/R5/appointment-example-request.json rename to crates/fhir/tests/data/json/R5/appointment-example-request.json diff --git a/crates/fhir/tests/data/R5/appointment-example.json b/crates/fhir/tests/data/json/R5/appointment-example.json similarity index 100% rename from crates/fhir/tests/data/R5/appointment-example.json rename to crates/fhir/tests/data/json/R5/appointment-example.json diff --git a/crates/fhir/tests/data/R5/appointment-example2doctors.json b/crates/fhir/tests/data/json/R5/appointment-example2doctors.json similarity index 100% rename from crates/fhir/tests/data/R5/appointment-example2doctors.json rename to crates/fhir/tests/data/json/R5/appointment-example2doctors.json diff --git a/crates/fhir/tests/data/R5/appointment-questionnaire.json b/crates/fhir/tests/data/json/R5/appointment-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/appointment-questionnaire.json rename to crates/fhir/tests/data/json/R5/appointment-questionnaire.json diff --git a/crates/fhir/tests/data/R5/appointment.profile.json b/crates/fhir/tests/data/json/R5/appointment.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/appointment.profile.json rename to crates/fhir/tests/data/json/R5/appointment.profile.json diff --git a/crates/fhir/tests/data/R5/appointmentresponse-example-loc.json b/crates/fhir/tests/data/json/R5/appointmentresponse-example-loc.json similarity index 100% rename from crates/fhir/tests/data/R5/appointmentresponse-example-loc.json rename to crates/fhir/tests/data/json/R5/appointmentresponse-example-loc.json diff --git a/crates/fhir/tests/data/R5/appointmentresponse-example-req.json b/crates/fhir/tests/data/json/R5/appointmentresponse-example-req.json similarity index 100% rename from crates/fhir/tests/data/R5/appointmentresponse-example-req.json rename to crates/fhir/tests/data/json/R5/appointmentresponse-example-req.json diff --git a/crates/fhir/tests/data/R5/appointmentresponse-example.json b/crates/fhir/tests/data/json/R5/appointmentresponse-example.json similarity index 100% rename from crates/fhir/tests/data/R5/appointmentresponse-example.json rename to crates/fhir/tests/data/json/R5/appointmentresponse-example.json diff --git a/crates/fhir/tests/data/R5/appointmentresponse-questionnaire.json b/crates/fhir/tests/data/json/R5/appointmentresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/appointmentresponse-questionnaire.json rename to crates/fhir/tests/data/json/R5/appointmentresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R5/appointmentresponse.profile.json b/crates/fhir/tests/data/json/R5/appointmentresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/appointmentresponse.profile.json rename to crates/fhir/tests/data/json/R5/appointmentresponse.profile.json diff --git a/crates/fhir/tests/data/R5/artifactassessment-example-certainty-rating.json b/crates/fhir/tests/data/json/R5/artifactassessment-example-certainty-rating.json similarity index 100% rename from crates/fhir/tests/data/R5/artifactassessment-example-certainty-rating.json rename to crates/fhir/tests/data/json/R5/artifactassessment-example-certainty-rating.json diff --git a/crates/fhir/tests/data/R5/artifactassessment-questionnaire.json b/crates/fhir/tests/data/json/R5/artifactassessment-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/artifactassessment-questionnaire.json rename to crates/fhir/tests/data/json/R5/artifactassessment-questionnaire.json diff --git a/crates/fhir/tests/data/R5/artifactassessment-risk-of-bias-example.json b/crates/fhir/tests/data/json/R5/artifactassessment-risk-of-bias-example.json similarity index 100% rename from crates/fhir/tests/data/R5/artifactassessment-risk-of-bias-example.json rename to crates/fhir/tests/data/json/R5/artifactassessment-risk-of-bias-example.json diff --git a/crates/fhir/tests/data/R5/artifactassessment.profile.json b/crates/fhir/tests/data/json/R5/artifactassessment.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/artifactassessment.profile.json rename to crates/fhir/tests/data/json/R5/artifactassessment.profile.json diff --git a/crates/fhir/tests/data/R5/attachment.profile.json b/crates/fhir/tests/data/json/R5/attachment.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/attachment.profile.json rename to crates/fhir/tests/data/json/R5/attachment.profile.json diff --git a/crates/fhir/tests/data/R5/audit-event-example-create-traceID.json b/crates/fhir/tests/data/json/R5/audit-event-example-create-traceID.json similarity index 100% rename from crates/fhir/tests/data/R5/audit-event-example-create-traceID.json rename to crates/fhir/tests/data/json/R5/audit-event-example-create-traceID.json diff --git a/crates/fhir/tests/data/R5/audit-event-example-login.json b/crates/fhir/tests/data/json/R5/audit-event-example-login.json similarity index 100% rename from crates/fhir/tests/data/R5/audit-event-example-login.json rename to crates/fhir/tests/data/json/R5/audit-event-example-login.json diff --git a/crates/fhir/tests/data/R5/audit-event-example-logout.json b/crates/fhir/tests/data/json/R5/audit-event-example-logout.json similarity index 100% rename from crates/fhir/tests/data/R5/audit-event-example-logout.json rename to crates/fhir/tests/data/json/R5/audit-event-example-logout.json diff --git a/crates/fhir/tests/data/R5/audit-event-example-media.json b/crates/fhir/tests/data/json/R5/audit-event-example-media.json similarity index 100% rename from crates/fhir/tests/data/R5/audit-event-example-media.json rename to crates/fhir/tests/data/json/R5/audit-event-example-media.json diff --git a/crates/fhir/tests/data/R5/audit-event-example-pixQuery.json b/crates/fhir/tests/data/json/R5/audit-event-example-pixQuery.json similarity index 100% rename from crates/fhir/tests/data/R5/audit-event-example-pixQuery.json rename to crates/fhir/tests/data/json/R5/audit-event-example-pixQuery.json diff --git a/crates/fhir/tests/data/R5/audit-event-example-search.json b/crates/fhir/tests/data/json/R5/audit-event-example-search.json similarity index 100% rename from crates/fhir/tests/data/R5/audit-event-example-search.json rename to crates/fhir/tests/data/json/R5/audit-event-example-search.json diff --git a/crates/fhir/tests/data/R5/audit-event-example-vread.json b/crates/fhir/tests/data/json/R5/audit-event-example-vread.json similarity index 100% rename from crates/fhir/tests/data/R5/audit-event-example-vread.json rename to crates/fhir/tests/data/json/R5/audit-event-example-vread.json diff --git a/crates/fhir/tests/data/R5/auditevent-example-advanced-create.json b/crates/fhir/tests/data/json/R5/auditevent-example-advanced-create.json similarity index 100% rename from crates/fhir/tests/data/R5/auditevent-example-advanced-create.json rename to crates/fhir/tests/data/json/R5/auditevent-example-advanced-create.json diff --git a/crates/fhir/tests/data/R5/auditevent-example-breakglass-start.json b/crates/fhir/tests/data/json/R5/auditevent-example-breakglass-start.json similarity index 100% rename from crates/fhir/tests/data/R5/auditevent-example-breakglass-start.json rename to crates/fhir/tests/data/json/R5/auditevent-example-breakglass-start.json diff --git a/crates/fhir/tests/data/R5/auditevent-example-consent-authz.json b/crates/fhir/tests/data/json/R5/auditevent-example-consent-authz.json similarity index 100% rename from crates/fhir/tests/data/R5/auditevent-example-consent-authz.json rename to crates/fhir/tests/data/json/R5/auditevent-example-consent-authz.json diff --git a/crates/fhir/tests/data/R5/auditevent-example-disclosure.json b/crates/fhir/tests/data/json/R5/auditevent-example-disclosure.json similarity index 100% rename from crates/fhir/tests/data/R5/auditevent-example-disclosure.json rename to crates/fhir/tests/data/json/R5/auditevent-example-disclosure.json diff --git a/crates/fhir/tests/data/R5/auditevent-example-error.json b/crates/fhir/tests/data/json/R5/auditevent-example-error.json similarity index 100% rename from crates/fhir/tests/data/R5/auditevent-example-error.json rename to crates/fhir/tests/data/json/R5/auditevent-example-error.json diff --git a/crates/fhir/tests/data/R5/auditevent-example.json b/crates/fhir/tests/data/json/R5/auditevent-example.json similarity index 100% rename from crates/fhir/tests/data/R5/auditevent-example.json rename to crates/fhir/tests/data/json/R5/auditevent-example.json diff --git a/crates/fhir/tests/data/R5/auditevent-questionnaire.json b/crates/fhir/tests/data/json/R5/auditevent-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/auditevent-questionnaire.json rename to crates/fhir/tests/data/json/R5/auditevent-questionnaire.json diff --git a/crates/fhir/tests/data/R5/auditevent.profile.json b/crates/fhir/tests/data/json/R5/auditevent.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/auditevent.profile.json rename to crates/fhir/tests/data/json/R5/auditevent.profile.json diff --git a/crates/fhir/tests/data/R5/availability.profile.json b/crates/fhir/tests/data/json/R5/availability.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/availability.profile.json rename to crates/fhir/tests/data/json/R5/availability.profile.json diff --git a/crates/fhir/tests/data/R5/backboneelement.profile.json b/crates/fhir/tests/data/json/R5/backboneelement.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/backboneelement.profile.json rename to crates/fhir/tests/data/json/R5/backboneelement.profile.json diff --git a/crates/fhir/tests/data/R5/backbonetype.profile.json b/crates/fhir/tests/data/json/R5/backbonetype.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/backbonetype.profile.json rename to crates/fhir/tests/data/json/R5/backbonetype.profile.json diff --git a/crates/fhir/tests/data/R5/base.profile.json b/crates/fhir/tests/data/json/R5/base.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/base.profile.json rename to crates/fhir/tests/data/json/R5/base.profile.json diff --git a/crates/fhir/tests/data/R5/base64binary.profile.json b/crates/fhir/tests/data/json/R5/base64binary.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/base64binary.profile.json rename to crates/fhir/tests/data/json/R5/base64binary.profile.json diff --git a/crates/fhir/tests/data/R5/basic-example-narrative.json b/crates/fhir/tests/data/json/R5/basic-example-narrative.json similarity index 100% rename from crates/fhir/tests/data/R5/basic-example-narrative.json rename to crates/fhir/tests/data/json/R5/basic-example-narrative.json diff --git a/crates/fhir/tests/data/R5/basic-example.json b/crates/fhir/tests/data/json/R5/basic-example.json similarity index 100% rename from crates/fhir/tests/data/R5/basic-example.json rename to crates/fhir/tests/data/json/R5/basic-example.json diff --git a/crates/fhir/tests/data/R5/basic-example2.json b/crates/fhir/tests/data/json/R5/basic-example2.json similarity index 100% rename from crates/fhir/tests/data/R5/basic-example2.json rename to crates/fhir/tests/data/json/R5/basic-example2.json diff --git a/crates/fhir/tests/data/R5/basic-questionnaire.json b/crates/fhir/tests/data/json/R5/basic-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/basic-questionnaire.json rename to crates/fhir/tests/data/json/R5/basic-questionnaire.json diff --git a/crates/fhir/tests/data/R5/basic.profile.json b/crates/fhir/tests/data/json/R5/basic.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/basic.profile.json rename to crates/fhir/tests/data/json/R5/basic.profile.json diff --git a/crates/fhir/tests/data/R5/batch-bundle-questionnaire.json b/crates/fhir/tests/data/json/R5/batch-bundle-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/batch-bundle-questionnaire.json rename to crates/fhir/tests/data/json/R5/batch-bundle-questionnaire.json diff --git a/crates/fhir/tests/data/R5/batch-bundle.profile.json b/crates/fhir/tests/data/json/R5/batch-bundle.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/batch-bundle.profile.json rename to crates/fhir/tests/data/json/R5/batch-bundle.profile.json diff --git a/crates/fhir/tests/data/R5/batch-response-bundle-questionnaire.json b/crates/fhir/tests/data/json/R5/batch-response-bundle-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/batch-response-bundle-questionnaire.json rename to crates/fhir/tests/data/json/R5/batch-response-bundle-questionnaire.json diff --git a/crates/fhir/tests/data/R5/batch-response-bundle.profile.json b/crates/fhir/tests/data/json/R5/batch-response-bundle.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/batch-response-bundle.profile.json rename to crates/fhir/tests/data/json/R5/batch-response-bundle.profile.json diff --git a/crates/fhir/tests/data/R5/binary-example.json b/crates/fhir/tests/data/json/R5/binary-example.json similarity index 100% rename from crates/fhir/tests/data/R5/binary-example.json rename to crates/fhir/tests/data/json/R5/binary-example.json diff --git a/crates/fhir/tests/data/R5/binary-f006.json b/crates/fhir/tests/data/json/R5/binary-f006.json similarity index 100% rename from crates/fhir/tests/data/R5/binary-f006.json rename to crates/fhir/tests/data/json/R5/binary-f006.json diff --git a/crates/fhir/tests/data/R5/binary-questionnaire.json b/crates/fhir/tests/data/json/R5/binary-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/binary-questionnaire.json rename to crates/fhir/tests/data/json/R5/binary-questionnaire.json diff --git a/crates/fhir/tests/data/R5/binary.profile.json b/crates/fhir/tests/data/json/R5/binary.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/binary.profile.json rename to crates/fhir/tests/data/json/R5/binary.profile.json diff --git a/crates/fhir/tests/data/R5/biologicallyderivedproduct-example-allogeneicHCT.json b/crates/fhir/tests/data/json/R5/biologicallyderivedproduct-example-allogeneicHCT.json similarity index 100% rename from crates/fhir/tests/data/R5/biologicallyderivedproduct-example-allogeneicHCT.json rename to crates/fhir/tests/data/json/R5/biologicallyderivedproduct-example-allogeneicHCT.json diff --git a/crates/fhir/tests/data/R5/biologicallyderivedproduct-example-autologousHCT.json b/crates/fhir/tests/data/json/R5/biologicallyderivedproduct-example-autologousHCT.json similarity index 100% rename from crates/fhir/tests/data/R5/biologicallyderivedproduct-example-autologousHCT.json rename to crates/fhir/tests/data/json/R5/biologicallyderivedproduct-example-autologousHCT.json diff --git a/crates/fhir/tests/data/R5/biologicallyderivedproduct-example.json b/crates/fhir/tests/data/json/R5/biologicallyderivedproduct-example.json similarity index 100% rename from crates/fhir/tests/data/R5/biologicallyderivedproduct-example.json rename to crates/fhir/tests/data/json/R5/biologicallyderivedproduct-example.json diff --git a/crates/fhir/tests/data/R5/biologicallyderivedproduct-questionnaire.json b/crates/fhir/tests/data/json/R5/biologicallyderivedproduct-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/biologicallyderivedproduct-questionnaire.json rename to crates/fhir/tests/data/json/R5/biologicallyderivedproduct-questionnaire.json diff --git a/crates/fhir/tests/data/R5/biologicallyderivedproduct.profile.json b/crates/fhir/tests/data/json/R5/biologicallyderivedproduct.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/biologicallyderivedproduct.profile.json rename to crates/fhir/tests/data/json/R5/biologicallyderivedproduct.profile.json diff --git a/crates/fhir/tests/data/R5/biologicallyderivedproductdispense-example.json b/crates/fhir/tests/data/json/R5/biologicallyderivedproductdispense-example.json similarity index 100% rename from crates/fhir/tests/data/R5/biologicallyderivedproductdispense-example.json rename to crates/fhir/tests/data/json/R5/biologicallyderivedproductdispense-example.json diff --git a/crates/fhir/tests/data/R5/biologicallyderivedproductdispense-questionnaire.json b/crates/fhir/tests/data/json/R5/biologicallyderivedproductdispense-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/biologicallyderivedproductdispense-questionnaire.json rename to crates/fhir/tests/data/json/R5/biologicallyderivedproductdispense-questionnaire.json diff --git a/crates/fhir/tests/data/R5/biologicallyderivedproductdispense.profile.json b/crates/fhir/tests/data/json/R5/biologicallyderivedproductdispense.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/biologicallyderivedproductdispense.profile.json rename to crates/fhir/tests/data/json/R5/biologicallyderivedproductdispense.profile.json diff --git a/crates/fhir/tests/data/R5/bmi-questionnaire.json b/crates/fhir/tests/data/json/R5/bmi-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/bmi-questionnaire.json rename to crates/fhir/tests/data/json/R5/bmi-questionnaire.json diff --git a/crates/fhir/tests/data/R5/bmi.profile.json b/crates/fhir/tests/data/json/R5/bmi.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/bmi.profile.json rename to crates/fhir/tests/data/json/R5/bmi.profile.json diff --git a/crates/fhir/tests/data/R5/bodyheight-questionnaire.json b/crates/fhir/tests/data/json/R5/bodyheight-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/bodyheight-questionnaire.json rename to crates/fhir/tests/data/json/R5/bodyheight-questionnaire.json diff --git a/crates/fhir/tests/data/R5/bodyheight.profile.json b/crates/fhir/tests/data/json/R5/bodyheight.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/bodyheight.profile.json rename to crates/fhir/tests/data/json/R5/bodyheight.profile.json diff --git a/crates/fhir/tests/data/R5/bodystructure-example-fetus.json b/crates/fhir/tests/data/json/R5/bodystructure-example-fetus.json similarity index 100% rename from crates/fhir/tests/data/R5/bodystructure-example-fetus.json rename to crates/fhir/tests/data/json/R5/bodystructure-example-fetus.json diff --git a/crates/fhir/tests/data/R5/bodystructure-example-skin-patch.json b/crates/fhir/tests/data/json/R5/bodystructure-example-skin-patch.json similarity index 100% rename from crates/fhir/tests/data/R5/bodystructure-example-skin-patch.json rename to crates/fhir/tests/data/json/R5/bodystructure-example-skin-patch.json diff --git a/crates/fhir/tests/data/R5/bodystructure-example-tumor.json b/crates/fhir/tests/data/json/R5/bodystructure-example-tumor.json similarity index 100% rename from crates/fhir/tests/data/R5/bodystructure-example-tumor.json rename to crates/fhir/tests/data/json/R5/bodystructure-example-tumor.json diff --git a/crates/fhir/tests/data/R5/bodystructure-questionnaire.json b/crates/fhir/tests/data/json/R5/bodystructure-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/bodystructure-questionnaire.json rename to crates/fhir/tests/data/json/R5/bodystructure-questionnaire.json diff --git a/crates/fhir/tests/data/R5/bodystructure.profile.json b/crates/fhir/tests/data/json/R5/bodystructure.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/bodystructure.profile.json rename to crates/fhir/tests/data/json/R5/bodystructure.profile.json diff --git a/crates/fhir/tests/data/R5/bodytemp-questionnaire.json b/crates/fhir/tests/data/json/R5/bodytemp-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/bodytemp-questionnaire.json rename to crates/fhir/tests/data/json/R5/bodytemp-questionnaire.json diff --git a/crates/fhir/tests/data/R5/bodytemp.profile.json b/crates/fhir/tests/data/json/R5/bodytemp.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/bodytemp.profile.json rename to crates/fhir/tests/data/json/R5/bodytemp.profile.json diff --git a/crates/fhir/tests/data/R5/bodyweight-questionnaire.json b/crates/fhir/tests/data/json/R5/bodyweight-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/bodyweight-questionnaire.json rename to crates/fhir/tests/data/json/R5/bodyweight-questionnaire.json diff --git a/crates/fhir/tests/data/R5/bodyweight.profile.json b/crates/fhir/tests/data/json/R5/bodyweight.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/bodyweight.profile.json rename to crates/fhir/tests/data/json/R5/bodyweight.profile.json diff --git a/crates/fhir/tests/data/R5/boolean.profile.json b/crates/fhir/tests/data/json/R5/boolean.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/boolean.profile.json rename to crates/fhir/tests/data/json/R5/boolean.profile.json diff --git a/crates/fhir/tests/data/R5/bp-questionnaire.json b/crates/fhir/tests/data/json/R5/bp-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/bp-questionnaire.json rename to crates/fhir/tests/data/json/R5/bp-questionnaire.json diff --git a/crates/fhir/tests/data/R5/bp.profile.json b/crates/fhir/tests/data/json/R5/bp.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/bp.profile.json rename to crates/fhir/tests/data/json/R5/bp.profile.json diff --git a/crates/fhir/tests/data/R5/bundle-example.json b/crates/fhir/tests/data/json/R5/bundle-example.json similarity index 100% rename from crates/fhir/tests/data/R5/bundle-example.json rename to crates/fhir/tests/data/json/R5/bundle-example.json diff --git a/crates/fhir/tests/data/R5/bundle-lipids.json b/crates/fhir/tests/data/json/R5/bundle-lipids.json similarity index 100% rename from crates/fhir/tests/data/R5/bundle-lipids.json rename to crates/fhir/tests/data/json/R5/bundle-lipids.json diff --git a/crates/fhir/tests/data/R5/bundle-lri-example.json b/crates/fhir/tests/data/json/R5/bundle-lri-example.json similarity index 100% rename from crates/fhir/tests/data/R5/bundle-lri-example.json rename to crates/fhir/tests/data/json/R5/bundle-lri-example.json diff --git a/crates/fhir/tests/data/R5/bundle-questionnaire.json b/crates/fhir/tests/data/json/R5/bundle-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/bundle-questionnaire.json rename to crates/fhir/tests/data/json/R5/bundle-questionnaire.json diff --git a/crates/fhir/tests/data/R5/bundle-references.json b/crates/fhir/tests/data/json/R5/bundle-references.json similarity index 100% rename from crates/fhir/tests/data/R5/bundle-references.json rename to crates/fhir/tests/data/json/R5/bundle-references.json diff --git a/crates/fhir/tests/data/R5/bundle-request-medsallergies.json b/crates/fhir/tests/data/json/R5/bundle-request-medsallergies.json similarity index 100% rename from crates/fhir/tests/data/R5/bundle-request-medsallergies.json rename to crates/fhir/tests/data/json/R5/bundle-request-medsallergies.json diff --git a/crates/fhir/tests/data/R5/bundle-request-simplesummary.json b/crates/fhir/tests/data/json/R5/bundle-request-simplesummary.json similarity index 100% rename from crates/fhir/tests/data/R5/bundle-request-simplesummary.json rename to crates/fhir/tests/data/json/R5/bundle-request-simplesummary.json diff --git a/crates/fhir/tests/data/R5/bundle-response-medsallergies.json b/crates/fhir/tests/data/json/R5/bundle-response-medsallergies.json similarity index 100% rename from crates/fhir/tests/data/R5/bundle-response-medsallergies.json rename to crates/fhir/tests/data/json/R5/bundle-response-medsallergies.json diff --git a/crates/fhir/tests/data/R5/bundle-response-simplesummary.json b/crates/fhir/tests/data/json/R5/bundle-response-simplesummary.json similarity index 100% rename from crates/fhir/tests/data/R5/bundle-response-simplesummary.json rename to crates/fhir/tests/data/json/R5/bundle-response-simplesummary.json diff --git a/crates/fhir/tests/data/R5/bundle-response.json b/crates/fhir/tests/data/json/R5/bundle-response.json similarity index 100% rename from crates/fhir/tests/data/R5/bundle-response.json rename to crates/fhir/tests/data/json/R5/bundle-response.json diff --git a/crates/fhir/tests/data/R5/bundle-search-warning.json b/crates/fhir/tests/data/json/R5/bundle-search-warning.json similarity index 100% rename from crates/fhir/tests/data/R5/bundle-search-warning.json rename to crates/fhir/tests/data/json/R5/bundle-search-warning.json diff --git a/crates/fhir/tests/data/R5/bundle-transaction.json b/crates/fhir/tests/data/json/R5/bundle-transaction.json similarity index 100% rename from crates/fhir/tests/data/R5/bundle-transaction.json rename to crates/fhir/tests/data/json/R5/bundle-transaction.json diff --git a/crates/fhir/tests/data/R5/bundle.profile.json b/crates/fhir/tests/data/json/R5/bundle.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/bundle.profile.json rename to crates/fhir/tests/data/json/R5/bundle.profile.json diff --git a/crates/fhir/tests/data/R5/canonical.profile.json b/crates/fhir/tests/data/json/R5/canonical.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/canonical.profile.json rename to crates/fhir/tests/data/json/R5/canonical.profile.json diff --git a/crates/fhir/tests/data/R5/canonicalresource.profile.json b/crates/fhir/tests/data/json/R5/canonicalresource.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/canonicalresource.profile.json rename to crates/fhir/tests/data/json/R5/canonicalresource.profile.json diff --git a/crates/fhir/tests/data/R5/capabilitystatement-base.json b/crates/fhir/tests/data/json/R5/capabilitystatement-base.json similarity index 100% rename from crates/fhir/tests/data/R5/capabilitystatement-base.json rename to crates/fhir/tests/data/json/R5/capabilitystatement-base.json diff --git a/crates/fhir/tests/data/R5/capabilitystatement-base2.json b/crates/fhir/tests/data/json/R5/capabilitystatement-base2.json similarity index 100% rename from crates/fhir/tests/data/R5/capabilitystatement-base2.json rename to crates/fhir/tests/data/json/R5/capabilitystatement-base2.json diff --git a/crates/fhir/tests/data/R5/capabilitystatement-example.json b/crates/fhir/tests/data/json/R5/capabilitystatement-example.json similarity index 100% rename from crates/fhir/tests/data/R5/capabilitystatement-example.json rename to crates/fhir/tests/data/json/R5/capabilitystatement-example.json diff --git a/crates/fhir/tests/data/R5/capabilitystatement-knowledge-repository.json b/crates/fhir/tests/data/json/R5/capabilitystatement-knowledge-repository.json similarity index 100% rename from crates/fhir/tests/data/R5/capabilitystatement-knowledge-repository.json rename to crates/fhir/tests/data/json/R5/capabilitystatement-knowledge-repository.json diff --git a/crates/fhir/tests/data/R5/capabilitystatement-measure-processor.json b/crates/fhir/tests/data/json/R5/capabilitystatement-measure-processor.json similarity index 100% rename from crates/fhir/tests/data/R5/capabilitystatement-measure-processor.json rename to crates/fhir/tests/data/json/R5/capabilitystatement-measure-processor.json diff --git a/crates/fhir/tests/data/R5/capabilitystatement-messagedefinition.json b/crates/fhir/tests/data/json/R5/capabilitystatement-messagedefinition.json similarity index 100% rename from crates/fhir/tests/data/R5/capabilitystatement-messagedefinition.json rename to crates/fhir/tests/data/json/R5/capabilitystatement-messagedefinition.json diff --git a/crates/fhir/tests/data/R5/capabilitystatement-phr-example.json b/crates/fhir/tests/data/json/R5/capabilitystatement-phr-example.json similarity index 100% rename from crates/fhir/tests/data/R5/capabilitystatement-phr-example.json rename to crates/fhir/tests/data/json/R5/capabilitystatement-phr-example.json diff --git a/crates/fhir/tests/data/R5/capabilitystatement-questionnaire.json b/crates/fhir/tests/data/json/R5/capabilitystatement-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/capabilitystatement-questionnaire.json rename to crates/fhir/tests/data/json/R5/capabilitystatement-questionnaire.json diff --git a/crates/fhir/tests/data/R5/capabilitystatement-terminology-server.json b/crates/fhir/tests/data/json/R5/capabilitystatement-terminology-server.json similarity index 100% rename from crates/fhir/tests/data/R5/capabilitystatement-terminology-server.json rename to crates/fhir/tests/data/json/R5/capabilitystatement-terminology-server.json diff --git a/crates/fhir/tests/data/R5/capabilitystatement.profile.json b/crates/fhir/tests/data/json/R5/capabilitystatement.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/capabilitystatement.profile.json rename to crates/fhir/tests/data/json/R5/capabilitystatement.profile.json diff --git a/crates/fhir/tests/data/R5/careplan-example-GPVisit.json b/crates/fhir/tests/data/json/R5/careplan-example-GPVisit.json similarity index 100% rename from crates/fhir/tests/data/R5/careplan-example-GPVisit.json rename to crates/fhir/tests/data/json/R5/careplan-example-GPVisit.json diff --git a/crates/fhir/tests/data/R5/careplan-example-f001-heart.json b/crates/fhir/tests/data/json/R5/careplan-example-f001-heart.json similarity index 100% rename from crates/fhir/tests/data/R5/careplan-example-f001-heart.json rename to crates/fhir/tests/data/json/R5/careplan-example-f001-heart.json diff --git a/crates/fhir/tests/data/R5/careplan-example-f002-lung.json b/crates/fhir/tests/data/json/R5/careplan-example-f002-lung.json similarity index 100% rename from crates/fhir/tests/data/R5/careplan-example-f002-lung.json rename to crates/fhir/tests/data/json/R5/careplan-example-f002-lung.json diff --git a/crates/fhir/tests/data/R5/careplan-example-f003-pharynx.json b/crates/fhir/tests/data/json/R5/careplan-example-f003-pharynx.json similarity index 100% rename from crates/fhir/tests/data/R5/careplan-example-f003-pharynx.json rename to crates/fhir/tests/data/json/R5/careplan-example-f003-pharynx.json diff --git a/crates/fhir/tests/data/R5/careplan-example-f201-renal.json b/crates/fhir/tests/data/json/R5/careplan-example-f201-renal.json similarity index 100% rename from crates/fhir/tests/data/R5/careplan-example-f201-renal.json rename to crates/fhir/tests/data/json/R5/careplan-example-f201-renal.json diff --git a/crates/fhir/tests/data/R5/careplan-example-f202-malignancy.json b/crates/fhir/tests/data/json/R5/careplan-example-f202-malignancy.json similarity index 100% rename from crates/fhir/tests/data/R5/careplan-example-f202-malignancy.json rename to crates/fhir/tests/data/json/R5/careplan-example-f202-malignancy.json diff --git a/crates/fhir/tests/data/R5/careplan-example-f203-sepsis.json b/crates/fhir/tests/data/json/R5/careplan-example-f203-sepsis.json similarity index 100% rename from crates/fhir/tests/data/R5/careplan-example-f203-sepsis.json rename to crates/fhir/tests/data/json/R5/careplan-example-f203-sepsis.json diff --git a/crates/fhir/tests/data/R5/careplan-example-integrated.json b/crates/fhir/tests/data/json/R5/careplan-example-integrated.json similarity index 100% rename from crates/fhir/tests/data/R5/careplan-example-integrated.json rename to crates/fhir/tests/data/json/R5/careplan-example-integrated.json diff --git a/crates/fhir/tests/data/R5/careplan-example-obesity-narrative.json b/crates/fhir/tests/data/json/R5/careplan-example-obesity-narrative.json similarity index 100% rename from crates/fhir/tests/data/R5/careplan-example-obesity-narrative.json rename to crates/fhir/tests/data/json/R5/careplan-example-obesity-narrative.json diff --git a/crates/fhir/tests/data/R5/careplan-example-pregnancy.json b/crates/fhir/tests/data/json/R5/careplan-example-pregnancy.json similarity index 100% rename from crates/fhir/tests/data/R5/careplan-example-pregnancy.json rename to crates/fhir/tests/data/json/R5/careplan-example-pregnancy.json diff --git a/crates/fhir/tests/data/R5/careplan-example.json b/crates/fhir/tests/data/json/R5/careplan-example.json similarity index 100% rename from crates/fhir/tests/data/R5/careplan-example.json rename to crates/fhir/tests/data/json/R5/careplan-example.json diff --git a/crates/fhir/tests/data/R5/careplan-questionnaire.json b/crates/fhir/tests/data/json/R5/careplan-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/careplan-questionnaire.json rename to crates/fhir/tests/data/json/R5/careplan-questionnaire.json diff --git a/crates/fhir/tests/data/R5/careplan.profile.json b/crates/fhir/tests/data/json/R5/careplan.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/careplan.profile.json rename to crates/fhir/tests/data/json/R5/careplan.profile.json diff --git a/crates/fhir/tests/data/R5/careteam-example.json b/crates/fhir/tests/data/json/R5/careteam-example.json similarity index 100% rename from crates/fhir/tests/data/R5/careteam-example.json rename to crates/fhir/tests/data/json/R5/careteam-example.json diff --git a/crates/fhir/tests/data/R5/careteam-questionnaire.json b/crates/fhir/tests/data/json/R5/careteam-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/careteam-questionnaire.json rename to crates/fhir/tests/data/json/R5/careteam-questionnaire.json diff --git a/crates/fhir/tests/data/R5/careteam.profile.json b/crates/fhir/tests/data/json/R5/careteam.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/careteam.profile.json rename to crates/fhir/tests/data/json/R5/careteam.profile.json diff --git a/crates/fhir/tests/data/R5/catalog-questionnaire.json b/crates/fhir/tests/data/json/R5/catalog-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/catalog-questionnaire.json rename to crates/fhir/tests/data/json/R5/catalog-questionnaire.json diff --git a/crates/fhir/tests/data/R5/catalog.profile.json b/crates/fhir/tests/data/json/R5/catalog.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/catalog.profile.json rename to crates/fhir/tests/data/json/R5/catalog.profile.json diff --git a/crates/fhir/tests/data/R5/cdshooksguidanceresponse-questionnaire.json b/crates/fhir/tests/data/json/R5/cdshooksguidanceresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/cdshooksguidanceresponse-questionnaire.json rename to crates/fhir/tests/data/json/R5/cdshooksguidanceresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R5/cdshooksguidanceresponse.profile.json b/crates/fhir/tests/data/json/R5/cdshooksguidanceresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/cdshooksguidanceresponse.profile.json rename to crates/fhir/tests/data/json/R5/cdshooksguidanceresponse.profile.json diff --git a/crates/fhir/tests/data/R5/cdshooksrequestorchestration-questionnaire.json b/crates/fhir/tests/data/json/R5/cdshooksrequestorchestration-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/cdshooksrequestorchestration-questionnaire.json rename to crates/fhir/tests/data/json/R5/cdshooksrequestorchestration-questionnaire.json diff --git a/crates/fhir/tests/data/R5/cdshooksrequestorchestration.profile.json b/crates/fhir/tests/data/json/R5/cdshooksrequestorchestration.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/cdshooksrequestorchestration.profile.json rename to crates/fhir/tests/data/json/R5/cdshooksrequestorchestration.profile.json diff --git a/crates/fhir/tests/data/R5/cdshooksserviceplandefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/cdshooksserviceplandefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/cdshooksserviceplandefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/cdshooksserviceplandefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/cdshooksserviceplandefinition.profile.json b/crates/fhir/tests/data/json/R5/cdshooksserviceplandefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/cdshooksserviceplandefinition.profile.json rename to crates/fhir/tests/data/json/R5/cdshooksserviceplandefinition.profile.json diff --git a/crates/fhir/tests/data/R5/chargeitem-example.json b/crates/fhir/tests/data/json/R5/chargeitem-example.json similarity index 100% rename from crates/fhir/tests/data/R5/chargeitem-example.json rename to crates/fhir/tests/data/json/R5/chargeitem-example.json diff --git a/crates/fhir/tests/data/R5/chargeitem-questionnaire.json b/crates/fhir/tests/data/json/R5/chargeitem-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/chargeitem-questionnaire.json rename to crates/fhir/tests/data/json/R5/chargeitem-questionnaire.json diff --git a/crates/fhir/tests/data/R5/chargeitem.profile.json b/crates/fhir/tests/data/json/R5/chargeitem.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/chargeitem.profile.json rename to crates/fhir/tests/data/json/R5/chargeitem.profile.json diff --git a/crates/fhir/tests/data/R5/chargeitemdefinition-device-example.json b/crates/fhir/tests/data/json/R5/chargeitemdefinition-device-example.json similarity index 100% rename from crates/fhir/tests/data/R5/chargeitemdefinition-device-example.json rename to crates/fhir/tests/data/json/R5/chargeitemdefinition-device-example.json diff --git a/crates/fhir/tests/data/R5/chargeitemdefinition-ebm-example.json b/crates/fhir/tests/data/json/R5/chargeitemdefinition-ebm-example.json similarity index 100% rename from crates/fhir/tests/data/R5/chargeitemdefinition-ebm-example.json rename to crates/fhir/tests/data/json/R5/chargeitemdefinition-ebm-example.json diff --git a/crates/fhir/tests/data/R5/chargeitemdefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/chargeitemdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/chargeitemdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/chargeitemdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/chargeitemdefinition.profile.json b/crates/fhir/tests/data/json/R5/chargeitemdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/chargeitemdefinition.profile.json rename to crates/fhir/tests/data/json/R5/chargeitemdefinition.profile.json diff --git a/crates/fhir/tests/data/R5/cholesterol-questionnaire.json b/crates/fhir/tests/data/json/R5/cholesterol-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/cholesterol-questionnaire.json rename to crates/fhir/tests/data/json/R5/cholesterol-questionnaire.json diff --git a/crates/fhir/tests/data/R5/cholesterol.profile.json b/crates/fhir/tests/data/json/R5/cholesterol.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/cholesterol.profile.json rename to crates/fhir/tests/data/json/R5/cholesterol.profile.json diff --git a/crates/fhir/tests/data/R5/citation-example-research-doi.json b/crates/fhir/tests/data/json/R5/citation-example-research-doi.json similarity index 100% rename from crates/fhir/tests/data/R5/citation-example-research-doi.json rename to crates/fhir/tests/data/json/R5/citation-example-research-doi.json diff --git a/crates/fhir/tests/data/R5/citation-questionnaire.json b/crates/fhir/tests/data/json/R5/citation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/citation-questionnaire.json rename to crates/fhir/tests/data/json/R5/citation-questionnaire.json diff --git a/crates/fhir/tests/data/R5/citation.profile.json b/crates/fhir/tests/data/json/R5/citation.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/citation.profile.json rename to crates/fhir/tests/data/json/R5/citation.profile.json diff --git a/crates/fhir/tests/data/R5/claim-example-cms1500-medical.json b/crates/fhir/tests/data/json/R5/claim-example-cms1500-medical.json similarity index 100% rename from crates/fhir/tests/data/R5/claim-example-cms1500-medical.json rename to crates/fhir/tests/data/json/R5/claim-example-cms1500-medical.json diff --git a/crates/fhir/tests/data/R5/claim-example-institutional-rich.json b/crates/fhir/tests/data/json/R5/claim-example-institutional-rich.json similarity index 100% rename from crates/fhir/tests/data/R5/claim-example-institutional-rich.json rename to crates/fhir/tests/data/json/R5/claim-example-institutional-rich.json diff --git a/crates/fhir/tests/data/R5/claim-example-institutional.json b/crates/fhir/tests/data/json/R5/claim-example-institutional.json similarity index 100% rename from crates/fhir/tests/data/R5/claim-example-institutional.json rename to crates/fhir/tests/data/json/R5/claim-example-institutional.json diff --git a/crates/fhir/tests/data/R5/claim-example-oral-average.json b/crates/fhir/tests/data/json/R5/claim-example-oral-average.json similarity index 100% rename from crates/fhir/tests/data/R5/claim-example-oral-average.json rename to crates/fhir/tests/data/json/R5/claim-example-oral-average.json diff --git a/crates/fhir/tests/data/R5/claim-example-oral-bridge.json b/crates/fhir/tests/data/json/R5/claim-example-oral-bridge.json similarity index 100% rename from crates/fhir/tests/data/R5/claim-example-oral-bridge.json rename to crates/fhir/tests/data/json/R5/claim-example-oral-bridge.json diff --git a/crates/fhir/tests/data/R5/claim-example-oral-contained-identifier.json b/crates/fhir/tests/data/json/R5/claim-example-oral-contained-identifier.json similarity index 100% rename from crates/fhir/tests/data/R5/claim-example-oral-contained-identifier.json rename to crates/fhir/tests/data/json/R5/claim-example-oral-contained-identifier.json diff --git a/crates/fhir/tests/data/R5/claim-example-oral-contained.json b/crates/fhir/tests/data/json/R5/claim-example-oral-contained.json similarity index 100% rename from crates/fhir/tests/data/R5/claim-example-oral-contained.json rename to crates/fhir/tests/data/json/R5/claim-example-oral-contained.json diff --git a/crates/fhir/tests/data/R5/claim-example-oral-identifier.json b/crates/fhir/tests/data/json/R5/claim-example-oral-identifier.json similarity index 100% rename from crates/fhir/tests/data/R5/claim-example-oral-identifier.json rename to crates/fhir/tests/data/json/R5/claim-example-oral-identifier.json diff --git a/crates/fhir/tests/data/R5/claim-example-oral-orthoplan.json b/crates/fhir/tests/data/json/R5/claim-example-oral-orthoplan.json similarity index 100% rename from crates/fhir/tests/data/R5/claim-example-oral-orthoplan.json rename to crates/fhir/tests/data/json/R5/claim-example-oral-orthoplan.json diff --git a/crates/fhir/tests/data/R5/claim-example-pharmacy-compound.json b/crates/fhir/tests/data/json/R5/claim-example-pharmacy-compound.json similarity index 100% rename from crates/fhir/tests/data/R5/claim-example-pharmacy-compound.json rename to crates/fhir/tests/data/json/R5/claim-example-pharmacy-compound.json diff --git a/crates/fhir/tests/data/R5/claim-example-pharmacy-medication.json b/crates/fhir/tests/data/json/R5/claim-example-pharmacy-medication.json similarity index 100% rename from crates/fhir/tests/data/R5/claim-example-pharmacy-medication.json rename to crates/fhir/tests/data/json/R5/claim-example-pharmacy-medication.json diff --git a/crates/fhir/tests/data/R5/claim-example-pharmacy.json b/crates/fhir/tests/data/json/R5/claim-example-pharmacy.json similarity index 100% rename from crates/fhir/tests/data/R5/claim-example-pharmacy.json rename to crates/fhir/tests/data/json/R5/claim-example-pharmacy.json diff --git a/crates/fhir/tests/data/R5/claim-example-professional.json b/crates/fhir/tests/data/json/R5/claim-example-professional.json similarity index 100% rename from crates/fhir/tests/data/R5/claim-example-professional.json rename to crates/fhir/tests/data/json/R5/claim-example-professional.json diff --git a/crates/fhir/tests/data/R5/claim-example-vision-glasses-3tier.json b/crates/fhir/tests/data/json/R5/claim-example-vision-glasses-3tier.json similarity index 100% rename from crates/fhir/tests/data/R5/claim-example-vision-glasses-3tier.json rename to crates/fhir/tests/data/json/R5/claim-example-vision-glasses-3tier.json diff --git a/crates/fhir/tests/data/R5/claim-example-vision-glasses.json b/crates/fhir/tests/data/json/R5/claim-example-vision-glasses.json similarity index 100% rename from crates/fhir/tests/data/R5/claim-example-vision-glasses.json rename to crates/fhir/tests/data/json/R5/claim-example-vision-glasses.json diff --git a/crates/fhir/tests/data/R5/claim-example-vision.json b/crates/fhir/tests/data/json/R5/claim-example-vision.json similarity index 100% rename from crates/fhir/tests/data/R5/claim-example-vision.json rename to crates/fhir/tests/data/json/R5/claim-example-vision.json diff --git a/crates/fhir/tests/data/R5/claim-example.json b/crates/fhir/tests/data/json/R5/claim-example.json similarity index 100% rename from crates/fhir/tests/data/R5/claim-example.json rename to crates/fhir/tests/data/json/R5/claim-example.json diff --git a/crates/fhir/tests/data/R5/claim-questionnaire.json b/crates/fhir/tests/data/json/R5/claim-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/claim-questionnaire.json rename to crates/fhir/tests/data/json/R5/claim-questionnaire.json diff --git a/crates/fhir/tests/data/R5/claim.profile.json b/crates/fhir/tests/data/json/R5/claim.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/claim.profile.json rename to crates/fhir/tests/data/json/R5/claim.profile.json diff --git a/crates/fhir/tests/data/R5/claimresponse-example-2.json b/crates/fhir/tests/data/json/R5/claimresponse-example-2.json similarity index 100% rename from crates/fhir/tests/data/R5/claimresponse-example-2.json rename to crates/fhir/tests/data/json/R5/claimresponse-example-2.json diff --git a/crates/fhir/tests/data/R5/claimresponse-example-additem.json b/crates/fhir/tests/data/json/R5/claimresponse-example-additem.json similarity index 100% rename from crates/fhir/tests/data/R5/claimresponse-example-additem.json rename to crates/fhir/tests/data/json/R5/claimresponse-example-additem.json diff --git a/crates/fhir/tests/data/R5/claimresponse-example-unsolicited-preauth.json b/crates/fhir/tests/data/json/R5/claimresponse-example-unsolicited-preauth.json similarity index 100% rename from crates/fhir/tests/data/R5/claimresponse-example-unsolicited-preauth.json rename to crates/fhir/tests/data/json/R5/claimresponse-example-unsolicited-preauth.json diff --git a/crates/fhir/tests/data/R5/claimresponse-example-vision-3tier.json b/crates/fhir/tests/data/json/R5/claimresponse-example-vision-3tier.json similarity index 100% rename from crates/fhir/tests/data/R5/claimresponse-example-vision-3tier.json rename to crates/fhir/tests/data/json/R5/claimresponse-example-vision-3tier.json diff --git a/crates/fhir/tests/data/R5/claimresponse-example.json b/crates/fhir/tests/data/json/R5/claimresponse-example.json similarity index 100% rename from crates/fhir/tests/data/R5/claimresponse-example.json rename to crates/fhir/tests/data/json/R5/claimresponse-example.json diff --git a/crates/fhir/tests/data/R5/claimresponse-questionnaire.json b/crates/fhir/tests/data/json/R5/claimresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/claimresponse-questionnaire.json rename to crates/fhir/tests/data/json/R5/claimresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R5/claimresponse.profile.json b/crates/fhir/tests/data/json/R5/claimresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/claimresponse.profile.json rename to crates/fhir/tests/data/json/R5/claimresponse.profile.json diff --git a/crates/fhir/tests/data/R5/clinicaldocument-questionnaire.json b/crates/fhir/tests/data/json/R5/clinicaldocument-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/clinicaldocument-questionnaire.json rename to crates/fhir/tests/data/json/R5/clinicaldocument-questionnaire.json diff --git a/crates/fhir/tests/data/R5/clinicaldocument.profile.json b/crates/fhir/tests/data/json/R5/clinicaldocument.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/clinicaldocument.profile.json rename to crates/fhir/tests/data/json/R5/clinicaldocument.profile.json diff --git a/crates/fhir/tests/data/R5/clinicalimpression-example.json b/crates/fhir/tests/data/json/R5/clinicalimpression-example.json similarity index 100% rename from crates/fhir/tests/data/R5/clinicalimpression-example.json rename to crates/fhir/tests/data/json/R5/clinicalimpression-example.json diff --git a/crates/fhir/tests/data/R5/clinicalimpression-questionnaire.json b/crates/fhir/tests/data/json/R5/clinicalimpression-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/clinicalimpression-questionnaire.json rename to crates/fhir/tests/data/json/R5/clinicalimpression-questionnaire.json diff --git a/crates/fhir/tests/data/R5/clinicalimpression.profile.json b/crates/fhir/tests/data/json/R5/clinicalimpression.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/clinicalimpression.profile.json rename to crates/fhir/tests/data/json/R5/clinicalimpression.profile.json diff --git a/crates/fhir/tests/data/R5/clinicalusedefinition-example.json b/crates/fhir/tests/data/json/R5/clinicalusedefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R5/clinicalusedefinition-example.json rename to crates/fhir/tests/data/json/R5/clinicalusedefinition-example.json diff --git a/crates/fhir/tests/data/R5/clinicalusedefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/clinicalusedefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/clinicalusedefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/clinicalusedefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/clinicalusedefinition.profile.json b/crates/fhir/tests/data/json/R5/clinicalusedefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/clinicalusedefinition.profile.json rename to crates/fhir/tests/data/json/R5/clinicalusedefinition.profile.json diff --git a/crates/fhir/tests/data/R5/cm-address-type-v3.json b/crates/fhir/tests/data/json/R5/cm-address-type-v3.json similarity index 100% rename from crates/fhir/tests/data/R5/cm-address-type-v3.json rename to crates/fhir/tests/data/json/R5/cm-address-type-v3.json diff --git a/crates/fhir/tests/data/R5/cm-address-use-v2.json b/crates/fhir/tests/data/json/R5/cm-address-use-v2.json similarity index 100% rename from crates/fhir/tests/data/R5/cm-address-use-v2.json rename to crates/fhir/tests/data/json/R5/cm-address-use-v2.json diff --git a/crates/fhir/tests/data/R5/cm-address-use-v3.json b/crates/fhir/tests/data/json/R5/cm-address-use-v3.json similarity index 100% rename from crates/fhir/tests/data/R5/cm-address-use-v3.json rename to crates/fhir/tests/data/json/R5/cm-address-use-v3.json diff --git a/crates/fhir/tests/data/R5/cm-administrative-gender-v2.json b/crates/fhir/tests/data/json/R5/cm-administrative-gender-v2.json similarity index 100% rename from crates/fhir/tests/data/R5/cm-administrative-gender-v2.json rename to crates/fhir/tests/data/json/R5/cm-administrative-gender-v2.json diff --git a/crates/fhir/tests/data/R5/cm-administrative-gender-v3.json b/crates/fhir/tests/data/json/R5/cm-administrative-gender-v3.json similarity index 100% rename from crates/fhir/tests/data/R5/cm-administrative-gender-v3.json rename to crates/fhir/tests/data/json/R5/cm-administrative-gender-v3.json diff --git a/crates/fhir/tests/data/R5/cm-composition-status-v3.json b/crates/fhir/tests/data/json/R5/cm-composition-status-v3.json similarity index 100% rename from crates/fhir/tests/data/R5/cm-composition-status-v3.json rename to crates/fhir/tests/data/json/R5/cm-composition-status-v3.json diff --git a/crates/fhir/tests/data/R5/cm-contact-point-system-v2.json b/crates/fhir/tests/data/json/R5/cm-contact-point-system-v2.json similarity index 100% rename from crates/fhir/tests/data/R5/cm-contact-point-system-v2.json rename to crates/fhir/tests/data/json/R5/cm-contact-point-system-v2.json diff --git a/crates/fhir/tests/data/R5/cm-contact-point-use-v2.json b/crates/fhir/tests/data/json/R5/cm-contact-point-use-v2.json similarity index 100% rename from crates/fhir/tests/data/R5/cm-contact-point-use-v2.json rename to crates/fhir/tests/data/json/R5/cm-contact-point-use-v2.json diff --git a/crates/fhir/tests/data/R5/cm-contact-point-use-v3.json b/crates/fhir/tests/data/json/R5/cm-contact-point-use-v3.json similarity index 100% rename from crates/fhir/tests/data/R5/cm-contact-point-use-v3.json rename to crates/fhir/tests/data/json/R5/cm-contact-point-use-v3.json diff --git a/crates/fhir/tests/data/R5/cm-detectedissue-severity-v3.json b/crates/fhir/tests/data/json/R5/cm-detectedissue-severity-v3.json similarity index 100% rename from crates/fhir/tests/data/R5/cm-detectedissue-severity-v3.json rename to crates/fhir/tests/data/json/R5/cm-detectedissue-severity-v3.json diff --git a/crates/fhir/tests/data/R5/cm-document-reference-status-v3.json b/crates/fhir/tests/data/json/R5/cm-document-reference-status-v3.json similarity index 100% rename from crates/fhir/tests/data/R5/cm-document-reference-status-v3.json rename to crates/fhir/tests/data/json/R5/cm-document-reference-status-v3.json diff --git a/crates/fhir/tests/data/R5/cm-name-use-v2.json b/crates/fhir/tests/data/json/R5/cm-name-use-v2.json similarity index 100% rename from crates/fhir/tests/data/R5/cm-name-use-v2.json rename to crates/fhir/tests/data/json/R5/cm-name-use-v2.json diff --git a/crates/fhir/tests/data/R5/cm-name-use-v3.json b/crates/fhir/tests/data/json/R5/cm-name-use-v3.json similarity index 100% rename from crates/fhir/tests/data/R5/cm-name-use-v3.json rename to crates/fhir/tests/data/json/R5/cm-name-use-v3.json diff --git a/crates/fhir/tests/data/R5/code.profile.json b/crates/fhir/tests/data/json/R5/code.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/code.profile.json rename to crates/fhir/tests/data/json/R5/code.profile.json diff --git a/crates/fhir/tests/data/R5/codeableconcept.profile.json b/crates/fhir/tests/data/json/R5/codeableconcept.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/codeableconcept.profile.json rename to crates/fhir/tests/data/json/R5/codeableconcept.profile.json diff --git a/crates/fhir/tests/data/R5/codeablereference.profile.json b/crates/fhir/tests/data/json/R5/codeablereference.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/codeablereference.profile.json rename to crates/fhir/tests/data/json/R5/codeablereference.profile.json diff --git a/crates/fhir/tests/data/R5/codesystem-FHIR-version.json b/crates/fhir/tests/data/json/R5/codesystem-FHIR-version.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-FHIR-version.json rename to crates/fhir/tests/data/json/R5/codesystem-FHIR-version.json diff --git a/crates/fhir/tests/data/R5/codesystem-account-aggregate.json b/crates/fhir/tests/data/json/R5/codesystem-account-aggregate.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-account-aggregate.json rename to crates/fhir/tests/data/json/R5/codesystem-account-aggregate.json diff --git a/crates/fhir/tests/data/R5/codesystem-account-balance-term.json b/crates/fhir/tests/data/json/R5/codesystem-account-balance-term.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-account-balance-term.json rename to crates/fhir/tests/data/json/R5/codesystem-account-balance-term.json diff --git a/crates/fhir/tests/data/R5/codesystem-account-billing-status.json b/crates/fhir/tests/data/json/R5/codesystem-account-billing-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-account-billing-status.json rename to crates/fhir/tests/data/json/R5/codesystem-account-billing-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-account-relationship.json b/crates/fhir/tests/data/json/R5/codesystem-account-relationship.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-account-relationship.json rename to crates/fhir/tests/data/json/R5/codesystem-account-relationship.json diff --git a/crates/fhir/tests/data/R5/codesystem-account-status.json b/crates/fhir/tests/data/json/R5/codesystem-account-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-account-status.json rename to crates/fhir/tests/data/json/R5/codesystem-account-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-action-cardinality-behavior.json b/crates/fhir/tests/data/json/R5/codesystem-action-cardinality-behavior.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-action-cardinality-behavior.json rename to crates/fhir/tests/data/json/R5/codesystem-action-cardinality-behavior.json diff --git a/crates/fhir/tests/data/R5/codesystem-action-code.json b/crates/fhir/tests/data/json/R5/codesystem-action-code.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-action-code.json rename to crates/fhir/tests/data/json/R5/codesystem-action-code.json diff --git a/crates/fhir/tests/data/R5/codesystem-action-condition-kind.json b/crates/fhir/tests/data/json/R5/codesystem-action-condition-kind.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-action-condition-kind.json rename to crates/fhir/tests/data/json/R5/codesystem-action-condition-kind.json diff --git a/crates/fhir/tests/data/R5/codesystem-action-grouping-behavior.json b/crates/fhir/tests/data/json/R5/codesystem-action-grouping-behavior.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-action-grouping-behavior.json rename to crates/fhir/tests/data/json/R5/codesystem-action-grouping-behavior.json diff --git a/crates/fhir/tests/data/R5/codesystem-action-participant-function.json b/crates/fhir/tests/data/json/R5/codesystem-action-participant-function.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-action-participant-function.json rename to crates/fhir/tests/data/json/R5/codesystem-action-participant-function.json diff --git a/crates/fhir/tests/data/R5/codesystem-action-participant-type.json b/crates/fhir/tests/data/json/R5/codesystem-action-participant-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-action-participant-type.json rename to crates/fhir/tests/data/json/R5/codesystem-action-participant-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-action-precheck-behavior.json b/crates/fhir/tests/data/json/R5/codesystem-action-precheck-behavior.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-action-precheck-behavior.json rename to crates/fhir/tests/data/json/R5/codesystem-action-precheck-behavior.json diff --git a/crates/fhir/tests/data/R5/codesystem-action-reason-code.json b/crates/fhir/tests/data/json/R5/codesystem-action-reason-code.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-action-reason-code.json rename to crates/fhir/tests/data/json/R5/codesystem-action-reason-code.json diff --git a/crates/fhir/tests/data/R5/codesystem-action-relationship-type.json b/crates/fhir/tests/data/json/R5/codesystem-action-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-action-relationship-type.json rename to crates/fhir/tests/data/json/R5/codesystem-action-relationship-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-action-required-behavior.json b/crates/fhir/tests/data/json/R5/codesystem-action-required-behavior.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-action-required-behavior.json rename to crates/fhir/tests/data/json/R5/codesystem-action-required-behavior.json diff --git a/crates/fhir/tests/data/R5/codesystem-action-selection-behavior.json b/crates/fhir/tests/data/json/R5/codesystem-action-selection-behavior.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-action-selection-behavior.json rename to crates/fhir/tests/data/json/R5/codesystem-action-selection-behavior.json diff --git a/crates/fhir/tests/data/R5/codesystem-additional-binding-purpose.json b/crates/fhir/tests/data/json/R5/codesystem-additional-binding-purpose.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-additional-binding-purpose.json rename to crates/fhir/tests/data/json/R5/codesystem-additional-binding-purpose.json diff --git a/crates/fhir/tests/data/R5/codesystem-address-type.json b/crates/fhir/tests/data/json/R5/codesystem-address-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-address-type.json rename to crates/fhir/tests/data/json/R5/codesystem-address-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-address-use.json b/crates/fhir/tests/data/json/R5/codesystem-address-use.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-address-use.json rename to crates/fhir/tests/data/json/R5/codesystem-address-use.json diff --git a/crates/fhir/tests/data/R5/codesystem-administrable-dose-form.json b/crates/fhir/tests/data/json/R5/codesystem-administrable-dose-form.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-administrable-dose-form.json rename to crates/fhir/tests/data/json/R5/codesystem-administrable-dose-form.json diff --git a/crates/fhir/tests/data/R5/codesystem-administration-subpotent-reason.json b/crates/fhir/tests/data/json/R5/codesystem-administration-subpotent-reason.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-administration-subpotent-reason.json rename to crates/fhir/tests/data/json/R5/codesystem-administration-subpotent-reason.json diff --git a/crates/fhir/tests/data/R5/codesystem-administrative-gender.json b/crates/fhir/tests/data/json/R5/codesystem-administrative-gender.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-administrative-gender.json rename to crates/fhir/tests/data/json/R5/codesystem-administrative-gender.json diff --git a/crates/fhir/tests/data/R5/codesystem-adverse-event-actuality.json b/crates/fhir/tests/data/json/R5/codesystem-adverse-event-actuality.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-adverse-event-actuality.json rename to crates/fhir/tests/data/json/R5/codesystem-adverse-event-actuality.json diff --git a/crates/fhir/tests/data/R5/codesystem-allergy-intolerance-category.json b/crates/fhir/tests/data/json/R5/codesystem-allergy-intolerance-category.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-allergy-intolerance-category.json rename to crates/fhir/tests/data/json/R5/codesystem-allergy-intolerance-category.json diff --git a/crates/fhir/tests/data/R5/codesystem-allergy-intolerance-criticality.json b/crates/fhir/tests/data/json/R5/codesystem-allergy-intolerance-criticality.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-allergy-intolerance-criticality.json rename to crates/fhir/tests/data/json/R5/codesystem-allergy-intolerance-criticality.json diff --git a/crates/fhir/tests/data/R5/codesystem-allergy-intolerance-type.json b/crates/fhir/tests/data/json/R5/codesystem-allergy-intolerance-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-allergy-intolerance-type.json rename to crates/fhir/tests/data/json/R5/codesystem-allergy-intolerance-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-animal-tissue-type.json b/crates/fhir/tests/data/json/R5/codesystem-animal-tissue-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-animal-tissue-type.json rename to crates/fhir/tests/data/json/R5/codesystem-animal-tissue-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-appointmentstatus.json b/crates/fhir/tests/data/json/R5/codesystem-appointmentstatus.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-appointmentstatus.json rename to crates/fhir/tests/data/json/R5/codesystem-appointmentstatus.json diff --git a/crates/fhir/tests/data/R5/codesystem-artifact-contribution-instance-type.json b/crates/fhir/tests/data/json/R5/codesystem-artifact-contribution-instance-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-artifact-contribution-instance-type.json rename to crates/fhir/tests/data/json/R5/codesystem-artifact-contribution-instance-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-artifact-contribution-type.json b/crates/fhir/tests/data/json/R5/codesystem-artifact-contribution-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-artifact-contribution-type.json rename to crates/fhir/tests/data/json/R5/codesystem-artifact-contribution-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-artifact-url-classifier.json b/crates/fhir/tests/data/json/R5/codesystem-artifact-url-classifier.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-artifact-url-classifier.json rename to crates/fhir/tests/data/json/R5/codesystem-artifact-url-classifier.json diff --git a/crates/fhir/tests/data/R5/codesystem-artifactassessment-disposition.json b/crates/fhir/tests/data/json/R5/codesystem-artifactassessment-disposition.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-artifactassessment-disposition.json rename to crates/fhir/tests/data/json/R5/codesystem-artifactassessment-disposition.json diff --git a/crates/fhir/tests/data/R5/codesystem-artifactassessment-information-type.json b/crates/fhir/tests/data/json/R5/codesystem-artifactassessment-information-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-artifactassessment-information-type.json rename to crates/fhir/tests/data/json/R5/codesystem-artifactassessment-information-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-artifactassessment-workflow-status.json b/crates/fhir/tests/data/json/R5/codesystem-artifactassessment-workflow-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-artifactassessment-workflow-status.json rename to crates/fhir/tests/data/json/R5/codesystem-artifactassessment-workflow-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-assert-direction-codes.json b/crates/fhir/tests/data/json/R5/codesystem-assert-direction-codes.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-assert-direction-codes.json rename to crates/fhir/tests/data/json/R5/codesystem-assert-direction-codes.json diff --git a/crates/fhir/tests/data/R5/codesystem-assert-manual-completion-codes.json b/crates/fhir/tests/data/json/R5/codesystem-assert-manual-completion-codes.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-assert-manual-completion-codes.json rename to crates/fhir/tests/data/json/R5/codesystem-assert-manual-completion-codes.json diff --git a/crates/fhir/tests/data/R5/codesystem-assert-operator-codes.json b/crates/fhir/tests/data/json/R5/codesystem-assert-operator-codes.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-assert-operator-codes.json rename to crates/fhir/tests/data/json/R5/codesystem-assert-operator-codes.json diff --git a/crates/fhir/tests/data/R5/codesystem-assert-response-code-types.json b/crates/fhir/tests/data/json/R5/codesystem-assert-response-code-types.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-assert-response-code-types.json rename to crates/fhir/tests/data/json/R5/codesystem-assert-response-code-types.json diff --git a/crates/fhir/tests/data/R5/codesystem-asset-availability.json b/crates/fhir/tests/data/json/R5/codesystem-asset-availability.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-asset-availability.json rename to crates/fhir/tests/data/json/R5/codesystem-asset-availability.json diff --git a/crates/fhir/tests/data/R5/codesystem-astm-signature-type.json b/crates/fhir/tests/data/json/R5/codesystem-astm-signature-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-astm-signature-type.json rename to crates/fhir/tests/data/json/R5/codesystem-astm-signature-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-audit-event-action.json b/crates/fhir/tests/data/json/R5/codesystem-audit-event-action.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-audit-event-action.json rename to crates/fhir/tests/data/json/R5/codesystem-audit-event-action.json diff --git a/crates/fhir/tests/data/R5/codesystem-audit-event-severity.json b/crates/fhir/tests/data/json/R5/codesystem-audit-event-severity.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-audit-event-severity.json rename to crates/fhir/tests/data/json/R5/codesystem-audit-event-severity.json diff --git a/crates/fhir/tests/data/R5/codesystem-binding-strength.json b/crates/fhir/tests/data/json/R5/codesystem-binding-strength.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-binding-strength.json rename to crates/fhir/tests/data/json/R5/codesystem-binding-strength.json diff --git a/crates/fhir/tests/data/R5/codesystem-biologicallyderived-product-property-type-codes.json b/crates/fhir/tests/data/json/R5/codesystem-biologicallyderived-product-property-type-codes.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-biologicallyderived-product-property-type-codes.json rename to crates/fhir/tests/data/json/R5/codesystem-biologicallyderived-product-property-type-codes.json diff --git a/crates/fhir/tests/data/R5/codesystem-biologicallyderived-product-status.json b/crates/fhir/tests/data/json/R5/codesystem-biologicallyderived-product-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-biologicallyderived-product-status.json rename to crates/fhir/tests/data/json/R5/codesystem-biologicallyderived-product-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-biologicallyderived-productcodes.json b/crates/fhir/tests/data/json/R5/codesystem-biologicallyderived-productcodes.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-biologicallyderived-productcodes.json rename to crates/fhir/tests/data/json/R5/codesystem-biologicallyderived-productcodes.json diff --git a/crates/fhir/tests/data/R5/codesystem-biologicallyderivedproductdispense-match-status.json b/crates/fhir/tests/data/json/R5/codesystem-biologicallyderivedproductdispense-match-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-biologicallyderivedproductdispense-match-status.json rename to crates/fhir/tests/data/json/R5/codesystem-biologicallyderivedproductdispense-match-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-biologicallyderivedproductdispense-origin-relationship.json b/crates/fhir/tests/data/json/R5/codesystem-biologicallyderivedproductdispense-origin-relationship.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-biologicallyderivedproductdispense-origin-relationship.json rename to crates/fhir/tests/data/json/R5/codesystem-biologicallyderivedproductdispense-origin-relationship.json diff --git a/crates/fhir/tests/data/R5/codesystem-biologicallyderivedproductdispense-performer-function.json b/crates/fhir/tests/data/json/R5/codesystem-biologicallyderivedproductdispense-performer-function.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-biologicallyderivedproductdispense-performer-function.json rename to crates/fhir/tests/data/json/R5/codesystem-biologicallyderivedproductdispense-performer-function.json diff --git a/crates/fhir/tests/data/R5/codesystem-biologicallyderivedproductdispense-status.json b/crates/fhir/tests/data/json/R5/codesystem-biologicallyderivedproductdispense-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-biologicallyderivedproductdispense-status.json rename to crates/fhir/tests/data/json/R5/codesystem-biologicallyderivedproductdispense-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-bundle-type.json b/crates/fhir/tests/data/json/R5/codesystem-bundle-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-bundle-type.json rename to crates/fhir/tests/data/json/R5/codesystem-bundle-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-capability-statement-kind.json b/crates/fhir/tests/data/json/R5/codesystem-capability-statement-kind.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-capability-statement-kind.json rename to crates/fhir/tests/data/json/R5/codesystem-capability-statement-kind.json diff --git a/crates/fhir/tests/data/R5/codesystem-care-team-status.json b/crates/fhir/tests/data/json/R5/codesystem-care-team-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-care-team-status.json rename to crates/fhir/tests/data/json/R5/codesystem-care-team-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-catalogType.json b/crates/fhir/tests/data/json/R5/codesystem-catalogType.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-catalogType.json rename to crates/fhir/tests/data/json/R5/codesystem-catalogType.json diff --git a/crates/fhir/tests/data/R5/codesystem-cdshooks-indicator.json b/crates/fhir/tests/data/json/R5/codesystem-cdshooks-indicator.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-cdshooks-indicator.json rename to crates/fhir/tests/data/json/R5/codesystem-cdshooks-indicator.json diff --git a/crates/fhir/tests/data/R5/codesystem-certainty-rating.json b/crates/fhir/tests/data/json/R5/codesystem-certainty-rating.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-certainty-rating.json rename to crates/fhir/tests/data/json/R5/codesystem-certainty-rating.json diff --git a/crates/fhir/tests/data/R5/codesystem-certainty-type.json b/crates/fhir/tests/data/json/R5/codesystem-certainty-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-certainty-type.json rename to crates/fhir/tests/data/json/R5/codesystem-certainty-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-characteristic-combination.json b/crates/fhir/tests/data/json/R5/codesystem-characteristic-combination.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-characteristic-combination.json rename to crates/fhir/tests/data/json/R5/codesystem-characteristic-combination.json diff --git a/crates/fhir/tests/data/R5/codesystem-characteristic-offset.json b/crates/fhir/tests/data/json/R5/codesystem-characteristic-offset.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-characteristic-offset.json rename to crates/fhir/tests/data/json/R5/codesystem-characteristic-offset.json diff --git a/crates/fhir/tests/data/R5/codesystem-chargeitem-status.json b/crates/fhir/tests/data/json/R5/codesystem-chargeitem-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-chargeitem-status.json rename to crates/fhir/tests/data/json/R5/codesystem-chargeitem-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-citation-artifact-classifier.json b/crates/fhir/tests/data/json/R5/codesystem-citation-artifact-classifier.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-citation-artifact-classifier.json rename to crates/fhir/tests/data/json/R5/codesystem-citation-artifact-classifier.json diff --git a/crates/fhir/tests/data/R5/codesystem-citation-classification-type.json b/crates/fhir/tests/data/json/R5/codesystem-citation-classification-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-citation-classification-type.json rename to crates/fhir/tests/data/json/R5/codesystem-citation-classification-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-citation-status-type.json b/crates/fhir/tests/data/json/R5/codesystem-citation-status-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-citation-status-type.json rename to crates/fhir/tests/data/json/R5/codesystem-citation-status-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-citation-summary-style.json b/crates/fhir/tests/data/json/R5/codesystem-citation-summary-style.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-citation-summary-style.json rename to crates/fhir/tests/data/json/R5/codesystem-citation-summary-style.json diff --git a/crates/fhir/tests/data/R5/codesystem-cited-artifact-abstract-type.json b/crates/fhir/tests/data/json/R5/codesystem-cited-artifact-abstract-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-cited-artifact-abstract-type.json rename to crates/fhir/tests/data/json/R5/codesystem-cited-artifact-abstract-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-cited-artifact-classification-type.json b/crates/fhir/tests/data/json/R5/codesystem-cited-artifact-classification-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-cited-artifact-classification-type.json rename to crates/fhir/tests/data/json/R5/codesystem-cited-artifact-classification-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-cited-artifact-part-type.json b/crates/fhir/tests/data/json/R5/codesystem-cited-artifact-part-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-cited-artifact-part-type.json rename to crates/fhir/tests/data/json/R5/codesystem-cited-artifact-part-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-cited-artifact-status-type.json b/crates/fhir/tests/data/json/R5/codesystem-cited-artifact-status-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-cited-artifact-status-type.json rename to crates/fhir/tests/data/json/R5/codesystem-cited-artifact-status-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-cited-medium.json b/crates/fhir/tests/data/json/R5/codesystem-cited-medium.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-cited-medium.json rename to crates/fhir/tests/data/json/R5/codesystem-cited-medium.json diff --git a/crates/fhir/tests/data/R5/codesystem-claim-decision-reason.json b/crates/fhir/tests/data/json/R5/codesystem-claim-decision-reason.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-claim-decision-reason.json rename to crates/fhir/tests/data/json/R5/codesystem-claim-decision-reason.json diff --git a/crates/fhir/tests/data/R5/codesystem-claim-decision.json b/crates/fhir/tests/data/json/R5/codesystem-claim-decision.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-claim-decision.json rename to crates/fhir/tests/data/json/R5/codesystem-claim-decision.json diff --git a/crates/fhir/tests/data/R5/codesystem-claim-outcome.json b/crates/fhir/tests/data/json/R5/codesystem-claim-outcome.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-claim-outcome.json rename to crates/fhir/tests/data/json/R5/codesystem-claim-outcome.json diff --git a/crates/fhir/tests/data/R5/codesystem-claim-use.json b/crates/fhir/tests/data/json/R5/codesystem-claim-use.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-claim-use.json rename to crates/fhir/tests/data/json/R5/codesystem-claim-use.json diff --git a/crates/fhir/tests/data/R5/codesystem-clinical-use-definition-category.json b/crates/fhir/tests/data/json/R5/codesystem-clinical-use-definition-category.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-clinical-use-definition-category.json rename to crates/fhir/tests/data/json/R5/codesystem-clinical-use-definition-category.json diff --git a/crates/fhir/tests/data/R5/codesystem-clinical-use-definition-type.json b/crates/fhir/tests/data/json/R5/codesystem-clinical-use-definition-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-clinical-use-definition-type.json rename to crates/fhir/tests/data/json/R5/codesystem-clinical-use-definition-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-code-search-support.json b/crates/fhir/tests/data/json/R5/codesystem-code-search-support.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-code-search-support.json rename to crates/fhir/tests/data/json/R5/codesystem-code-search-support.json diff --git a/crates/fhir/tests/data/R5/codesystem-codesystem-content-mode.json b/crates/fhir/tests/data/json/R5/codesystem-codesystem-content-mode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-codesystem-content-mode.json rename to crates/fhir/tests/data/json/R5/codesystem-codesystem-content-mode.json diff --git a/crates/fhir/tests/data/R5/codesystem-codesystem-hierarchy-meaning.json b/crates/fhir/tests/data/json/R5/codesystem-codesystem-hierarchy-meaning.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-codesystem-hierarchy-meaning.json rename to crates/fhir/tests/data/json/R5/codesystem-codesystem-hierarchy-meaning.json diff --git a/crates/fhir/tests/data/R5/codesystem-color-names.json b/crates/fhir/tests/data/json/R5/codesystem-color-names.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-color-names.json rename to crates/fhir/tests/data/json/R5/codesystem-color-names.json diff --git a/crates/fhir/tests/data/R5/codesystem-color-rgb.json b/crates/fhir/tests/data/json/R5/codesystem-color-rgb.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-color-rgb.json rename to crates/fhir/tests/data/json/R5/codesystem-color-rgb.json diff --git a/crates/fhir/tests/data/R5/codesystem-combined-dose-form.json b/crates/fhir/tests/data/json/R5/codesystem-combined-dose-form.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-combined-dose-form.json rename to crates/fhir/tests/data/json/R5/codesystem-combined-dose-form.json diff --git a/crates/fhir/tests/data/R5/codesystem-compartment-type.json b/crates/fhir/tests/data/json/R5/codesystem-compartment-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-compartment-type.json rename to crates/fhir/tests/data/json/R5/codesystem-compartment-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-composition-attestation-mode.json b/crates/fhir/tests/data/json/R5/codesystem-composition-attestation-mode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-composition-attestation-mode.json rename to crates/fhir/tests/data/json/R5/codesystem-composition-attestation-mode.json diff --git a/crates/fhir/tests/data/R5/codesystem-composition-status.json b/crates/fhir/tests/data/json/R5/codesystem-composition-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-composition-status.json rename to crates/fhir/tests/data/json/R5/codesystem-composition-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-concept-map-relationship.json b/crates/fhir/tests/data/json/R5/codesystem-concept-map-relationship.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-concept-map-relationship.json rename to crates/fhir/tests/data/json/R5/codesystem-concept-map-relationship.json diff --git a/crates/fhir/tests/data/R5/codesystem-concept-properties.json b/crates/fhir/tests/data/json/R5/codesystem-concept-properties.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-concept-properties.json rename to crates/fhir/tests/data/json/R5/codesystem-concept-properties.json diff --git a/crates/fhir/tests/data/R5/codesystem-concept-property-type.json b/crates/fhir/tests/data/json/R5/codesystem-concept-property-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-concept-property-type.json rename to crates/fhir/tests/data/json/R5/codesystem-concept-property-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-concept-subsumption-outcome.json b/crates/fhir/tests/data/json/R5/codesystem-concept-subsumption-outcome.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-concept-subsumption-outcome.json rename to crates/fhir/tests/data/json/R5/codesystem-concept-subsumption-outcome.json diff --git a/crates/fhir/tests/data/R5/codesystem-conceptmap-attribute-type.json b/crates/fhir/tests/data/json/R5/codesystem-conceptmap-attribute-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-conceptmap-attribute-type.json rename to crates/fhir/tests/data/json/R5/codesystem-conceptmap-attribute-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-conceptmap-properties.json b/crates/fhir/tests/data/json/R5/codesystem-conceptmap-properties.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-conceptmap-properties.json rename to crates/fhir/tests/data/json/R5/codesystem-conceptmap-properties.json diff --git a/crates/fhir/tests/data/R5/codesystem-conceptmap-property-type.json b/crates/fhir/tests/data/json/R5/codesystem-conceptmap-property-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-conceptmap-property-type.json rename to crates/fhir/tests/data/json/R5/codesystem-conceptmap-property-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-conceptmap-unmapped-mode.json b/crates/fhir/tests/data/json/R5/codesystem-conceptmap-unmapped-mode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-conceptmap-unmapped-mode.json rename to crates/fhir/tests/data/json/R5/codesystem-conceptmap-unmapped-mode.json diff --git a/crates/fhir/tests/data/R5/codesystem-condition-precondition-type.json b/crates/fhir/tests/data/json/R5/codesystem-condition-precondition-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-condition-precondition-type.json rename to crates/fhir/tests/data/json/R5/codesystem-condition-precondition-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-condition-questionnaire-purpose.json b/crates/fhir/tests/data/json/R5/codesystem-condition-questionnaire-purpose.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-condition-questionnaire-purpose.json rename to crates/fhir/tests/data/json/R5/codesystem-condition-questionnaire-purpose.json diff --git a/crates/fhir/tests/data/R5/codesystem-conditional-delete-status.json b/crates/fhir/tests/data/json/R5/codesystem-conditional-delete-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-conditional-delete-status.json rename to crates/fhir/tests/data/json/R5/codesystem-conditional-delete-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-conditional-read-status.json b/crates/fhir/tests/data/json/R5/codesystem-conditional-read-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-conditional-read-status.json rename to crates/fhir/tests/data/json/R5/codesystem-conditional-read-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-conformance-expectation.json b/crates/fhir/tests/data/json/R5/codesystem-conformance-expectation.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-conformance-expectation.json rename to crates/fhir/tests/data/json/R5/codesystem-conformance-expectation.json diff --git a/crates/fhir/tests/data/R5/codesystem-consent-data-meaning.json b/crates/fhir/tests/data/json/R5/codesystem-consent-data-meaning.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-consent-data-meaning.json rename to crates/fhir/tests/data/json/R5/codesystem-consent-data-meaning.json diff --git a/crates/fhir/tests/data/R5/codesystem-consent-provision-type.json b/crates/fhir/tests/data/json/R5/codesystem-consent-provision-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-consent-provision-type.json rename to crates/fhir/tests/data/json/R5/codesystem-consent-provision-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-consent-state-codes.json b/crates/fhir/tests/data/json/R5/codesystem-consent-state-codes.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-consent-state-codes.json rename to crates/fhir/tests/data/json/R5/codesystem-consent-state-codes.json diff --git a/crates/fhir/tests/data/R5/codesystem-constraint-severity.json b/crates/fhir/tests/data/json/R5/codesystem-constraint-severity.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-constraint-severity.json rename to crates/fhir/tests/data/json/R5/codesystem-constraint-severity.json diff --git a/crates/fhir/tests/data/R5/codesystem-contact-point-system.json b/crates/fhir/tests/data/json/R5/codesystem-contact-point-system.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contact-point-system.json rename to crates/fhir/tests/data/json/R5/codesystem-contact-point-system.json diff --git a/crates/fhir/tests/data/R5/codesystem-contact-point-use.json b/crates/fhir/tests/data/json/R5/codesystem-contact-point-use.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contact-point-use.json rename to crates/fhir/tests/data/json/R5/codesystem-contact-point-use.json diff --git a/crates/fhir/tests/data/R5/codesystem-contract-actionstatus.json b/crates/fhir/tests/data/json/R5/codesystem-contract-actionstatus.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contract-actionstatus.json rename to crates/fhir/tests/data/json/R5/codesystem-contract-actionstatus.json diff --git a/crates/fhir/tests/data/R5/codesystem-contract-assetcontext.json b/crates/fhir/tests/data/json/R5/codesystem-contract-assetcontext.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contract-assetcontext.json rename to crates/fhir/tests/data/json/R5/codesystem-contract-assetcontext.json diff --git a/crates/fhir/tests/data/R5/codesystem-contract-assetscope.json b/crates/fhir/tests/data/json/R5/codesystem-contract-assetscope.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contract-assetscope.json rename to crates/fhir/tests/data/json/R5/codesystem-contract-assetscope.json diff --git a/crates/fhir/tests/data/R5/codesystem-contract-assetsubtype.json b/crates/fhir/tests/data/json/R5/codesystem-contract-assetsubtype.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contract-assetsubtype.json rename to crates/fhir/tests/data/json/R5/codesystem-contract-assetsubtype.json diff --git a/crates/fhir/tests/data/R5/codesystem-contract-assettype.json b/crates/fhir/tests/data/json/R5/codesystem-contract-assettype.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contract-assettype.json rename to crates/fhir/tests/data/json/R5/codesystem-contract-assettype.json diff --git a/crates/fhir/tests/data/R5/codesystem-contract-decision-mode.json b/crates/fhir/tests/data/json/R5/codesystem-contract-decision-mode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contract-decision-mode.json rename to crates/fhir/tests/data/json/R5/codesystem-contract-decision-mode.json diff --git a/crates/fhir/tests/data/R5/codesystem-contract-definition-subtype.json b/crates/fhir/tests/data/json/R5/codesystem-contract-definition-subtype.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contract-definition-subtype.json rename to crates/fhir/tests/data/json/R5/codesystem-contract-definition-subtype.json diff --git a/crates/fhir/tests/data/R5/codesystem-contract-definition-type.json b/crates/fhir/tests/data/json/R5/codesystem-contract-definition-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contract-definition-type.json rename to crates/fhir/tests/data/json/R5/codesystem-contract-definition-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-contract-expiration-type.json b/crates/fhir/tests/data/json/R5/codesystem-contract-expiration-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contract-expiration-type.json rename to crates/fhir/tests/data/json/R5/codesystem-contract-expiration-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-contract-legalstate.json b/crates/fhir/tests/data/json/R5/codesystem-contract-legalstate.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contract-legalstate.json rename to crates/fhir/tests/data/json/R5/codesystem-contract-legalstate.json diff --git a/crates/fhir/tests/data/R5/codesystem-contract-party-role.json b/crates/fhir/tests/data/json/R5/codesystem-contract-party-role.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contract-party-role.json rename to crates/fhir/tests/data/json/R5/codesystem-contract-party-role.json diff --git a/crates/fhir/tests/data/R5/codesystem-contract-publicationstatus.json b/crates/fhir/tests/data/json/R5/codesystem-contract-publicationstatus.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contract-publicationstatus.json rename to crates/fhir/tests/data/json/R5/codesystem-contract-publicationstatus.json diff --git a/crates/fhir/tests/data/R5/codesystem-contract-scope.json b/crates/fhir/tests/data/json/R5/codesystem-contract-scope.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contract-scope.json rename to crates/fhir/tests/data/json/R5/codesystem-contract-scope.json diff --git a/crates/fhir/tests/data/R5/codesystem-contract-security-category.json b/crates/fhir/tests/data/json/R5/codesystem-contract-security-category.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contract-security-category.json rename to crates/fhir/tests/data/json/R5/codesystem-contract-security-category.json diff --git a/crates/fhir/tests/data/R5/codesystem-contract-security-classification.json b/crates/fhir/tests/data/json/R5/codesystem-contract-security-classification.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contract-security-classification.json rename to crates/fhir/tests/data/json/R5/codesystem-contract-security-classification.json diff --git a/crates/fhir/tests/data/R5/codesystem-contract-security-control.json b/crates/fhir/tests/data/json/R5/codesystem-contract-security-control.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contract-security-control.json rename to crates/fhir/tests/data/json/R5/codesystem-contract-security-control.json diff --git a/crates/fhir/tests/data/R5/codesystem-contract-status.json b/crates/fhir/tests/data/json/R5/codesystem-contract-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contract-status.json rename to crates/fhir/tests/data/json/R5/codesystem-contract-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-contributor-role.json b/crates/fhir/tests/data/json/R5/codesystem-contributor-role.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contributor-role.json rename to crates/fhir/tests/data/json/R5/codesystem-contributor-role.json diff --git a/crates/fhir/tests/data/R5/codesystem-contributor-summary-source.json b/crates/fhir/tests/data/json/R5/codesystem-contributor-summary-source.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contributor-summary-source.json rename to crates/fhir/tests/data/json/R5/codesystem-contributor-summary-source.json diff --git a/crates/fhir/tests/data/R5/codesystem-contributor-summary-style.json b/crates/fhir/tests/data/json/R5/codesystem-contributor-summary-style.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contributor-summary-style.json rename to crates/fhir/tests/data/json/R5/codesystem-contributor-summary-style.json diff --git a/crates/fhir/tests/data/R5/codesystem-contributor-summary-type.json b/crates/fhir/tests/data/json/R5/codesystem-contributor-summary-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contributor-summary-type.json rename to crates/fhir/tests/data/json/R5/codesystem-contributor-summary-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-contributor-type.json b/crates/fhir/tests/data/json/R5/codesystem-contributor-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-contributor-type.json rename to crates/fhir/tests/data/json/R5/codesystem-contributor-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-coverage-kind.json b/crates/fhir/tests/data/json/R5/codesystem-coverage-kind.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-coverage-kind.json rename to crates/fhir/tests/data/json/R5/codesystem-coverage-kind.json diff --git a/crates/fhir/tests/data/R5/codesystem-datestype.json b/crates/fhir/tests/data/json/R5/codesystem-datestype.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-datestype.json rename to crates/fhir/tests/data/json/R5/codesystem-datestype.json diff --git a/crates/fhir/tests/data/R5/codesystem-days-of-week.json b/crates/fhir/tests/data/json/R5/codesystem-days-of-week.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-days-of-week.json rename to crates/fhir/tests/data/json/R5/codesystem-days-of-week.json diff --git a/crates/fhir/tests/data/R5/codesystem-definition-method.json b/crates/fhir/tests/data/json/R5/codesystem-definition-method.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-definition-method.json rename to crates/fhir/tests/data/json/R5/codesystem-definition-method.json diff --git a/crates/fhir/tests/data/R5/codesystem-detectedissue-severity.json b/crates/fhir/tests/data/json/R5/codesystem-detectedissue-severity.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-detectedissue-severity.json rename to crates/fhir/tests/data/json/R5/codesystem-detectedissue-severity.json diff --git a/crates/fhir/tests/data/R5/codesystem-detectedissue-status.json b/crates/fhir/tests/data/json/R5/codesystem-detectedissue-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-detectedissue-status.json rename to crates/fhir/tests/data/json/R5/codesystem-detectedissue-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-device-action.json b/crates/fhir/tests/data/json/R5/codesystem-device-action.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-device-action.json rename to crates/fhir/tests/data/json/R5/codesystem-device-action.json diff --git a/crates/fhir/tests/data/R5/codesystem-device-availability-status.json b/crates/fhir/tests/data/json/R5/codesystem-device-availability-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-device-availability-status.json rename to crates/fhir/tests/data/json/R5/codesystem-device-availability-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-device-category.json b/crates/fhir/tests/data/json/R5/codesystem-device-category.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-device-category.json rename to crates/fhir/tests/data/json/R5/codesystem-device-category.json diff --git a/crates/fhir/tests/data/R5/codesystem-device-correctiveactionscope.json b/crates/fhir/tests/data/json/R5/codesystem-device-correctiveactionscope.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-device-correctiveactionscope.json rename to crates/fhir/tests/data/json/R5/codesystem-device-correctiveactionscope.json diff --git a/crates/fhir/tests/data/R5/codesystem-device-nametype.json b/crates/fhir/tests/data/json/R5/codesystem-device-nametype.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-device-nametype.json rename to crates/fhir/tests/data/json/R5/codesystem-device-nametype.json diff --git a/crates/fhir/tests/data/R5/codesystem-device-operation-mode.json b/crates/fhir/tests/data/json/R5/codesystem-device-operation-mode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-device-operation-mode.json rename to crates/fhir/tests/data/json/R5/codesystem-device-operation-mode.json diff --git a/crates/fhir/tests/data/R5/codesystem-device-productidentifierinudi.json b/crates/fhir/tests/data/json/R5/codesystem-device-productidentifierinudi.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-device-productidentifierinudi.json rename to crates/fhir/tests/data/json/R5/codesystem-device-productidentifierinudi.json diff --git a/crates/fhir/tests/data/R5/codesystem-device-specification-category.json b/crates/fhir/tests/data/json/R5/codesystem-device-specification-category.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-device-specification-category.json rename to crates/fhir/tests/data/json/R5/codesystem-device-specification-category.json diff --git a/crates/fhir/tests/data/R5/codesystem-device-status.json b/crates/fhir/tests/data/json/R5/codesystem-device-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-device-status.json rename to crates/fhir/tests/data/json/R5/codesystem-device-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-deviceassociation-operationstatus.json b/crates/fhir/tests/data/json/R5/codesystem-deviceassociation-operationstatus.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-deviceassociation-operationstatus.json rename to crates/fhir/tests/data/json/R5/codesystem-deviceassociation-operationstatus.json diff --git a/crates/fhir/tests/data/R5/codesystem-deviceassociation-status-reason.json b/crates/fhir/tests/data/json/R5/codesystem-deviceassociation-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-deviceassociation-status-reason.json rename to crates/fhir/tests/data/json/R5/codesystem-deviceassociation-status-reason.json diff --git a/crates/fhir/tests/data/R5/codesystem-deviceassociation-status.json b/crates/fhir/tests/data/json/R5/codesystem-deviceassociation-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-deviceassociation-status.json rename to crates/fhir/tests/data/json/R5/codesystem-deviceassociation-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-devicedefinition-regulatory-identifier-type.json b/crates/fhir/tests/data/json/R5/codesystem-devicedefinition-regulatory-identifier-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-devicedefinition-regulatory-identifier-type.json rename to crates/fhir/tests/data/json/R5/codesystem-devicedefinition-regulatory-identifier-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-devicedefinition-relationtype.json b/crates/fhir/tests/data/json/R5/codesystem-devicedefinition-relationtype.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-devicedefinition-relationtype.json rename to crates/fhir/tests/data/json/R5/codesystem-devicedefinition-relationtype.json diff --git a/crates/fhir/tests/data/R5/codesystem-devicedispense-status-reason.json b/crates/fhir/tests/data/json/R5/codesystem-devicedispense-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-devicedispense-status-reason.json rename to crates/fhir/tests/data/json/R5/codesystem-devicedispense-status-reason.json diff --git a/crates/fhir/tests/data/R5/codesystem-devicedispense-status.json b/crates/fhir/tests/data/json/R5/codesystem-devicedispense-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-devicedispense-status.json rename to crates/fhir/tests/data/json/R5/codesystem-devicedispense-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-deviceusage-adherence-code.json b/crates/fhir/tests/data/json/R5/codesystem-deviceusage-adherence-code.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-deviceusage-adherence-code.json rename to crates/fhir/tests/data/json/R5/codesystem-deviceusage-adherence-code.json diff --git a/crates/fhir/tests/data/R5/codesystem-deviceusage-adherence-reason.json b/crates/fhir/tests/data/json/R5/codesystem-deviceusage-adherence-reason.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-deviceusage-adherence-reason.json rename to crates/fhir/tests/data/json/R5/codesystem-deviceusage-adherence-reason.json diff --git a/crates/fhir/tests/data/R5/codesystem-deviceusage-status.json b/crates/fhir/tests/data/json/R5/codesystem-deviceusage-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-deviceusage-status.json rename to crates/fhir/tests/data/json/R5/codesystem-deviceusage-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-diagnostic-report-status.json b/crates/fhir/tests/data/json/R5/codesystem-diagnostic-report-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-diagnostic-report-status.json rename to crates/fhir/tests/data/json/R5/codesystem-diagnostic-report-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-discriminator-type.json b/crates/fhir/tests/data/json/R5/codesystem-discriminator-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-discriminator-type.json rename to crates/fhir/tests/data/json/R5/codesystem-discriminator-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-document-mode.json b/crates/fhir/tests/data/json/R5/codesystem-document-mode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-document-mode.json rename to crates/fhir/tests/data/json/R5/codesystem-document-mode.json diff --git a/crates/fhir/tests/data/R5/codesystem-document-reference-status.json b/crates/fhir/tests/data/json/R5/codesystem-document-reference-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-document-reference-status.json rename to crates/fhir/tests/data/json/R5/codesystem-document-reference-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-document-relationship-type.json b/crates/fhir/tests/data/json/R5/codesystem-document-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-document-relationship-type.json rename to crates/fhir/tests/data/json/R5/codesystem-document-relationship-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-eligibility-outcome.json b/crates/fhir/tests/data/json/R5/codesystem-eligibility-outcome.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-eligibility-outcome.json rename to crates/fhir/tests/data/json/R5/codesystem-eligibility-outcome.json diff --git a/crates/fhir/tests/data/R5/codesystem-eligibilityrequest-purpose.json b/crates/fhir/tests/data/json/R5/codesystem-eligibilityrequest-purpose.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-eligibilityrequest-purpose.json rename to crates/fhir/tests/data/json/R5/codesystem-eligibilityrequest-purpose.json diff --git a/crates/fhir/tests/data/R5/codesystem-eligibilityresponse-purpose.json b/crates/fhir/tests/data/json/R5/codesystem-eligibilityresponse-purpose.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-eligibilityresponse-purpose.json rename to crates/fhir/tests/data/json/R5/codesystem-eligibilityresponse-purpose.json diff --git a/crates/fhir/tests/data/R5/codesystem-encounter-diagnosis-use.json b/crates/fhir/tests/data/json/R5/codesystem-encounter-diagnosis-use.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-encounter-diagnosis-use.json rename to crates/fhir/tests/data/json/R5/codesystem-encounter-diagnosis-use.json diff --git a/crates/fhir/tests/data/R5/codesystem-encounter-location-status.json b/crates/fhir/tests/data/json/R5/codesystem-encounter-location-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-encounter-location-status.json rename to crates/fhir/tests/data/json/R5/codesystem-encounter-location-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-encounter-reason-use.json b/crates/fhir/tests/data/json/R5/codesystem-encounter-reason-use.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-encounter-reason-use.json rename to crates/fhir/tests/data/json/R5/codesystem-encounter-reason-use.json diff --git a/crates/fhir/tests/data/R5/codesystem-encounter-status.json b/crates/fhir/tests/data/json/R5/codesystem-encounter-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-encounter-status.json rename to crates/fhir/tests/data/json/R5/codesystem-encounter-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-endpoint-environment.json b/crates/fhir/tests/data/json/R5/codesystem-endpoint-environment.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-endpoint-environment.json rename to crates/fhir/tests/data/json/R5/codesystem-endpoint-environment.json diff --git a/crates/fhir/tests/data/R5/codesystem-endpoint-status.json b/crates/fhir/tests/data/json/R5/codesystem-endpoint-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-endpoint-status.json rename to crates/fhir/tests/data/json/R5/codesystem-endpoint-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-enrollment-outcome.json b/crates/fhir/tests/data/json/R5/codesystem-enrollment-outcome.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-enrollment-outcome.json rename to crates/fhir/tests/data/json/R5/codesystem-enrollment-outcome.json diff --git a/crates/fhir/tests/data/R5/codesystem-episode-of-care-status.json b/crates/fhir/tests/data/json/R5/codesystem-episode-of-care-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-episode-of-care-status.json rename to crates/fhir/tests/data/json/R5/codesystem-episode-of-care-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-etsi-signature-type.json b/crates/fhir/tests/data/json/R5/codesystem-etsi-signature-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-etsi-signature-type.json rename to crates/fhir/tests/data/json/R5/codesystem-etsi-signature-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-event-capability-mode.json b/crates/fhir/tests/data/json/R5/codesystem-event-capability-mode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-event-capability-mode.json rename to crates/fhir/tests/data/json/R5/codesystem-event-capability-mode.json diff --git a/crates/fhir/tests/data/R5/codesystem-event-status.json b/crates/fhir/tests/data/json/R5/codesystem-event-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-event-status.json rename to crates/fhir/tests/data/json/R5/codesystem-event-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-event-timing.json b/crates/fhir/tests/data/json/R5/codesystem-event-timing.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-event-timing.json rename to crates/fhir/tests/data/json/R5/codesystem-event-timing.json diff --git a/crates/fhir/tests/data/R5/codesystem-evidence-classifier-code.json b/crates/fhir/tests/data/json/R5/codesystem-evidence-classifier-code.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-evidence-classifier-code.json rename to crates/fhir/tests/data/json/R5/codesystem-evidence-classifier-code.json diff --git a/crates/fhir/tests/data/R5/codesystem-evidence-report-section.json b/crates/fhir/tests/data/json/R5/codesystem-evidence-report-section.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-evidence-report-section.json rename to crates/fhir/tests/data/json/R5/codesystem-evidence-report-section.json diff --git a/crates/fhir/tests/data/R5/codesystem-evidence-report-type.json b/crates/fhir/tests/data/json/R5/codesystem-evidence-report-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-evidence-report-type.json rename to crates/fhir/tests/data/json/R5/codesystem-evidence-report-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-evidence-variable-event.json b/crates/fhir/tests/data/json/R5/codesystem-evidence-variable-event.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-evidence-variable-event.json rename to crates/fhir/tests/data/json/R5/codesystem-evidence-variable-event.json diff --git a/crates/fhir/tests/data/R5/codesystem-example-metadata-2.json b/crates/fhir/tests/data/json/R5/codesystem-example-metadata-2.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-example-metadata-2.json rename to crates/fhir/tests/data/json/R5/codesystem-example-metadata-2.json diff --git a/crates/fhir/tests/data/R5/codesystem-example-metadata.json b/crates/fhir/tests/data/json/R5/codesystem-example-metadata.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-example-metadata.json rename to crates/fhir/tests/data/json/R5/codesystem-example-metadata.json diff --git a/crates/fhir/tests/data/R5/codesystem-example-summary.json b/crates/fhir/tests/data/json/R5/codesystem-example-summary.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-example-summary.json rename to crates/fhir/tests/data/json/R5/codesystem-example-summary.json diff --git a/crates/fhir/tests/data/R5/codesystem-example-supplement-2.json b/crates/fhir/tests/data/json/R5/codesystem-example-supplement-2.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-example-supplement-2.json rename to crates/fhir/tests/data/json/R5/codesystem-example-supplement-2.json diff --git a/crates/fhir/tests/data/R5/codesystem-example-supplement.json b/crates/fhir/tests/data/json/R5/codesystem-example-supplement.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-example-supplement.json rename to crates/fhir/tests/data/json/R5/codesystem-example-supplement.json diff --git a/crates/fhir/tests/data/R5/codesystem-example.json b/crates/fhir/tests/data/json/R5/codesystem-example.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-example.json rename to crates/fhir/tests/data/json/R5/codesystem-example.json diff --git a/crates/fhir/tests/data/R5/codesystem-examplescenario-actor-type.json b/crates/fhir/tests/data/json/R5/codesystem-examplescenario-actor-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-examplescenario-actor-type.json rename to crates/fhir/tests/data/json/R5/codesystem-examplescenario-actor-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-explanationofbenefit-status.json b/crates/fhir/tests/data/json/R5/codesystem-explanationofbenefit-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-explanationofbenefit-status.json rename to crates/fhir/tests/data/json/R5/codesystem-explanationofbenefit-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-extension-context-type.json b/crates/fhir/tests/data/json/R5/codesystem-extension-context-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-extension-context-type.json rename to crates/fhir/tests/data/json/R5/codesystem-extension-context-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-extra-activity-type.json b/crates/fhir/tests/data/json/R5/codesystem-extra-activity-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-extra-activity-type.json rename to crates/fhir/tests/data/json/R5/codesystem-extra-activity-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-fhir-format-type.json b/crates/fhir/tests/data/json/R5/codesystem-fhir-format-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-fhir-format-type.json rename to crates/fhir/tests/data/json/R5/codesystem-fhir-format-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-fhir-old-types.json b/crates/fhir/tests/data/json/R5/codesystem-fhir-old-types.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-fhir-old-types.json rename to crates/fhir/tests/data/json/R5/codesystem-fhir-old-types.json diff --git a/crates/fhir/tests/data/R5/codesystem-fhir-types.json b/crates/fhir/tests/data/json/R5/codesystem-fhir-types.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-fhir-types.json rename to crates/fhir/tests/data/json/R5/codesystem-fhir-types.json diff --git a/crates/fhir/tests/data/R5/codesystem-fhirpath-types.json b/crates/fhir/tests/data/json/R5/codesystem-fhirpath-types.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-fhirpath-types.json rename to crates/fhir/tests/data/json/R5/codesystem-fhirpath-types.json diff --git a/crates/fhir/tests/data/R5/codesystem-filter-operator.json b/crates/fhir/tests/data/json/R5/codesystem-filter-operator.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-filter-operator.json rename to crates/fhir/tests/data/json/R5/codesystem-filter-operator.json diff --git a/crates/fhir/tests/data/R5/codesystem-flag-status.json b/crates/fhir/tests/data/json/R5/codesystem-flag-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-flag-status.json rename to crates/fhir/tests/data/json/R5/codesystem-flag-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-fm-status.json b/crates/fhir/tests/data/json/R5/codesystem-fm-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-fm-status.json rename to crates/fhir/tests/data/json/R5/codesystem-fm-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-focus-characteristic-code.json b/crates/fhir/tests/data/json/R5/codesystem-focus-characteristic-code.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-focus-characteristic-code.json rename to crates/fhir/tests/data/json/R5/codesystem-focus-characteristic-code.json diff --git a/crates/fhir/tests/data/R5/codesystem-formularyitem-status.json b/crates/fhir/tests/data/json/R5/codesystem-formularyitem-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-formularyitem-status.json rename to crates/fhir/tests/data/json/R5/codesystem-formularyitem-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-genomicstudy-changetype.json b/crates/fhir/tests/data/json/R5/codesystem-genomicstudy-changetype.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-genomicstudy-changetype.json rename to crates/fhir/tests/data/json/R5/codesystem-genomicstudy-changetype.json diff --git a/crates/fhir/tests/data/R5/codesystem-genomicstudy-dataformat.json b/crates/fhir/tests/data/json/R5/codesystem-genomicstudy-dataformat.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-genomicstudy-dataformat.json rename to crates/fhir/tests/data/json/R5/codesystem-genomicstudy-dataformat.json diff --git a/crates/fhir/tests/data/R5/codesystem-genomicstudy-methodtype.json b/crates/fhir/tests/data/json/R5/codesystem-genomicstudy-methodtype.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-genomicstudy-methodtype.json rename to crates/fhir/tests/data/json/R5/codesystem-genomicstudy-methodtype.json diff --git a/crates/fhir/tests/data/R5/codesystem-genomicstudy-status.json b/crates/fhir/tests/data/json/R5/codesystem-genomicstudy-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-genomicstudy-status.json rename to crates/fhir/tests/data/json/R5/codesystem-genomicstudy-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-genomicstudy-type.json b/crates/fhir/tests/data/json/R5/codesystem-genomicstudy-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-genomicstudy-type.json rename to crates/fhir/tests/data/json/R5/codesystem-genomicstudy-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-goal-status.json b/crates/fhir/tests/data/json/R5/codesystem-goal-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-goal-status.json rename to crates/fhir/tests/data/json/R5/codesystem-goal-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-graph-compartment-rule.json b/crates/fhir/tests/data/json/R5/codesystem-graph-compartment-rule.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-graph-compartment-rule.json rename to crates/fhir/tests/data/json/R5/codesystem-graph-compartment-rule.json diff --git a/crates/fhir/tests/data/R5/codesystem-graph-compartment-use.json b/crates/fhir/tests/data/json/R5/codesystem-graph-compartment-use.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-graph-compartment-use.json rename to crates/fhir/tests/data/json/R5/codesystem-graph-compartment-use.json diff --git a/crates/fhir/tests/data/R5/codesystem-group-membership-basis.json b/crates/fhir/tests/data/json/R5/codesystem-group-membership-basis.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-group-membership-basis.json rename to crates/fhir/tests/data/json/R5/codesystem-group-membership-basis.json diff --git a/crates/fhir/tests/data/R5/codesystem-group-type.json b/crates/fhir/tests/data/json/R5/codesystem-group-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-group-type.json rename to crates/fhir/tests/data/json/R5/codesystem-group-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-guidance-module-code.json b/crates/fhir/tests/data/json/R5/codesystem-guidance-module-code.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-guidance-module-code.json rename to crates/fhir/tests/data/json/R5/codesystem-guidance-module-code.json diff --git a/crates/fhir/tests/data/R5/codesystem-guidance-response-status.json b/crates/fhir/tests/data/json/R5/codesystem-guidance-response-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-guidance-response-status.json rename to crates/fhir/tests/data/json/R5/codesystem-guidance-response-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-guide-page-generation.json b/crates/fhir/tests/data/json/R5/codesystem-guide-page-generation.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-guide-page-generation.json rename to crates/fhir/tests/data/json/R5/codesystem-guide-page-generation.json diff --git a/crates/fhir/tests/data/R5/codesystem-guide-parameter-code.json b/crates/fhir/tests/data/json/R5/codesystem-guide-parameter-code.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-guide-parameter-code.json rename to crates/fhir/tests/data/json/R5/codesystem-guide-parameter-code.json diff --git a/crates/fhir/tests/data/R5/codesystem-history-status.json b/crates/fhir/tests/data/json/R5/codesystem-history-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-history-status.json rename to crates/fhir/tests/data/json/R5/codesystem-history-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-http-operations.json b/crates/fhir/tests/data/json/R5/codesystem-http-operations.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-http-operations.json rename to crates/fhir/tests/data/json/R5/codesystem-http-operations.json diff --git a/crates/fhir/tests/data/R5/codesystem-http-verb.json b/crates/fhir/tests/data/json/R5/codesystem-http-verb.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-http-verb.json rename to crates/fhir/tests/data/json/R5/codesystem-http-verb.json diff --git a/crates/fhir/tests/data/R5/codesystem-iana-link-relations.json b/crates/fhir/tests/data/json/R5/codesystem-iana-link-relations.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-iana-link-relations.json rename to crates/fhir/tests/data/json/R5/codesystem-iana-link-relations.json diff --git a/crates/fhir/tests/data/R5/codesystem-icd-10-procedures.json b/crates/fhir/tests/data/json/R5/codesystem-icd-10-procedures.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-icd-10-procedures.json rename to crates/fhir/tests/data/json/R5/codesystem-icd-10-procedures.json diff --git a/crates/fhir/tests/data/R5/codesystem-identifier-use.json b/crates/fhir/tests/data/json/R5/codesystem-identifier-use.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-identifier-use.json rename to crates/fhir/tests/data/json/R5/codesystem-identifier-use.json diff --git a/crates/fhir/tests/data/R5/codesystem-identity-assuranceLevel.json b/crates/fhir/tests/data/json/R5/codesystem-identity-assuranceLevel.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-identity-assuranceLevel.json rename to crates/fhir/tests/data/json/R5/codesystem-identity-assuranceLevel.json diff --git a/crates/fhir/tests/data/R5/codesystem-imagingselection-2dgraphictype.json b/crates/fhir/tests/data/json/R5/codesystem-imagingselection-2dgraphictype.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-imagingselection-2dgraphictype.json rename to crates/fhir/tests/data/json/R5/codesystem-imagingselection-2dgraphictype.json diff --git a/crates/fhir/tests/data/R5/codesystem-imagingselection-3dgraphictype.json b/crates/fhir/tests/data/json/R5/codesystem-imagingselection-3dgraphictype.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-imagingselection-3dgraphictype.json rename to crates/fhir/tests/data/json/R5/codesystem-imagingselection-3dgraphictype.json diff --git a/crates/fhir/tests/data/R5/codesystem-imagingselection-status.json b/crates/fhir/tests/data/json/R5/codesystem-imagingselection-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-imagingselection-status.json rename to crates/fhir/tests/data/json/R5/codesystem-imagingselection-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-imagingstudy-status.json b/crates/fhir/tests/data/json/R5/codesystem-imagingstudy-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-imagingstudy-status.json rename to crates/fhir/tests/data/json/R5/codesystem-imagingstudy-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-ingredient-function.json b/crates/fhir/tests/data/json/R5/codesystem-ingredient-function.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-ingredient-function.json rename to crates/fhir/tests/data/json/R5/codesystem-ingredient-function.json diff --git a/crates/fhir/tests/data/R5/codesystem-ingredient-manufacturer-role.json b/crates/fhir/tests/data/json/R5/codesystem-ingredient-manufacturer-role.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-ingredient-manufacturer-role.json rename to crates/fhir/tests/data/json/R5/codesystem-ingredient-manufacturer-role.json diff --git a/crates/fhir/tests/data/R5/codesystem-ingredient-role.json b/crates/fhir/tests/data/json/R5/codesystem-ingredient-role.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-ingredient-role.json rename to crates/fhir/tests/data/json/R5/codesystem-ingredient-role.json diff --git a/crates/fhir/tests/data/R5/codesystem-interaction-incidence.json b/crates/fhir/tests/data/json/R5/codesystem-interaction-incidence.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-interaction-incidence.json rename to crates/fhir/tests/data/json/R5/codesystem-interaction-incidence.json diff --git a/crates/fhir/tests/data/R5/codesystem-interaction-type.json b/crates/fhir/tests/data/json/R5/codesystem-interaction-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-interaction-type.json rename to crates/fhir/tests/data/json/R5/codesystem-interaction-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-inventoryitem-nametype.json b/crates/fhir/tests/data/json/R5/codesystem-inventoryitem-nametype.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-inventoryitem-nametype.json rename to crates/fhir/tests/data/json/R5/codesystem-inventoryitem-nametype.json diff --git a/crates/fhir/tests/data/R5/codesystem-inventoryitem-status.json b/crates/fhir/tests/data/json/R5/codesystem-inventoryitem-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-inventoryitem-status.json rename to crates/fhir/tests/data/json/R5/codesystem-inventoryitem-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-inventoryreport-counttype.json b/crates/fhir/tests/data/json/R5/codesystem-inventoryreport-counttype.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-inventoryreport-counttype.json rename to crates/fhir/tests/data/json/R5/codesystem-inventoryreport-counttype.json diff --git a/crates/fhir/tests/data/R5/codesystem-inventoryreport-status.json b/crates/fhir/tests/data/json/R5/codesystem-inventoryreport-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-inventoryreport-status.json rename to crates/fhir/tests/data/json/R5/codesystem-inventoryreport-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-invoice-status.json b/crates/fhir/tests/data/json/R5/codesystem-invoice-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-invoice-status.json rename to crates/fhir/tests/data/json/R5/codesystem-invoice-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-issue-severity.json b/crates/fhir/tests/data/json/R5/codesystem-issue-severity.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-issue-severity.json rename to crates/fhir/tests/data/json/R5/codesystem-issue-severity.json diff --git a/crates/fhir/tests/data/R5/codesystem-issue-type.json b/crates/fhir/tests/data/json/R5/codesystem-issue-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-issue-type.json rename to crates/fhir/tests/data/json/R5/codesystem-issue-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-item-type.json b/crates/fhir/tests/data/json/R5/codesystem-item-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-item-type.json rename to crates/fhir/tests/data/json/R5/codesystem-item-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-knowledge-representation-level.json b/crates/fhir/tests/data/json/R5/codesystem-knowledge-representation-level.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-knowledge-representation-level.json rename to crates/fhir/tests/data/json/R5/codesystem-knowledge-representation-level.json diff --git a/crates/fhir/tests/data/R5/codesystem-legal-status-of-supply.json b/crates/fhir/tests/data/json/R5/codesystem-legal-status-of-supply.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-legal-status-of-supply.json rename to crates/fhir/tests/data/json/R5/codesystem-legal-status-of-supply.json diff --git a/crates/fhir/tests/data/R5/codesystem-link-type.json b/crates/fhir/tests/data/json/R5/codesystem-link-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-link-type.json rename to crates/fhir/tests/data/json/R5/codesystem-link-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-linkage-type.json b/crates/fhir/tests/data/json/R5/codesystem-linkage-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-linkage-type.json rename to crates/fhir/tests/data/json/R5/codesystem-linkage-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-list-item-flag.json b/crates/fhir/tests/data/json/R5/codesystem-list-item-flag.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-list-item-flag.json rename to crates/fhir/tests/data/json/R5/codesystem-list-item-flag.json diff --git a/crates/fhir/tests/data/R5/codesystem-list-mode.json b/crates/fhir/tests/data/json/R5/codesystem-list-mode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-list-mode.json rename to crates/fhir/tests/data/json/R5/codesystem-list-mode.json diff --git a/crates/fhir/tests/data/R5/codesystem-list-status.json b/crates/fhir/tests/data/json/R5/codesystem-list-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-list-status.json rename to crates/fhir/tests/data/json/R5/codesystem-list-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-location-characteristic.json b/crates/fhir/tests/data/json/R5/codesystem-location-characteristic.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-location-characteristic.json rename to crates/fhir/tests/data/json/R5/codesystem-location-characteristic.json diff --git a/crates/fhir/tests/data/R5/codesystem-location-mode.json b/crates/fhir/tests/data/json/R5/codesystem-location-mode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-location-mode.json rename to crates/fhir/tests/data/json/R5/codesystem-location-mode.json diff --git a/crates/fhir/tests/data/R5/codesystem-location-status.json b/crates/fhir/tests/data/json/R5/codesystem-location-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-location-status.json rename to crates/fhir/tests/data/json/R5/codesystem-location-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-manufactured-dose-form.json b/crates/fhir/tests/data/json/R5/codesystem-manufactured-dose-form.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-manufactured-dose-form.json rename to crates/fhir/tests/data/json/R5/codesystem-manufactured-dose-form.json diff --git a/crates/fhir/tests/data/R5/codesystem-map-group-type-mode.json b/crates/fhir/tests/data/json/R5/codesystem-map-group-type-mode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-map-group-type-mode.json rename to crates/fhir/tests/data/json/R5/codesystem-map-group-type-mode.json diff --git a/crates/fhir/tests/data/R5/codesystem-map-input-mode.json b/crates/fhir/tests/data/json/R5/codesystem-map-input-mode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-map-input-mode.json rename to crates/fhir/tests/data/json/R5/codesystem-map-input-mode.json diff --git a/crates/fhir/tests/data/R5/codesystem-map-model-mode.json b/crates/fhir/tests/data/json/R5/codesystem-map-model-mode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-map-model-mode.json rename to crates/fhir/tests/data/json/R5/codesystem-map-model-mode.json diff --git a/crates/fhir/tests/data/R5/codesystem-map-source-list-mode.json b/crates/fhir/tests/data/json/R5/codesystem-map-source-list-mode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-map-source-list-mode.json rename to crates/fhir/tests/data/json/R5/codesystem-map-source-list-mode.json diff --git a/crates/fhir/tests/data/R5/codesystem-map-target-list-mode.json b/crates/fhir/tests/data/json/R5/codesystem-map-target-list-mode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-map-target-list-mode.json rename to crates/fhir/tests/data/json/R5/codesystem-map-target-list-mode.json diff --git a/crates/fhir/tests/data/R5/codesystem-map-transform.json b/crates/fhir/tests/data/json/R5/codesystem-map-transform.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-map-transform.json rename to crates/fhir/tests/data/json/R5/codesystem-map-transform.json diff --git a/crates/fhir/tests/data/R5/codesystem-measure-aggregate-method.json b/crates/fhir/tests/data/json/R5/codesystem-measure-aggregate-method.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-measure-aggregate-method.json rename to crates/fhir/tests/data/json/R5/codesystem-measure-aggregate-method.json diff --git a/crates/fhir/tests/data/R5/codesystem-measure-definition-example.json b/crates/fhir/tests/data/json/R5/codesystem-measure-definition-example.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-measure-definition-example.json rename to crates/fhir/tests/data/json/R5/codesystem-measure-definition-example.json diff --git a/crates/fhir/tests/data/R5/codesystem-measure-group-example.json b/crates/fhir/tests/data/json/R5/codesystem-measure-group-example.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-measure-group-example.json rename to crates/fhir/tests/data/json/R5/codesystem-measure-group-example.json diff --git a/crates/fhir/tests/data/R5/codesystem-measure-report-status.json b/crates/fhir/tests/data/json/R5/codesystem-measure-report-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-measure-report-status.json rename to crates/fhir/tests/data/json/R5/codesystem-measure-report-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-measure-report-type.json b/crates/fhir/tests/data/json/R5/codesystem-measure-report-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-measure-report-type.json rename to crates/fhir/tests/data/json/R5/codesystem-measure-report-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-measure-stratifier-example.json b/crates/fhir/tests/data/json/R5/codesystem-measure-stratifier-example.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-measure-stratifier-example.json rename to crates/fhir/tests/data/json/R5/codesystem-measure-stratifier-example.json diff --git a/crates/fhir/tests/data/R5/codesystem-measure-supplemental-data-example.json b/crates/fhir/tests/data/json/R5/codesystem-measure-supplemental-data-example.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-measure-supplemental-data-example.json rename to crates/fhir/tests/data/json/R5/codesystem-measure-supplemental-data-example.json diff --git a/crates/fhir/tests/data/R5/codesystem-measurereport-stratifier-value-example.json b/crates/fhir/tests/data/json/R5/codesystem-measurereport-stratifier-value-example.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-measurereport-stratifier-value-example.json rename to crates/fhir/tests/data/json/R5/codesystem-measurereport-stratifier-value-example.json diff --git a/crates/fhir/tests/data/R5/codesystem-medication-admin-status.json b/crates/fhir/tests/data/json/R5/codesystem-medication-admin-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medication-admin-status.json rename to crates/fhir/tests/data/json/R5/codesystem-medication-admin-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-medication-cost-category.json b/crates/fhir/tests/data/json/R5/codesystem-medication-cost-category.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medication-cost-category.json rename to crates/fhir/tests/data/json/R5/codesystem-medication-cost-category.json diff --git a/crates/fhir/tests/data/R5/codesystem-medication-dose-aid.json b/crates/fhir/tests/data/json/R5/codesystem-medication-dose-aid.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medication-dose-aid.json rename to crates/fhir/tests/data/json/R5/codesystem-medication-dose-aid.json diff --git a/crates/fhir/tests/data/R5/codesystem-medication-ingredientstrength.json b/crates/fhir/tests/data/json/R5/codesystem-medication-ingredientstrength.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medication-ingredientstrength.json rename to crates/fhir/tests/data/json/R5/codesystem-medication-ingredientstrength.json diff --git a/crates/fhir/tests/data/R5/codesystem-medication-intended-performer-role.json b/crates/fhir/tests/data/json/R5/codesystem-medication-intended-performer-role.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medication-intended-performer-role.json rename to crates/fhir/tests/data/json/R5/codesystem-medication-intended-performer-role.json diff --git a/crates/fhir/tests/data/R5/codesystem-medication-statement-adherence.json b/crates/fhir/tests/data/json/R5/codesystem-medication-statement-adherence.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medication-statement-adherence.json rename to crates/fhir/tests/data/json/R5/codesystem-medication-statement-adherence.json diff --git a/crates/fhir/tests/data/R5/codesystem-medication-statement-status.json b/crates/fhir/tests/data/json/R5/codesystem-medication-statement-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medication-statement-status.json rename to crates/fhir/tests/data/json/R5/codesystem-medication-statement-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-medication-status.json b/crates/fhir/tests/data/json/R5/codesystem-medication-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medication-status.json rename to crates/fhir/tests/data/json/R5/codesystem-medication-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-medicationdispense-admin-location.json b/crates/fhir/tests/data/json/R5/codesystem-medicationdispense-admin-location.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medicationdispense-admin-location.json rename to crates/fhir/tests/data/json/R5/codesystem-medicationdispense-admin-location.json diff --git a/crates/fhir/tests/data/R5/codesystem-medicationdispense-status-reason.json b/crates/fhir/tests/data/json/R5/codesystem-medicationdispense-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medicationdispense-status-reason.json rename to crates/fhir/tests/data/json/R5/codesystem-medicationdispense-status-reason.json diff --git a/crates/fhir/tests/data/R5/codesystem-medicationdispense-status.json b/crates/fhir/tests/data/json/R5/codesystem-medicationdispense-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medicationdispense-status.json rename to crates/fhir/tests/data/json/R5/codesystem-medicationdispense-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-medicationknowledge-status.json b/crates/fhir/tests/data/json/R5/codesystem-medicationknowledge-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medicationknowledge-status.json rename to crates/fhir/tests/data/json/R5/codesystem-medicationknowledge-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-medicationrequest-intent.json b/crates/fhir/tests/data/json/R5/codesystem-medicationrequest-intent.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medicationrequest-intent.json rename to crates/fhir/tests/data/json/R5/codesystem-medicationrequest-intent.json diff --git a/crates/fhir/tests/data/R5/codesystem-medicationrequest-status.json b/crates/fhir/tests/data/json/R5/codesystem-medicationrequest-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medicationrequest-status.json rename to crates/fhir/tests/data/json/R5/codesystem-medicationrequest-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-medicinal-product-additional-monitoring.json b/crates/fhir/tests/data/json/R5/codesystem-medicinal-product-additional-monitoring.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medicinal-product-additional-monitoring.json rename to crates/fhir/tests/data/json/R5/codesystem-medicinal-product-additional-monitoring.json diff --git a/crates/fhir/tests/data/R5/codesystem-medicinal-product-confidentiality.json b/crates/fhir/tests/data/json/R5/codesystem-medicinal-product-confidentiality.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medicinal-product-confidentiality.json rename to crates/fhir/tests/data/json/R5/codesystem-medicinal-product-confidentiality.json diff --git a/crates/fhir/tests/data/R5/codesystem-medicinal-product-contact-type.json b/crates/fhir/tests/data/json/R5/codesystem-medicinal-product-contact-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medicinal-product-contact-type.json rename to crates/fhir/tests/data/json/R5/codesystem-medicinal-product-contact-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-medicinal-product-cross-reference-type.json b/crates/fhir/tests/data/json/R5/codesystem-medicinal-product-cross-reference-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medicinal-product-cross-reference-type.json rename to crates/fhir/tests/data/json/R5/codesystem-medicinal-product-cross-reference-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-medicinal-product-domain.json b/crates/fhir/tests/data/json/R5/codesystem-medicinal-product-domain.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medicinal-product-domain.json rename to crates/fhir/tests/data/json/R5/codesystem-medicinal-product-domain.json diff --git a/crates/fhir/tests/data/R5/codesystem-medicinal-product-name-part-type.json b/crates/fhir/tests/data/json/R5/codesystem-medicinal-product-name-part-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medicinal-product-name-part-type.json rename to crates/fhir/tests/data/json/R5/codesystem-medicinal-product-name-part-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-medicinal-product-name-type.json b/crates/fhir/tests/data/json/R5/codesystem-medicinal-product-name-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medicinal-product-name-type.json rename to crates/fhir/tests/data/json/R5/codesystem-medicinal-product-name-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-medicinal-product-package-type.json b/crates/fhir/tests/data/json/R5/codesystem-medicinal-product-package-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medicinal-product-package-type.json rename to crates/fhir/tests/data/json/R5/codesystem-medicinal-product-package-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-medicinal-product-pediatric-use.json b/crates/fhir/tests/data/json/R5/codesystem-medicinal-product-pediatric-use.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medicinal-product-pediatric-use.json rename to crates/fhir/tests/data/json/R5/codesystem-medicinal-product-pediatric-use.json diff --git a/crates/fhir/tests/data/R5/codesystem-medicinal-product-special-measures.json b/crates/fhir/tests/data/json/R5/codesystem-medicinal-product-special-measures.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medicinal-product-special-measures.json rename to crates/fhir/tests/data/json/R5/codesystem-medicinal-product-special-measures.json diff --git a/crates/fhir/tests/data/R5/codesystem-medicinal-product-type.json b/crates/fhir/tests/data/json/R5/codesystem-medicinal-product-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-medicinal-product-type.json rename to crates/fhir/tests/data/json/R5/codesystem-medicinal-product-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-message-events.json b/crates/fhir/tests/data/json/R5/codesystem-message-events.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-message-events.json rename to crates/fhir/tests/data/json/R5/codesystem-message-events.json diff --git a/crates/fhir/tests/data/R5/codesystem-message-significance-category.json b/crates/fhir/tests/data/json/R5/codesystem-message-significance-category.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-message-significance-category.json rename to crates/fhir/tests/data/json/R5/codesystem-message-significance-category.json diff --git a/crates/fhir/tests/data/R5/codesystem-message-transport.json b/crates/fhir/tests/data/json/R5/codesystem-message-transport.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-message-transport.json rename to crates/fhir/tests/data/json/R5/codesystem-message-transport.json diff --git a/crates/fhir/tests/data/R5/codesystem-messageheader-response-request.json b/crates/fhir/tests/data/json/R5/codesystem-messageheader-response-request.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-messageheader-response-request.json rename to crates/fhir/tests/data/json/R5/codesystem-messageheader-response-request.json diff --git a/crates/fhir/tests/data/R5/codesystem-metric-calibration-state.json b/crates/fhir/tests/data/json/R5/codesystem-metric-calibration-state.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-metric-calibration-state.json rename to crates/fhir/tests/data/json/R5/codesystem-metric-calibration-state.json diff --git a/crates/fhir/tests/data/R5/codesystem-metric-calibration-type.json b/crates/fhir/tests/data/json/R5/codesystem-metric-calibration-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-metric-calibration-type.json rename to crates/fhir/tests/data/json/R5/codesystem-metric-calibration-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-metric-category.json b/crates/fhir/tests/data/json/R5/codesystem-metric-category.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-metric-category.json rename to crates/fhir/tests/data/json/R5/codesystem-metric-category.json diff --git a/crates/fhir/tests/data/R5/codesystem-metric-operational-status.json b/crates/fhir/tests/data/json/R5/codesystem-metric-operational-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-metric-operational-status.json rename to crates/fhir/tests/data/json/R5/codesystem-metric-operational-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-name-use.json b/crates/fhir/tests/data/json/R5/codesystem-name-use.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-name-use.json rename to crates/fhir/tests/data/json/R5/codesystem-name-use.json diff --git a/crates/fhir/tests/data/R5/codesystem-namingsystem-identifier-type.json b/crates/fhir/tests/data/json/R5/codesystem-namingsystem-identifier-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-namingsystem-identifier-type.json rename to crates/fhir/tests/data/json/R5/codesystem-namingsystem-identifier-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-namingsystem-type.json b/crates/fhir/tests/data/json/R5/codesystem-namingsystem-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-namingsystem-type.json rename to crates/fhir/tests/data/json/R5/codesystem-namingsystem-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-narrative-status.json b/crates/fhir/tests/data/json/R5/codesystem-narrative-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-narrative-status.json rename to crates/fhir/tests/data/json/R5/codesystem-narrative-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-nhin-purposeofuse.json b/crates/fhir/tests/data/json/R5/codesystem-nhin-purposeofuse.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-nhin-purposeofuse.json rename to crates/fhir/tests/data/json/R5/codesystem-nhin-purposeofuse.json diff --git a/crates/fhir/tests/data/R5/codesystem-note-type.json b/crates/fhir/tests/data/json/R5/codesystem-note-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-note-type.json rename to crates/fhir/tests/data/json/R5/codesystem-note-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-nutritionproduct-status.json b/crates/fhir/tests/data/json/R5/codesystem-nutritionproduct-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-nutritionproduct-status.json rename to crates/fhir/tests/data/json/R5/codesystem-nutritionproduct-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-observation-range-category.json b/crates/fhir/tests/data/json/R5/codesystem-observation-range-category.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-observation-range-category.json rename to crates/fhir/tests/data/json/R5/codesystem-observation-range-category.json diff --git a/crates/fhir/tests/data/R5/codesystem-observation-referencerange-normalvalue.json b/crates/fhir/tests/data/json/R5/codesystem-observation-referencerange-normalvalue.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-observation-referencerange-normalvalue.json rename to crates/fhir/tests/data/json/R5/codesystem-observation-referencerange-normalvalue.json diff --git a/crates/fhir/tests/data/R5/codesystem-observation-statistics.json b/crates/fhir/tests/data/json/R5/codesystem-observation-statistics.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-observation-statistics.json rename to crates/fhir/tests/data/json/R5/codesystem-observation-statistics.json diff --git a/crates/fhir/tests/data/R5/codesystem-observation-status.json b/crates/fhir/tests/data/json/R5/codesystem-observation-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-observation-status.json rename to crates/fhir/tests/data/json/R5/codesystem-observation-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-observation-triggeredbytype.json b/crates/fhir/tests/data/json/R5/codesystem-observation-triggeredbytype.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-observation-triggeredbytype.json rename to crates/fhir/tests/data/json/R5/codesystem-observation-triggeredbytype.json diff --git a/crates/fhir/tests/data/R5/codesystem-operation-kind.json b/crates/fhir/tests/data/json/R5/codesystem-operation-kind.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-operation-kind.json rename to crates/fhir/tests/data/json/R5/codesystem-operation-kind.json diff --git a/crates/fhir/tests/data/R5/codesystem-operation-outcome.json b/crates/fhir/tests/data/json/R5/codesystem-operation-outcome.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-operation-outcome.json rename to crates/fhir/tests/data/json/R5/codesystem-operation-outcome.json diff --git a/crates/fhir/tests/data/R5/codesystem-operation-parameter-scope.json b/crates/fhir/tests/data/json/R5/codesystem-operation-parameter-scope.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-operation-parameter-scope.json rename to crates/fhir/tests/data/json/R5/codesystem-operation-parameter-scope.json diff --git a/crates/fhir/tests/data/R5/codesystem-operation-parameter-use.json b/crates/fhir/tests/data/json/R5/codesystem-operation-parameter-use.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-operation-parameter-use.json rename to crates/fhir/tests/data/json/R5/codesystem-operation-parameter-use.json diff --git a/crates/fhir/tests/data/R5/codesystem-organization-role.json b/crates/fhir/tests/data/json/R5/codesystem-organization-role.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-organization-role.json rename to crates/fhir/tests/data/json/R5/codesystem-organization-role.json diff --git a/crates/fhir/tests/data/R5/codesystem-orientation-type.json b/crates/fhir/tests/data/json/R5/codesystem-orientation-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-orientation-type.json rename to crates/fhir/tests/data/json/R5/codesystem-orientation-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-package-material.json b/crates/fhir/tests/data/json/R5/codesystem-package-material.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-package-material.json rename to crates/fhir/tests/data/json/R5/codesystem-package-material.json diff --git a/crates/fhir/tests/data/R5/codesystem-package-type.json b/crates/fhir/tests/data/json/R5/codesystem-package-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-package-type.json rename to crates/fhir/tests/data/json/R5/codesystem-package-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-packaging-type.json b/crates/fhir/tests/data/json/R5/codesystem-packaging-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-packaging-type.json rename to crates/fhir/tests/data/json/R5/codesystem-packaging-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-participationstatus.json b/crates/fhir/tests/data/json/R5/codesystem-participationstatus.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-participationstatus.json rename to crates/fhir/tests/data/json/R5/codesystem-participationstatus.json diff --git a/crates/fhir/tests/data/R5/codesystem-payment-issuertype.json b/crates/fhir/tests/data/json/R5/codesystem-payment-issuertype.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-payment-issuertype.json rename to crates/fhir/tests/data/json/R5/codesystem-payment-issuertype.json diff --git a/crates/fhir/tests/data/R5/codesystem-payment-kind.json b/crates/fhir/tests/data/json/R5/codesystem-payment-kind.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-payment-kind.json rename to crates/fhir/tests/data/json/R5/codesystem-payment-kind.json diff --git a/crates/fhir/tests/data/R5/codesystem-payment-outcome.json b/crates/fhir/tests/data/json/R5/codesystem-payment-outcome.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-payment-outcome.json rename to crates/fhir/tests/data/json/R5/codesystem-payment-outcome.json diff --git a/crates/fhir/tests/data/R5/codesystem-permission-rule-combining.json b/crates/fhir/tests/data/json/R5/codesystem-permission-rule-combining.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-permission-rule-combining.json rename to crates/fhir/tests/data/json/R5/codesystem-permission-rule-combining.json diff --git a/crates/fhir/tests/data/R5/codesystem-permission-status.json b/crates/fhir/tests/data/json/R5/codesystem-permission-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-permission-status.json rename to crates/fhir/tests/data/json/R5/codesystem-permission-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-permitted-data-type.json b/crates/fhir/tests/data/json/R5/codesystem-permitted-data-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-permitted-data-type.json rename to crates/fhir/tests/data/json/R5/codesystem-permitted-data-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-price-component-type.json b/crates/fhir/tests/data/json/R5/codesystem-price-component-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-price-component-type.json rename to crates/fhir/tests/data/json/R5/codesystem-price-component-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-product-category.json b/crates/fhir/tests/data/json/R5/codesystem-product-category.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-product-category.json rename to crates/fhir/tests/data/json/R5/codesystem-product-category.json diff --git a/crates/fhir/tests/data/R5/codesystem-product-intended-use.json b/crates/fhir/tests/data/json/R5/codesystem-product-intended-use.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-product-intended-use.json rename to crates/fhir/tests/data/json/R5/codesystem-product-intended-use.json diff --git a/crates/fhir/tests/data/R5/codesystem-product-status.json b/crates/fhir/tests/data/json/R5/codesystem-product-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-product-status.json rename to crates/fhir/tests/data/json/R5/codesystem-product-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-property-representation.json b/crates/fhir/tests/data/json/R5/codesystem-property-representation.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-property-representation.json rename to crates/fhir/tests/data/json/R5/codesystem-property-representation.json diff --git a/crates/fhir/tests/data/R5/codesystem-provenance-entity-role.json b/crates/fhir/tests/data/json/R5/codesystem-provenance-entity-role.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-provenance-entity-role.json rename to crates/fhir/tests/data/json/R5/codesystem-provenance-entity-role.json diff --git a/crates/fhir/tests/data/R5/codesystem-publication-status.json b/crates/fhir/tests/data/json/R5/codesystem-publication-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-publication-status.json rename to crates/fhir/tests/data/json/R5/codesystem-publication-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-published-in-type.json b/crates/fhir/tests/data/json/R5/codesystem-published-in-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-published-in-type.json rename to crates/fhir/tests/data/json/R5/codesystem-published-in-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-quantity-comparator.json b/crates/fhir/tests/data/json/R5/codesystem-quantity-comparator.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-quantity-comparator.json rename to crates/fhir/tests/data/json/R5/codesystem-quantity-comparator.json diff --git a/crates/fhir/tests/data/R5/codesystem-questionnaire-answer-constraint.json b/crates/fhir/tests/data/json/R5/codesystem-questionnaire-answer-constraint.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-questionnaire-answer-constraint.json rename to crates/fhir/tests/data/json/R5/codesystem-questionnaire-answer-constraint.json diff --git a/crates/fhir/tests/data/R5/codesystem-questionnaire-answers-status.json b/crates/fhir/tests/data/json/R5/codesystem-questionnaire-answers-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-questionnaire-answers-status.json rename to crates/fhir/tests/data/json/R5/codesystem-questionnaire-answers-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-questionnaire-disabled-display.json b/crates/fhir/tests/data/json/R5/codesystem-questionnaire-disabled-display.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-questionnaire-disabled-display.json rename to crates/fhir/tests/data/json/R5/codesystem-questionnaire-disabled-display.json diff --git a/crates/fhir/tests/data/R5/codesystem-questionnaire-enable-behavior.json b/crates/fhir/tests/data/json/R5/codesystem-questionnaire-enable-behavior.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-questionnaire-enable-behavior.json rename to crates/fhir/tests/data/json/R5/codesystem-questionnaire-enable-behavior.json diff --git a/crates/fhir/tests/data/R5/codesystem-questionnaire-enable-operator.json b/crates/fhir/tests/data/json/R5/codesystem-questionnaire-enable-operator.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-questionnaire-enable-operator.json rename to crates/fhir/tests/data/json/R5/codesystem-questionnaire-enable-operator.json diff --git a/crates/fhir/tests/data/R5/codesystem-questionnaire.json b/crates/fhir/tests/data/json/R5/codesystem-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-questionnaire.json rename to crates/fhir/tests/data/json/R5/codesystem-questionnaire.json diff --git a/crates/fhir/tests/data/R5/codesystem-reaction-event-severity.json b/crates/fhir/tests/data/json/R5/codesystem-reaction-event-severity.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-reaction-event-severity.json rename to crates/fhir/tests/data/json/R5/codesystem-reaction-event-severity.json diff --git a/crates/fhir/tests/data/R5/codesystem-reason-medication-not-given-codes.json b/crates/fhir/tests/data/json/R5/codesystem-reason-medication-not-given-codes.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-reason-medication-not-given-codes.json rename to crates/fhir/tests/data/json/R5/codesystem-reason-medication-not-given-codes.json diff --git a/crates/fhir/tests/data/R5/codesystem-reference-handling-policy.json b/crates/fhir/tests/data/json/R5/codesystem-reference-handling-policy.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-reference-handling-policy.json rename to crates/fhir/tests/data/json/R5/codesystem-reference-handling-policy.json diff --git a/crates/fhir/tests/data/R5/codesystem-reference-version-rules.json b/crates/fhir/tests/data/json/R5/codesystem-reference-version-rules.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-reference-version-rules.json rename to crates/fhir/tests/data/json/R5/codesystem-reference-version-rules.json diff --git a/crates/fhir/tests/data/R5/codesystem-regulated-authorization-basis.json b/crates/fhir/tests/data/json/R5/codesystem-regulated-authorization-basis.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-regulated-authorization-basis.json rename to crates/fhir/tests/data/json/R5/codesystem-regulated-authorization-basis.json diff --git a/crates/fhir/tests/data/R5/codesystem-regulated-authorization-case-type.json b/crates/fhir/tests/data/json/R5/codesystem-regulated-authorization-case-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-regulated-authorization-case-type.json rename to crates/fhir/tests/data/json/R5/codesystem-regulated-authorization-case-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-regulated-authorization-type.json b/crates/fhir/tests/data/json/R5/codesystem-regulated-authorization-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-regulated-authorization-type.json rename to crates/fhir/tests/data/json/R5/codesystem-regulated-authorization-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-related-artifact-type-expanded.json b/crates/fhir/tests/data/json/R5/codesystem-related-artifact-type-expanded.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-related-artifact-type-expanded.json rename to crates/fhir/tests/data/json/R5/codesystem-related-artifact-type-expanded.json diff --git a/crates/fhir/tests/data/R5/codesystem-related-artifact-type.json b/crates/fhir/tests/data/json/R5/codesystem-related-artifact-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-related-artifact-type.json rename to crates/fhir/tests/data/json/R5/codesystem-related-artifact-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-relationship.json b/crates/fhir/tests/data/json/R5/codesystem-relationship.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-relationship.json rename to crates/fhir/tests/data/json/R5/codesystem-relationship.json diff --git a/crates/fhir/tests/data/R5/codesystem-remittance-outcome.json b/crates/fhir/tests/data/json/R5/codesystem-remittance-outcome.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-remittance-outcome.json rename to crates/fhir/tests/data/json/R5/codesystem-remittance-outcome.json diff --git a/crates/fhir/tests/data/R5/codesystem-report-action-result-codes.json b/crates/fhir/tests/data/json/R5/codesystem-report-action-result-codes.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-report-action-result-codes.json rename to crates/fhir/tests/data/json/R5/codesystem-report-action-result-codes.json diff --git a/crates/fhir/tests/data/R5/codesystem-report-participant-type.json b/crates/fhir/tests/data/json/R5/codesystem-report-participant-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-report-participant-type.json rename to crates/fhir/tests/data/json/R5/codesystem-report-participant-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-report-relation-type.json b/crates/fhir/tests/data/json/R5/codesystem-report-relation-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-report-relation-type.json rename to crates/fhir/tests/data/json/R5/codesystem-report-relation-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-report-result-codes.json b/crates/fhir/tests/data/json/R5/codesystem-report-result-codes.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-report-result-codes.json rename to crates/fhir/tests/data/json/R5/codesystem-report-result-codes.json diff --git a/crates/fhir/tests/data/R5/codesystem-report-status-codes.json b/crates/fhir/tests/data/json/R5/codesystem-report-status-codes.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-report-status-codes.json rename to crates/fhir/tests/data/json/R5/codesystem-report-status-codes.json diff --git a/crates/fhir/tests/data/R5/codesystem-request-intent.json b/crates/fhir/tests/data/json/R5/codesystem-request-intent.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-request-intent.json rename to crates/fhir/tests/data/json/R5/codesystem-request-intent.json diff --git a/crates/fhir/tests/data/R5/codesystem-request-priority.json b/crates/fhir/tests/data/json/R5/codesystem-request-priority.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-request-priority.json rename to crates/fhir/tests/data/json/R5/codesystem-request-priority.json diff --git a/crates/fhir/tests/data/R5/codesystem-request-status.json b/crates/fhir/tests/data/json/R5/codesystem-request-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-request-status.json rename to crates/fhir/tests/data/json/R5/codesystem-request-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-research-study-arm-type.json b/crates/fhir/tests/data/json/R5/codesystem-research-study-arm-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-research-study-arm-type.json rename to crates/fhir/tests/data/json/R5/codesystem-research-study-arm-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-research-study-classifiers.json b/crates/fhir/tests/data/json/R5/codesystem-research-study-classifiers.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-research-study-classifiers.json rename to crates/fhir/tests/data/json/R5/codesystem-research-study-classifiers.json diff --git a/crates/fhir/tests/data/R5/codesystem-research-study-focus-type.json b/crates/fhir/tests/data/json/R5/codesystem-research-study-focus-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-research-study-focus-type.json rename to crates/fhir/tests/data/json/R5/codesystem-research-study-focus-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-research-study-objective-type.json b/crates/fhir/tests/data/json/R5/codesystem-research-study-objective-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-research-study-objective-type.json rename to crates/fhir/tests/data/json/R5/codesystem-research-study-objective-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-research-study-party-organization-type.json b/crates/fhir/tests/data/json/R5/codesystem-research-study-party-organization-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-research-study-party-organization-type.json rename to crates/fhir/tests/data/json/R5/codesystem-research-study-party-organization-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-research-study-party-role.json b/crates/fhir/tests/data/json/R5/codesystem-research-study-party-role.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-research-study-party-role.json rename to crates/fhir/tests/data/json/R5/codesystem-research-study-party-role.json diff --git a/crates/fhir/tests/data/R5/codesystem-research-study-phase.json b/crates/fhir/tests/data/json/R5/codesystem-research-study-phase.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-research-study-phase.json rename to crates/fhir/tests/data/json/R5/codesystem-research-study-phase.json diff --git a/crates/fhir/tests/data/R5/codesystem-research-study-prim-purp-type.json b/crates/fhir/tests/data/json/R5/codesystem-research-study-prim-purp-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-research-study-prim-purp-type.json rename to crates/fhir/tests/data/json/R5/codesystem-research-study-prim-purp-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-research-study-reason-stopped.json b/crates/fhir/tests/data/json/R5/codesystem-research-study-reason-stopped.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-research-study-reason-stopped.json rename to crates/fhir/tests/data/json/R5/codesystem-research-study-reason-stopped.json diff --git a/crates/fhir/tests/data/R5/codesystem-research-study-status.json b/crates/fhir/tests/data/json/R5/codesystem-research-study-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-research-study-status.json rename to crates/fhir/tests/data/json/R5/codesystem-research-study-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-resource-aggregation-mode.json b/crates/fhir/tests/data/json/R5/codesystem-resource-aggregation-mode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-resource-aggregation-mode.json rename to crates/fhir/tests/data/json/R5/codesystem-resource-aggregation-mode.json diff --git a/crates/fhir/tests/data/R5/codesystem-resource-slicing-rules.json b/crates/fhir/tests/data/json/R5/codesystem-resource-slicing-rules.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-resource-slicing-rules.json rename to crates/fhir/tests/data/json/R5/codesystem-resource-slicing-rules.json diff --git a/crates/fhir/tests/data/R5/codesystem-resource-status.json b/crates/fhir/tests/data/json/R5/codesystem-resource-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-resource-status.json rename to crates/fhir/tests/data/json/R5/codesystem-resource-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-resource-validation-mode.json b/crates/fhir/tests/data/json/R5/codesystem-resource-validation-mode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-resource-validation-mode.json rename to crates/fhir/tests/data/json/R5/codesystem-resource-validation-mode.json diff --git a/crates/fhir/tests/data/R5/codesystem-response-code.json b/crates/fhir/tests/data/json/R5/codesystem-response-code.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-response-code.json rename to crates/fhir/tests/data/json/R5/codesystem-response-code.json diff --git a/crates/fhir/tests/data/R5/codesystem-restful-capability-mode.json b/crates/fhir/tests/data/json/R5/codesystem-restful-capability-mode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-restful-capability-mode.json rename to crates/fhir/tests/data/json/R5/codesystem-restful-capability-mode.json diff --git a/crates/fhir/tests/data/R5/codesystem-restful-interaction.json b/crates/fhir/tests/data/json/R5/codesystem-restful-interaction.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-restful-interaction.json rename to crates/fhir/tests/data/json/R5/codesystem-restful-interaction.json diff --git a/crates/fhir/tests/data/R5/codesystem-restful-security-service.json b/crates/fhir/tests/data/json/R5/codesystem-restful-security-service.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-restful-security-service.json rename to crates/fhir/tests/data/json/R5/codesystem-restful-security-service.json diff --git a/crates/fhir/tests/data/R5/codesystem-safety-entries.json b/crates/fhir/tests/data/json/R5/codesystem-safety-entries.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-safety-entries.json rename to crates/fhir/tests/data/json/R5/codesystem-safety-entries.json diff --git a/crates/fhir/tests/data/R5/codesystem-sample-security-structural-roles.json b/crates/fhir/tests/data/json/R5/codesystem-sample-security-structural-roles.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-sample-security-structural-roles.json rename to crates/fhir/tests/data/json/R5/codesystem-sample-security-structural-roles.json diff --git a/crates/fhir/tests/data/R5/codesystem-search-comparator.json b/crates/fhir/tests/data/json/R5/codesystem-search-comparator.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-search-comparator.json rename to crates/fhir/tests/data/json/R5/codesystem-search-comparator.json diff --git a/crates/fhir/tests/data/R5/codesystem-search-entry-mode.json b/crates/fhir/tests/data/json/R5/codesystem-search-entry-mode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-search-entry-mode.json rename to crates/fhir/tests/data/json/R5/codesystem-search-entry-mode.json diff --git a/crates/fhir/tests/data/R5/codesystem-search-modifier-code.json b/crates/fhir/tests/data/json/R5/codesystem-search-modifier-code.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-search-modifier-code.json rename to crates/fhir/tests/data/json/R5/codesystem-search-modifier-code.json diff --git a/crates/fhir/tests/data/R5/codesystem-search-param-type.json b/crates/fhir/tests/data/json/R5/codesystem-search-param-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-search-param-type.json rename to crates/fhir/tests/data/json/R5/codesystem-search-param-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-search-processingmode.json b/crates/fhir/tests/data/json/R5/codesystem-search-processingmode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-search-processingmode.json rename to crates/fhir/tests/data/json/R5/codesystem-search-processingmode.json diff --git a/crates/fhir/tests/data/R5/codesystem-sequence-type.json b/crates/fhir/tests/data/json/R5/codesystem-sequence-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-sequence-type.json rename to crates/fhir/tests/data/json/R5/codesystem-sequence-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-service-mode.json b/crates/fhir/tests/data/json/R5/codesystem-service-mode.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-service-mode.json rename to crates/fhir/tests/data/json/R5/codesystem-service-mode.json diff --git a/crates/fhir/tests/data/R5/codesystem-servicerequest-orderdetail-parameter-code.json b/crates/fhir/tests/data/json/R5/codesystem-servicerequest-orderdetail-parameter-code.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-servicerequest-orderdetail-parameter-code.json rename to crates/fhir/tests/data/json/R5/codesystem-servicerequest-orderdetail-parameter-code.json diff --git a/crates/fhir/tests/data/R5/codesystem-slotstatus.json b/crates/fhir/tests/data/json/R5/codesystem-slotstatus.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-slotstatus.json rename to crates/fhir/tests/data/json/R5/codesystem-slotstatus.json diff --git a/crates/fhir/tests/data/R5/codesystem-sort-direction.json b/crates/fhir/tests/data/json/R5/codesystem-sort-direction.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-sort-direction.json rename to crates/fhir/tests/data/json/R5/codesystem-sort-direction.json diff --git a/crates/fhir/tests/data/R5/codesystem-spdx-license.json b/crates/fhir/tests/data/json/R5/codesystem-spdx-license.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-spdx-license.json rename to crates/fhir/tests/data/json/R5/codesystem-spdx-license.json diff --git a/crates/fhir/tests/data/R5/codesystem-specimen-combined.json b/crates/fhir/tests/data/json/R5/codesystem-specimen-combined.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-specimen-combined.json rename to crates/fhir/tests/data/json/R5/codesystem-specimen-combined.json diff --git a/crates/fhir/tests/data/R5/codesystem-specimen-contained-preference.json b/crates/fhir/tests/data/json/R5/codesystem-specimen-contained-preference.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-specimen-contained-preference.json rename to crates/fhir/tests/data/json/R5/codesystem-specimen-contained-preference.json diff --git a/crates/fhir/tests/data/R5/codesystem-specimen-role.json b/crates/fhir/tests/data/json/R5/codesystem-specimen-role.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-specimen-role.json rename to crates/fhir/tests/data/json/R5/codesystem-specimen-role.json diff --git a/crates/fhir/tests/data/R5/codesystem-specimen-status.json b/crates/fhir/tests/data/json/R5/codesystem-specimen-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-specimen-status.json rename to crates/fhir/tests/data/json/R5/codesystem-specimen-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-statistic-model-code.json b/crates/fhir/tests/data/json/R5/codesystem-statistic-model-code.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-statistic-model-code.json rename to crates/fhir/tests/data/json/R5/codesystem-statistic-model-code.json diff --git a/crates/fhir/tests/data/R5/codesystem-strand-type.json b/crates/fhir/tests/data/json/R5/codesystem-strand-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-strand-type.json rename to crates/fhir/tests/data/json/R5/codesystem-strand-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-structure-definition-kind.json b/crates/fhir/tests/data/json/R5/codesystem-structure-definition-kind.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-structure-definition-kind.json rename to crates/fhir/tests/data/json/R5/codesystem-structure-definition-kind.json diff --git a/crates/fhir/tests/data/R5/codesystem-study-design.json b/crates/fhir/tests/data/json/R5/codesystem-study-design.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-study-design.json rename to crates/fhir/tests/data/json/R5/codesystem-study-design.json diff --git a/crates/fhir/tests/data/R5/codesystem-submit-data-update-type.json b/crates/fhir/tests/data/json/R5/codesystem-submit-data-update-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-submit-data-update-type.json rename to crates/fhir/tests/data/json/R5/codesystem-submit-data-update-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-subscription-notification-type.json b/crates/fhir/tests/data/json/R5/codesystem-subscription-notification-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-subscription-notification-type.json rename to crates/fhir/tests/data/json/R5/codesystem-subscription-notification-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-subscription-payload-content.json b/crates/fhir/tests/data/json/R5/codesystem-subscription-payload-content.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-subscription-payload-content.json rename to crates/fhir/tests/data/json/R5/codesystem-subscription-payload-content.json diff --git a/crates/fhir/tests/data/R5/codesystem-subscription-status.json b/crates/fhir/tests/data/json/R5/codesystem-subscription-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-subscription-status.json rename to crates/fhir/tests/data/json/R5/codesystem-subscription-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-subscriptiontopic-cr-behavior.json b/crates/fhir/tests/data/json/R5/codesystem-subscriptiontopic-cr-behavior.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-subscriptiontopic-cr-behavior.json rename to crates/fhir/tests/data/json/R5/codesystem-subscriptiontopic-cr-behavior.json diff --git a/crates/fhir/tests/data/R5/codesystem-substance-amount-type.json b/crates/fhir/tests/data/json/R5/codesystem-substance-amount-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-substance-amount-type.json rename to crates/fhir/tests/data/json/R5/codesystem-substance-amount-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-substance-form.json b/crates/fhir/tests/data/json/R5/codesystem-substance-form.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-substance-form.json rename to crates/fhir/tests/data/json/R5/codesystem-substance-form.json diff --git a/crates/fhir/tests/data/R5/codesystem-substance-grade.json b/crates/fhir/tests/data/json/R5/codesystem-substance-grade.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-substance-grade.json rename to crates/fhir/tests/data/json/R5/codesystem-substance-grade.json diff --git a/crates/fhir/tests/data/R5/codesystem-substance-name-authority.json b/crates/fhir/tests/data/json/R5/codesystem-substance-name-authority.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-substance-name-authority.json rename to crates/fhir/tests/data/json/R5/codesystem-substance-name-authority.json diff --git a/crates/fhir/tests/data/R5/codesystem-substance-name-domain.json b/crates/fhir/tests/data/json/R5/codesystem-substance-name-domain.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-substance-name-domain.json rename to crates/fhir/tests/data/json/R5/codesystem-substance-name-domain.json diff --git a/crates/fhir/tests/data/R5/codesystem-substance-name-type.json b/crates/fhir/tests/data/json/R5/codesystem-substance-name-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-substance-name-type.json rename to crates/fhir/tests/data/json/R5/codesystem-substance-name-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-substance-optical-activity.json b/crates/fhir/tests/data/json/R5/codesystem-substance-optical-activity.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-substance-optical-activity.json rename to crates/fhir/tests/data/json/R5/codesystem-substance-optical-activity.json diff --git a/crates/fhir/tests/data/R5/codesystem-substance-relationship-type.json b/crates/fhir/tests/data/json/R5/codesystem-substance-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-substance-relationship-type.json rename to crates/fhir/tests/data/json/R5/codesystem-substance-relationship-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-substance-representation-format.json b/crates/fhir/tests/data/json/R5/codesystem-substance-representation-format.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-substance-representation-format.json rename to crates/fhir/tests/data/json/R5/codesystem-substance-representation-format.json diff --git a/crates/fhir/tests/data/R5/codesystem-substance-representation-type.json b/crates/fhir/tests/data/json/R5/codesystem-substance-representation-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-substance-representation-type.json rename to crates/fhir/tests/data/json/R5/codesystem-substance-representation-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-substance-source-material-genus.json b/crates/fhir/tests/data/json/R5/codesystem-substance-source-material-genus.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-substance-source-material-genus.json rename to crates/fhir/tests/data/json/R5/codesystem-substance-source-material-genus.json diff --git a/crates/fhir/tests/data/R5/codesystem-substance-source-material-part.json b/crates/fhir/tests/data/json/R5/codesystem-substance-source-material-part.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-substance-source-material-part.json rename to crates/fhir/tests/data/json/R5/codesystem-substance-source-material-part.json diff --git a/crates/fhir/tests/data/R5/codesystem-substance-source-material-species.json b/crates/fhir/tests/data/json/R5/codesystem-substance-source-material-species.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-substance-source-material-species.json rename to crates/fhir/tests/data/json/R5/codesystem-substance-source-material-species.json diff --git a/crates/fhir/tests/data/R5/codesystem-substance-source-material-type.json b/crates/fhir/tests/data/json/R5/codesystem-substance-source-material-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-substance-source-material-type.json rename to crates/fhir/tests/data/json/R5/codesystem-substance-source-material-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-substance-status.json b/crates/fhir/tests/data/json/R5/codesystem-substance-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-substance-status.json rename to crates/fhir/tests/data/json/R5/codesystem-substance-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-substance-stereochemistry.json b/crates/fhir/tests/data/json/R5/codesystem-substance-stereochemistry.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-substance-stereochemistry.json rename to crates/fhir/tests/data/json/R5/codesystem-substance-stereochemistry.json diff --git a/crates/fhir/tests/data/R5/codesystem-substance-structure-technique.json b/crates/fhir/tests/data/json/R5/codesystem-substance-structure-technique.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-substance-structure-technique.json rename to crates/fhir/tests/data/json/R5/codesystem-substance-structure-technique.json diff --git a/crates/fhir/tests/data/R5/codesystem-substance-weight-method.json b/crates/fhir/tests/data/json/R5/codesystem-substance-weight-method.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-substance-weight-method.json rename to crates/fhir/tests/data/json/R5/codesystem-substance-weight-method.json diff --git a/crates/fhir/tests/data/R5/codesystem-substance-weight-type.json b/crates/fhir/tests/data/json/R5/codesystem-substance-weight-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-substance-weight-type.json rename to crates/fhir/tests/data/json/R5/codesystem-substance-weight-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-supplydelivery-status.json b/crates/fhir/tests/data/json/R5/codesystem-supplydelivery-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-supplydelivery-status.json rename to crates/fhir/tests/data/json/R5/codesystem-supplydelivery-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-supplydelivery-supplyitemtype.json b/crates/fhir/tests/data/json/R5/codesystem-supplydelivery-supplyitemtype.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-supplydelivery-supplyitemtype.json rename to crates/fhir/tests/data/json/R5/codesystem-supplydelivery-supplyitemtype.json diff --git a/crates/fhir/tests/data/R5/codesystem-supplyrequest-status.json b/crates/fhir/tests/data/json/R5/codesystem-supplyrequest-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-supplyrequest-status.json rename to crates/fhir/tests/data/json/R5/codesystem-supplyrequest-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-target-species.json b/crates/fhir/tests/data/json/R5/codesystem-target-species.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-target-species.json rename to crates/fhir/tests/data/json/R5/codesystem-target-species.json diff --git a/crates/fhir/tests/data/R5/codesystem-task-code.json b/crates/fhir/tests/data/json/R5/codesystem-task-code.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-task-code.json rename to crates/fhir/tests/data/json/R5/codesystem-task-code.json diff --git a/crates/fhir/tests/data/R5/codesystem-task-intent.json b/crates/fhir/tests/data/json/R5/codesystem-task-intent.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-task-intent.json rename to crates/fhir/tests/data/json/R5/codesystem-task-intent.json diff --git a/crates/fhir/tests/data/R5/codesystem-task-status-reason.json b/crates/fhir/tests/data/json/R5/codesystem-task-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-task-status-reason.json rename to crates/fhir/tests/data/json/R5/codesystem-task-status-reason.json diff --git a/crates/fhir/tests/data/R5/codesystem-task-status.json b/crates/fhir/tests/data/json/R5/codesystem-task-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-task-status.json rename to crates/fhir/tests/data/json/R5/codesystem-task-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-testscript-scope-conformance-codes.json b/crates/fhir/tests/data/json/R5/codesystem-testscript-scope-conformance-codes.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-testscript-scope-conformance-codes.json rename to crates/fhir/tests/data/json/R5/codesystem-testscript-scope-conformance-codes.json diff --git a/crates/fhir/tests/data/R5/codesystem-testscript-scope-phase-codes.json b/crates/fhir/tests/data/json/R5/codesystem-testscript-scope-phase-codes.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-testscript-scope-phase-codes.json rename to crates/fhir/tests/data/json/R5/codesystem-testscript-scope-phase-codes.json diff --git a/crates/fhir/tests/data/R5/codesystem-therapy-relationship-type.json b/crates/fhir/tests/data/json/R5/codesystem-therapy-relationship-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-therapy-relationship-type.json rename to crates/fhir/tests/data/json/R5/codesystem-therapy-relationship-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-timing-abbreviation.json b/crates/fhir/tests/data/json/R5/codesystem-timing-abbreviation.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-timing-abbreviation.json rename to crates/fhir/tests/data/json/R5/codesystem-timing-abbreviation.json diff --git a/crates/fhir/tests/data/R5/codesystem-title-type.json b/crates/fhir/tests/data/json/R5/codesystem-title-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-title-type.json rename to crates/fhir/tests/data/json/R5/codesystem-title-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-tldc.json b/crates/fhir/tests/data/json/R5/codesystem-tldc.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-tldc.json rename to crates/fhir/tests/data/json/R5/codesystem-tldc.json diff --git a/crates/fhir/tests/data/R5/codesystem-transport-code.json b/crates/fhir/tests/data/json/R5/codesystem-transport-code.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-transport-code.json rename to crates/fhir/tests/data/json/R5/codesystem-transport-code.json diff --git a/crates/fhir/tests/data/R5/codesystem-transport-intent.json b/crates/fhir/tests/data/json/R5/codesystem-transport-intent.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-transport-intent.json rename to crates/fhir/tests/data/json/R5/codesystem-transport-intent.json diff --git a/crates/fhir/tests/data/R5/codesystem-transport-status-reason.json b/crates/fhir/tests/data/json/R5/codesystem-transport-status-reason.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-transport-status-reason.json rename to crates/fhir/tests/data/json/R5/codesystem-transport-status-reason.json diff --git a/crates/fhir/tests/data/R5/codesystem-transport-status.json b/crates/fhir/tests/data/json/R5/codesystem-transport-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-transport-status.json rename to crates/fhir/tests/data/json/R5/codesystem-transport-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-trigger-type.json b/crates/fhir/tests/data/json/R5/codesystem-trigger-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-trigger-type.json rename to crates/fhir/tests/data/json/R5/codesystem-trigger-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-type-derivation-rule.json b/crates/fhir/tests/data/json/R5/codesystem-type-derivation-rule.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-type-derivation-rule.json rename to crates/fhir/tests/data/json/R5/codesystem-type-derivation-rule.json diff --git a/crates/fhir/tests/data/R5/codesystem-udi-entry-type.json b/crates/fhir/tests/data/json/R5/codesystem-udi-entry-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-udi-entry-type.json rename to crates/fhir/tests/data/json/R5/codesystem-udi-entry-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-undesirable-effect-frequency.json b/crates/fhir/tests/data/json/R5/codesystem-undesirable-effect-frequency.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-undesirable-effect-frequency.json rename to crates/fhir/tests/data/json/R5/codesystem-undesirable-effect-frequency.json diff --git a/crates/fhir/tests/data/R5/codesystem-unit-of-presentation.json b/crates/fhir/tests/data/json/R5/codesystem-unit-of-presentation.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-unit-of-presentation.json rename to crates/fhir/tests/data/json/R5/codesystem-unit-of-presentation.json diff --git a/crates/fhir/tests/data/R5/codesystem-usage-context-agreement-scope.json b/crates/fhir/tests/data/json/R5/codesystem-usage-context-agreement-scope.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-usage-context-agreement-scope.json rename to crates/fhir/tests/data/json/R5/codesystem-usage-context-agreement-scope.json diff --git a/crates/fhir/tests/data/R5/codesystem-variable-handling.json b/crates/fhir/tests/data/json/R5/codesystem-variable-handling.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-variable-handling.json rename to crates/fhir/tests/data/json/R5/codesystem-variable-handling.json diff --git a/crates/fhir/tests/data/R5/codesystem-verificationresult-status.json b/crates/fhir/tests/data/json/R5/codesystem-verificationresult-status.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-verificationresult-status.json rename to crates/fhir/tests/data/json/R5/codesystem-verificationresult-status.json diff --git a/crates/fhir/tests/data/R5/codesystem-version-algorithm.json b/crates/fhir/tests/data/json/R5/codesystem-version-algorithm.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-version-algorithm.json rename to crates/fhir/tests/data/json/R5/codesystem-version-algorithm.json diff --git a/crates/fhir/tests/data/R5/codesystem-versioning-policy.json b/crates/fhir/tests/data/json/R5/codesystem-versioning-policy.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-versioning-policy.json rename to crates/fhir/tests/data/json/R5/codesystem-versioning-policy.json diff --git a/crates/fhir/tests/data/R5/codesystem-virtual-service-type.json b/crates/fhir/tests/data/json/R5/codesystem-virtual-service-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-virtual-service-type.json rename to crates/fhir/tests/data/json/R5/codesystem-virtual-service-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-vision-base-codes.json b/crates/fhir/tests/data/json/R5/codesystem-vision-base-codes.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-vision-base-codes.json rename to crates/fhir/tests/data/json/R5/codesystem-vision-base-codes.json diff --git a/crates/fhir/tests/data/R5/codesystem-vision-eye-codes.json b/crates/fhir/tests/data/json/R5/codesystem-vision-eye-codes.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-vision-eye-codes.json rename to crates/fhir/tests/data/json/R5/codesystem-vision-eye-codes.json diff --git a/crates/fhir/tests/data/R5/codesystem-w3c-provenance-activity-type.json b/crates/fhir/tests/data/json/R5/codesystem-w3c-provenance-activity-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-w3c-provenance-activity-type.json rename to crates/fhir/tests/data/json/R5/codesystem-w3c-provenance-activity-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-warning-type.json b/crates/fhir/tests/data/json/R5/codesystem-warning-type.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-warning-type.json rename to crates/fhir/tests/data/json/R5/codesystem-warning-type.json diff --git a/crates/fhir/tests/data/R5/codesystem-week-of-month.json b/crates/fhir/tests/data/json/R5/codesystem-week-of-month.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem-week-of-month.json rename to crates/fhir/tests/data/json/R5/codesystem-week-of-month.json diff --git a/crates/fhir/tests/data/R5/codesystem.profile.json b/crates/fhir/tests/data/json/R5/codesystem.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/codesystem.profile.json rename to crates/fhir/tests/data/json/R5/codesystem.profile.json diff --git a/crates/fhir/tests/data/R5/coding.profile.json b/crates/fhir/tests/data/json/R5/coding.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/coding.profile.json rename to crates/fhir/tests/data/json/R5/coding.profile.json diff --git a/crates/fhir/tests/data/R5/communication-example-fm-attachment.json b/crates/fhir/tests/data/json/R5/communication-example-fm-attachment.json similarity index 100% rename from crates/fhir/tests/data/R5/communication-example-fm-attachment.json rename to crates/fhir/tests/data/json/R5/communication-example-fm-attachment.json diff --git a/crates/fhir/tests/data/R5/communication-example-fm-solicited-attachment.json b/crates/fhir/tests/data/json/R5/communication-example-fm-solicited-attachment.json similarity index 100% rename from crates/fhir/tests/data/R5/communication-example-fm-solicited-attachment.json rename to crates/fhir/tests/data/json/R5/communication-example-fm-solicited-attachment.json diff --git a/crates/fhir/tests/data/R5/communication-example.json b/crates/fhir/tests/data/json/R5/communication-example.json similarity index 100% rename from crates/fhir/tests/data/R5/communication-example.json rename to crates/fhir/tests/data/json/R5/communication-example.json diff --git a/crates/fhir/tests/data/R5/communication-questionnaire.json b/crates/fhir/tests/data/json/R5/communication-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/communication-questionnaire.json rename to crates/fhir/tests/data/json/R5/communication-questionnaire.json diff --git a/crates/fhir/tests/data/R5/communication.profile.json b/crates/fhir/tests/data/json/R5/communication.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/communication.profile.json rename to crates/fhir/tests/data/json/R5/communication.profile.json diff --git a/crates/fhir/tests/data/R5/communicationrequest-example-fm-solicit-attachment.json b/crates/fhir/tests/data/json/R5/communicationrequest-example-fm-solicit-attachment.json similarity index 100% rename from crates/fhir/tests/data/R5/communicationrequest-example-fm-solicit-attachment.json rename to crates/fhir/tests/data/json/R5/communicationrequest-example-fm-solicit-attachment.json diff --git a/crates/fhir/tests/data/R5/communicationrequest-example.json b/crates/fhir/tests/data/json/R5/communicationrequest-example.json similarity index 100% rename from crates/fhir/tests/data/R5/communicationrequest-example.json rename to crates/fhir/tests/data/json/R5/communicationrequest-example.json diff --git a/crates/fhir/tests/data/R5/communicationrequest-questionnaire.json b/crates/fhir/tests/data/json/R5/communicationrequest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/communicationrequest-questionnaire.json rename to crates/fhir/tests/data/json/R5/communicationrequest-questionnaire.json diff --git a/crates/fhir/tests/data/R5/communicationrequest.profile.json b/crates/fhir/tests/data/json/R5/communicationrequest.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/communicationrequest.profile.json rename to crates/fhir/tests/data/json/R5/communicationrequest.profile.json diff --git a/crates/fhir/tests/data/R5/compartmentdefinition-device.json b/crates/fhir/tests/data/json/R5/compartmentdefinition-device.json similarity index 100% rename from crates/fhir/tests/data/R5/compartmentdefinition-device.json rename to crates/fhir/tests/data/json/R5/compartmentdefinition-device.json diff --git a/crates/fhir/tests/data/R5/compartmentdefinition-encounter.json b/crates/fhir/tests/data/json/R5/compartmentdefinition-encounter.json similarity index 100% rename from crates/fhir/tests/data/R5/compartmentdefinition-encounter.json rename to crates/fhir/tests/data/json/R5/compartmentdefinition-encounter.json diff --git a/crates/fhir/tests/data/R5/compartmentdefinition-example.json b/crates/fhir/tests/data/json/R5/compartmentdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R5/compartmentdefinition-example.json rename to crates/fhir/tests/data/json/R5/compartmentdefinition-example.json diff --git a/crates/fhir/tests/data/R5/compartmentdefinition-patient.json b/crates/fhir/tests/data/json/R5/compartmentdefinition-patient.json similarity index 100% rename from crates/fhir/tests/data/R5/compartmentdefinition-patient.json rename to crates/fhir/tests/data/json/R5/compartmentdefinition-patient.json diff --git a/crates/fhir/tests/data/R5/compartmentdefinition-practitioner.json b/crates/fhir/tests/data/json/R5/compartmentdefinition-practitioner.json similarity index 100% rename from crates/fhir/tests/data/R5/compartmentdefinition-practitioner.json rename to crates/fhir/tests/data/json/R5/compartmentdefinition-practitioner.json diff --git a/crates/fhir/tests/data/R5/compartmentdefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/compartmentdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/compartmentdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/compartmentdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/compartmentdefinition-relatedperson.json b/crates/fhir/tests/data/json/R5/compartmentdefinition-relatedperson.json similarity index 100% rename from crates/fhir/tests/data/R5/compartmentdefinition-relatedperson.json rename to crates/fhir/tests/data/json/R5/compartmentdefinition-relatedperson.json diff --git a/crates/fhir/tests/data/R5/compartmentdefinition.profile.json b/crates/fhir/tests/data/json/R5/compartmentdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/compartmentdefinition.profile.json rename to crates/fhir/tests/data/json/R5/compartmentdefinition.profile.json diff --git a/crates/fhir/tests/data/R5/composition-example-mixed.json b/crates/fhir/tests/data/json/R5/composition-example-mixed.json similarity index 100% rename from crates/fhir/tests/data/R5/composition-example-mixed.json rename to crates/fhir/tests/data/json/R5/composition-example-mixed.json diff --git a/crates/fhir/tests/data/R5/composition-example.json b/crates/fhir/tests/data/json/R5/composition-example.json similarity index 100% rename from crates/fhir/tests/data/R5/composition-example.json rename to crates/fhir/tests/data/json/R5/composition-example.json diff --git a/crates/fhir/tests/data/R5/composition-questionnaire.json b/crates/fhir/tests/data/json/R5/composition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/composition-questionnaire.json rename to crates/fhir/tests/data/json/R5/composition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/composition.profile.json b/crates/fhir/tests/data/json/R5/composition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/composition.profile.json rename to crates/fhir/tests/data/json/R5/composition.profile.json diff --git a/crates/fhir/tests/data/R5/computableplandefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/computableplandefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/computableplandefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/computableplandefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/computableplandefinition.profile.json b/crates/fhir/tests/data/json/R5/computableplandefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/computableplandefinition.profile.json rename to crates/fhir/tests/data/json/R5/computableplandefinition.profile.json diff --git a/crates/fhir/tests/data/R5/computablevalueset-questionnaire.json b/crates/fhir/tests/data/json/R5/computablevalueset-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/computablevalueset-questionnaire.json rename to crates/fhir/tests/data/json/R5/computablevalueset-questionnaire.json diff --git a/crates/fhir/tests/data/R5/computablevalueset.profile.json b/crates/fhir/tests/data/json/R5/computablevalueset.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/computablevalueset.profile.json rename to crates/fhir/tests/data/json/R5/computablevalueset.profile.json diff --git a/crates/fhir/tests/data/R5/conceptmap-103.json b/crates/fhir/tests/data/json/R5/conceptmap-103.json similarity index 100% rename from crates/fhir/tests/data/R5/conceptmap-103.json rename to crates/fhir/tests/data/json/R5/conceptmap-103.json diff --git a/crates/fhir/tests/data/R5/conceptmap-cdshooks-indicator.json b/crates/fhir/tests/data/json/R5/conceptmap-cdshooks-indicator.json similarity index 100% rename from crates/fhir/tests/data/R5/conceptmap-cdshooks-indicator.json rename to crates/fhir/tests/data/json/R5/conceptmap-cdshooks-indicator.json diff --git a/crates/fhir/tests/data/R5/conceptmap-example-2.json b/crates/fhir/tests/data/json/R5/conceptmap-example-2.json similarity index 100% rename from crates/fhir/tests/data/R5/conceptmap-example-2.json rename to crates/fhir/tests/data/json/R5/conceptmap-example-2.json diff --git a/crates/fhir/tests/data/R5/conceptmap-example-metadata-2.json b/crates/fhir/tests/data/json/R5/conceptmap-example-metadata-2.json similarity index 100% rename from crates/fhir/tests/data/R5/conceptmap-example-metadata-2.json rename to crates/fhir/tests/data/json/R5/conceptmap-example-metadata-2.json diff --git a/crates/fhir/tests/data/R5/conceptmap-example-metadata.json b/crates/fhir/tests/data/json/R5/conceptmap-example-metadata.json similarity index 100% rename from crates/fhir/tests/data/R5/conceptmap-example-metadata.json rename to crates/fhir/tests/data/json/R5/conceptmap-example-metadata.json diff --git a/crates/fhir/tests/data/R5/conceptmap-example-priority.json b/crates/fhir/tests/data/json/R5/conceptmap-example-priority.json similarity index 100% rename from crates/fhir/tests/data/R5/conceptmap-example-priority.json rename to crates/fhir/tests/data/json/R5/conceptmap-example-priority.json diff --git a/crates/fhir/tests/data/R5/conceptmap-example-specimen-type.json b/crates/fhir/tests/data/json/R5/conceptmap-example-specimen-type.json similarity index 100% rename from crates/fhir/tests/data/R5/conceptmap-example-specimen-type.json rename to crates/fhir/tests/data/json/R5/conceptmap-example-specimen-type.json diff --git a/crates/fhir/tests/data/R5/conceptmap-example.json b/crates/fhir/tests/data/json/R5/conceptmap-example.json similarity index 100% rename from crates/fhir/tests/data/R5/conceptmap-example.json rename to crates/fhir/tests/data/json/R5/conceptmap-example.json diff --git a/crates/fhir/tests/data/R5/conceptmap-message-adt-a04-to-bundle.json b/crates/fhir/tests/data/json/R5/conceptmap-message-adt-a04-to-bundle.json similarity index 100% rename from crates/fhir/tests/data/R5/conceptmap-message-adt-a04-to-bundle.json rename to crates/fhir/tests/data/json/R5/conceptmap-message-adt-a04-to-bundle.json diff --git a/crates/fhir/tests/data/R5/conceptmap-questionnaire.json b/crates/fhir/tests/data/json/R5/conceptmap-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/conceptmap-questionnaire.json rename to crates/fhir/tests/data/json/R5/conceptmap-questionnaire.json diff --git a/crates/fhir/tests/data/R5/conceptmap.profile.json b/crates/fhir/tests/data/json/R5/conceptmap.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/conceptmap.profile.json rename to crates/fhir/tests/data/json/R5/conceptmap.profile.json diff --git a/crates/fhir/tests/data/R5/conceptmaps.json b/crates/fhir/tests/data/json/R5/conceptmaps.json similarity index 100% rename from crates/fhir/tests/data/R5/conceptmaps.json rename to crates/fhir/tests/data/json/R5/conceptmaps.json diff --git a/crates/fhir/tests/data/R5/condition-example-f001-heart.json b/crates/fhir/tests/data/json/R5/condition-example-f001-heart.json similarity index 100% rename from crates/fhir/tests/data/R5/condition-example-f001-heart.json rename to crates/fhir/tests/data/json/R5/condition-example-f001-heart.json diff --git a/crates/fhir/tests/data/R5/condition-example-f002-lung.json b/crates/fhir/tests/data/json/R5/condition-example-f002-lung.json similarity index 100% rename from crates/fhir/tests/data/R5/condition-example-f002-lung.json rename to crates/fhir/tests/data/json/R5/condition-example-f002-lung.json diff --git a/crates/fhir/tests/data/R5/condition-example-f003-abscess.json b/crates/fhir/tests/data/json/R5/condition-example-f003-abscess.json similarity index 100% rename from crates/fhir/tests/data/R5/condition-example-f003-abscess.json rename to crates/fhir/tests/data/json/R5/condition-example-f003-abscess.json diff --git a/crates/fhir/tests/data/R5/condition-example-f201-fever.json b/crates/fhir/tests/data/json/R5/condition-example-f201-fever.json similarity index 100% rename from crates/fhir/tests/data/R5/condition-example-f201-fever.json rename to crates/fhir/tests/data/json/R5/condition-example-f201-fever.json diff --git a/crates/fhir/tests/data/R5/condition-example-f202-malignancy.json b/crates/fhir/tests/data/json/R5/condition-example-f202-malignancy.json similarity index 100% rename from crates/fhir/tests/data/R5/condition-example-f202-malignancy.json rename to crates/fhir/tests/data/json/R5/condition-example-f202-malignancy.json diff --git a/crates/fhir/tests/data/R5/condition-example-f203-sepsis.json b/crates/fhir/tests/data/json/R5/condition-example-f203-sepsis.json similarity index 100% rename from crates/fhir/tests/data/R5/condition-example-f203-sepsis.json rename to crates/fhir/tests/data/json/R5/condition-example-f203-sepsis.json diff --git a/crates/fhir/tests/data/R5/condition-example-f204-renal.json b/crates/fhir/tests/data/json/R5/condition-example-f204-renal.json similarity index 100% rename from crates/fhir/tests/data/R5/condition-example-f204-renal.json rename to crates/fhir/tests/data/json/R5/condition-example-f204-renal.json diff --git a/crates/fhir/tests/data/R5/condition-example-f205-infection.json b/crates/fhir/tests/data/json/R5/condition-example-f205-infection.json similarity index 100% rename from crates/fhir/tests/data/R5/condition-example-f205-infection.json rename to crates/fhir/tests/data/json/R5/condition-example-f205-infection.json diff --git a/crates/fhir/tests/data/R5/condition-example-family-history.json b/crates/fhir/tests/data/json/R5/condition-example-family-history.json similarity index 100% rename from crates/fhir/tests/data/R5/condition-example-family-history.json rename to crates/fhir/tests/data/json/R5/condition-example-family-history.json diff --git a/crates/fhir/tests/data/R5/condition-example-linkage.json b/crates/fhir/tests/data/json/R5/condition-example-linkage.json similarity index 100% rename from crates/fhir/tests/data/R5/condition-example-linkage.json rename to crates/fhir/tests/data/json/R5/condition-example-linkage.json diff --git a/crates/fhir/tests/data/R5/condition-example-stroke.json b/crates/fhir/tests/data/json/R5/condition-example-stroke.json similarity index 100% rename from crates/fhir/tests/data/R5/condition-example-stroke.json rename to crates/fhir/tests/data/json/R5/condition-example-stroke.json diff --git a/crates/fhir/tests/data/R5/condition-example.json b/crates/fhir/tests/data/json/R5/condition-example.json similarity index 100% rename from crates/fhir/tests/data/R5/condition-example.json rename to crates/fhir/tests/data/json/R5/condition-example.json diff --git a/crates/fhir/tests/data/R5/condition-example2.json b/crates/fhir/tests/data/json/R5/condition-example2.json similarity index 100% rename from crates/fhir/tests/data/R5/condition-example2.json rename to crates/fhir/tests/data/json/R5/condition-example2.json diff --git a/crates/fhir/tests/data/R5/condition-questionnaire.json b/crates/fhir/tests/data/json/R5/condition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/condition-questionnaire.json rename to crates/fhir/tests/data/json/R5/condition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/condition.profile.json b/crates/fhir/tests/data/json/R5/condition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/condition.profile.json rename to crates/fhir/tests/data/json/R5/condition.profile.json diff --git a/crates/fhir/tests/data/R5/conditiondefinition-example.json b/crates/fhir/tests/data/json/R5/conditiondefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R5/conditiondefinition-example.json rename to crates/fhir/tests/data/json/R5/conditiondefinition-example.json diff --git a/crates/fhir/tests/data/R5/conditiondefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/conditiondefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/conditiondefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/conditiondefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/conditiondefinition.profile.json b/crates/fhir/tests/data/json/R5/conditiondefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/conditiondefinition.profile.json rename to crates/fhir/tests/data/json/R5/conditiondefinition.profile.json diff --git a/crates/fhir/tests/data/R5/consent-example-CDA.json b/crates/fhir/tests/data/json/R5/consent-example-CDA.json similarity index 100% rename from crates/fhir/tests/data/R5/consent-example-CDA.json rename to crates/fhir/tests/data/json/R5/consent-example-CDA.json diff --git a/crates/fhir/tests/data/R5/consent-example-Emergency.json b/crates/fhir/tests/data/json/R5/consent-example-Emergency.json similarity index 100% rename from crates/fhir/tests/data/R5/consent-example-Emergency.json rename to crates/fhir/tests/data/json/R5/consent-example-Emergency.json diff --git a/crates/fhir/tests/data/R5/consent-example-Out.json b/crates/fhir/tests/data/json/R5/consent-example-Out.json similarity index 100% rename from crates/fhir/tests/data/R5/consent-example-Out.json rename to crates/fhir/tests/data/json/R5/consent-example-Out.json diff --git a/crates/fhir/tests/data/R5/consent-example-grantor.json b/crates/fhir/tests/data/json/R5/consent-example-grantor.json similarity index 100% rename from crates/fhir/tests/data/R5/consent-example-grantor.json rename to crates/fhir/tests/data/json/R5/consent-example-grantor.json diff --git a/crates/fhir/tests/data/R5/consent-example-notAuthor.json b/crates/fhir/tests/data/json/R5/consent-example-notAuthor.json similarity index 100% rename from crates/fhir/tests/data/R5/consent-example-notAuthor.json rename to crates/fhir/tests/data/json/R5/consent-example-notAuthor.json diff --git a/crates/fhir/tests/data/R5/consent-example-notOrg.json b/crates/fhir/tests/data/json/R5/consent-example-notOrg.json similarity index 100% rename from crates/fhir/tests/data/R5/consent-example-notOrg.json rename to crates/fhir/tests/data/json/R5/consent-example-notOrg.json diff --git a/crates/fhir/tests/data/R5/consent-example-notThem.json b/crates/fhir/tests/data/json/R5/consent-example-notThem.json similarity index 100% rename from crates/fhir/tests/data/R5/consent-example-notThem.json rename to crates/fhir/tests/data/json/R5/consent-example-notThem.json diff --git a/crates/fhir/tests/data/R5/consent-example-notThis.json b/crates/fhir/tests/data/json/R5/consent-example-notThis.json similarity index 100% rename from crates/fhir/tests/data/R5/consent-example-notThis.json rename to crates/fhir/tests/data/json/R5/consent-example-notThis.json diff --git a/crates/fhir/tests/data/R5/consent-example-notTime.json b/crates/fhir/tests/data/json/R5/consent-example-notTime.json similarity index 100% rename from crates/fhir/tests/data/R5/consent-example-notTime.json rename to crates/fhir/tests/data/json/R5/consent-example-notTime.json diff --git a/crates/fhir/tests/data/R5/consent-example-pkb.json b/crates/fhir/tests/data/json/R5/consent-example-pkb.json similarity index 100% rename from crates/fhir/tests/data/R5/consent-example-pkb.json rename to crates/fhir/tests/data/json/R5/consent-example-pkb.json diff --git a/crates/fhir/tests/data/R5/consent-example-smartonfhir.json b/crates/fhir/tests/data/json/R5/consent-example-smartonfhir.json similarity index 100% rename from crates/fhir/tests/data/R5/consent-example-smartonfhir.json rename to crates/fhir/tests/data/json/R5/consent-example-smartonfhir.json diff --git a/crates/fhir/tests/data/R5/consent-example.json b/crates/fhir/tests/data/json/R5/consent-example.json similarity index 100% rename from crates/fhir/tests/data/R5/consent-example.json rename to crates/fhir/tests/data/json/R5/consent-example.json diff --git a/crates/fhir/tests/data/R5/consent-questionnaire.json b/crates/fhir/tests/data/json/R5/consent-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/consent-questionnaire.json rename to crates/fhir/tests/data/json/R5/consent-questionnaire.json diff --git a/crates/fhir/tests/data/R5/consent.profile.json b/crates/fhir/tests/data/json/R5/consent.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/consent.profile.json rename to crates/fhir/tests/data/json/R5/consent.profile.json diff --git a/crates/fhir/tests/data/R5/contactdetail.profile.json b/crates/fhir/tests/data/json/R5/contactdetail.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/contactdetail.profile.json rename to crates/fhir/tests/data/json/R5/contactdetail.profile.json diff --git a/crates/fhir/tests/data/R5/contactpoint.profile.json b/crates/fhir/tests/data/json/R5/contactpoint.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/contactpoint.profile.json rename to crates/fhir/tests/data/json/R5/contactpoint.profile.json diff --git a/crates/fhir/tests/data/R5/contract-example-42cfr-part2.json b/crates/fhir/tests/data/json/R5/contract-example-42cfr-part2.json similarity index 100% rename from crates/fhir/tests/data/R5/contract-example-42cfr-part2.json rename to crates/fhir/tests/data/json/R5/contract-example-42cfr-part2.json diff --git a/crates/fhir/tests/data/R5/contract-example-ins-policy.json b/crates/fhir/tests/data/json/R5/contract-example-ins-policy.json similarity index 100% rename from crates/fhir/tests/data/R5/contract-example-ins-policy.json rename to crates/fhir/tests/data/json/R5/contract-example-ins-policy.json diff --git a/crates/fhir/tests/data/R5/contract-example.json b/crates/fhir/tests/data/json/R5/contract-example.json similarity index 100% rename from crates/fhir/tests/data/R5/contract-example.json rename to crates/fhir/tests/data/json/R5/contract-example.json diff --git a/crates/fhir/tests/data/R5/contract-questionnaire.json b/crates/fhir/tests/data/json/R5/contract-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/contract-questionnaire.json rename to crates/fhir/tests/data/json/R5/contract-questionnaire.json diff --git a/crates/fhir/tests/data/R5/contract.profile.json b/crates/fhir/tests/data/json/R5/contract.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/contract.profile.json rename to crates/fhir/tests/data/json/R5/contract.profile.json diff --git a/crates/fhir/tests/data/R5/contributor.profile.json b/crates/fhir/tests/data/json/R5/contributor.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/contributor.profile.json rename to crates/fhir/tests/data/json/R5/contributor.profile.json diff --git a/crates/fhir/tests/data/R5/coord-0base-example.json b/crates/fhir/tests/data/json/R5/coord-0base-example.json similarity index 100% rename from crates/fhir/tests/data/R5/coord-0base-example.json rename to crates/fhir/tests/data/json/R5/coord-0base-example.json diff --git a/crates/fhir/tests/data/R5/coord-1base-example.json b/crates/fhir/tests/data/json/R5/coord-1base-example.json similarity index 100% rename from crates/fhir/tests/data/R5/coord-1base-example.json rename to crates/fhir/tests/data/json/R5/coord-1base-example.json diff --git a/crates/fhir/tests/data/R5/count.profile.json b/crates/fhir/tests/data/json/R5/count.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/count.profile.json rename to crates/fhir/tests/data/json/R5/count.profile.json diff --git a/crates/fhir/tests/data/R5/coverage-example-2.json b/crates/fhir/tests/data/json/R5/coverage-example-2.json similarity index 100% rename from crates/fhir/tests/data/R5/coverage-example-2.json rename to crates/fhir/tests/data/json/R5/coverage-example-2.json diff --git a/crates/fhir/tests/data/R5/coverage-example-ehic.json b/crates/fhir/tests/data/json/R5/coverage-example-ehic.json similarity index 100% rename from crates/fhir/tests/data/R5/coverage-example-ehic.json rename to crates/fhir/tests/data/json/R5/coverage-example-ehic.json diff --git a/crates/fhir/tests/data/R5/coverage-example-selfpay.json b/crates/fhir/tests/data/json/R5/coverage-example-selfpay.json similarity index 100% rename from crates/fhir/tests/data/R5/coverage-example-selfpay.json rename to crates/fhir/tests/data/json/R5/coverage-example-selfpay.json diff --git a/crates/fhir/tests/data/R5/coverage-example.json b/crates/fhir/tests/data/json/R5/coverage-example.json similarity index 100% rename from crates/fhir/tests/data/R5/coverage-example.json rename to crates/fhir/tests/data/json/R5/coverage-example.json diff --git a/crates/fhir/tests/data/R5/coverage-questionnaire.json b/crates/fhir/tests/data/json/R5/coverage-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/coverage-questionnaire.json rename to crates/fhir/tests/data/json/R5/coverage-questionnaire.json diff --git a/crates/fhir/tests/data/R5/coverage.profile.json b/crates/fhir/tests/data/json/R5/coverage.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/coverage.profile.json rename to crates/fhir/tests/data/json/R5/coverage.profile.json diff --git a/crates/fhir/tests/data/R5/coverageeligibilityrequest-example-2.json b/crates/fhir/tests/data/json/R5/coverageeligibilityrequest-example-2.json similarity index 100% rename from crates/fhir/tests/data/R5/coverageeligibilityrequest-example-2.json rename to crates/fhir/tests/data/json/R5/coverageeligibilityrequest-example-2.json diff --git a/crates/fhir/tests/data/R5/coverageeligibilityrequest-example.json b/crates/fhir/tests/data/json/R5/coverageeligibilityrequest-example.json similarity index 100% rename from crates/fhir/tests/data/R5/coverageeligibilityrequest-example.json rename to crates/fhir/tests/data/json/R5/coverageeligibilityrequest-example.json diff --git a/crates/fhir/tests/data/R5/coverageeligibilityrequest-questionnaire.json b/crates/fhir/tests/data/json/R5/coverageeligibilityrequest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/coverageeligibilityrequest-questionnaire.json rename to crates/fhir/tests/data/json/R5/coverageeligibilityrequest-questionnaire.json diff --git a/crates/fhir/tests/data/R5/coverageeligibilityrequest.profile.json b/crates/fhir/tests/data/json/R5/coverageeligibilityrequest.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/coverageeligibilityrequest.profile.json rename to crates/fhir/tests/data/json/R5/coverageeligibilityrequest.profile.json diff --git a/crates/fhir/tests/data/R5/coverageeligibilityresponse-example-benefits-2.json b/crates/fhir/tests/data/json/R5/coverageeligibilityresponse-example-benefits-2.json similarity index 100% rename from crates/fhir/tests/data/R5/coverageeligibilityresponse-example-benefits-2.json rename to crates/fhir/tests/data/json/R5/coverageeligibilityresponse-example-benefits-2.json diff --git a/crates/fhir/tests/data/R5/coverageeligibilityresponse-example-benefits.json b/crates/fhir/tests/data/json/R5/coverageeligibilityresponse-example-benefits.json similarity index 100% rename from crates/fhir/tests/data/R5/coverageeligibilityresponse-example-benefits.json rename to crates/fhir/tests/data/json/R5/coverageeligibilityresponse-example-benefits.json diff --git a/crates/fhir/tests/data/R5/coverageeligibilityresponse-example-error.json b/crates/fhir/tests/data/json/R5/coverageeligibilityresponse-example-error.json similarity index 100% rename from crates/fhir/tests/data/R5/coverageeligibilityresponse-example-error.json rename to crates/fhir/tests/data/json/R5/coverageeligibilityresponse-example-error.json diff --git a/crates/fhir/tests/data/R5/coverageeligibilityresponse-example.json b/crates/fhir/tests/data/json/R5/coverageeligibilityresponse-example.json similarity index 100% rename from crates/fhir/tests/data/R5/coverageeligibilityresponse-example.json rename to crates/fhir/tests/data/json/R5/coverageeligibilityresponse-example.json diff --git a/crates/fhir/tests/data/R5/coverageeligibilityresponse-questionnaire.json b/crates/fhir/tests/data/json/R5/coverageeligibilityresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/coverageeligibilityresponse-questionnaire.json rename to crates/fhir/tests/data/json/R5/coverageeligibilityresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R5/coverageeligibilityresponse.profile.json b/crates/fhir/tests/data/json/R5/coverageeligibilityresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/coverageeligibilityresponse.profile.json rename to crates/fhir/tests/data/json/R5/coverageeligibilityresponse.profile.json diff --git a/crates/fhir/tests/data/R5/cqllibrary-questionnaire.json b/crates/fhir/tests/data/json/R5/cqllibrary-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/cqllibrary-questionnaire.json rename to crates/fhir/tests/data/json/R5/cqllibrary-questionnaire.json diff --git a/crates/fhir/tests/data/R5/cqllibrary.profile.json b/crates/fhir/tests/data/json/R5/cqllibrary.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/cqllibrary.profile.json rename to crates/fhir/tests/data/json/R5/cqllibrary.profile.json diff --git a/crates/fhir/tests/data/R5/dataelements.json b/crates/fhir/tests/data/json/R5/dataelements.json similarity index 100% rename from crates/fhir/tests/data/R5/dataelements.json rename to crates/fhir/tests/data/json/R5/dataelements.json diff --git a/crates/fhir/tests/data/R5/datarequirement.profile.json b/crates/fhir/tests/data/json/R5/datarequirement.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/datarequirement.profile.json rename to crates/fhir/tests/data/json/R5/datarequirement.profile.json diff --git a/crates/fhir/tests/data/R5/datatype.profile.json b/crates/fhir/tests/data/json/R5/datatype.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/datatype.profile.json rename to crates/fhir/tests/data/json/R5/datatype.profile.json diff --git a/crates/fhir/tests/data/R5/date.profile.json b/crates/fhir/tests/data/json/R5/date.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/date.profile.json rename to crates/fhir/tests/data/json/R5/date.profile.json diff --git a/crates/fhir/tests/data/R5/datetime.profile.json b/crates/fhir/tests/data/json/R5/datetime.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/datetime.profile.json rename to crates/fhir/tests/data/json/R5/datetime.profile.json diff --git a/crates/fhir/tests/data/R5/decimal.profile.json b/crates/fhir/tests/data/json/R5/decimal.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/decimal.profile.json rename to crates/fhir/tests/data/json/R5/decimal.profile.json diff --git a/crates/fhir/tests/data/R5/definition.json b/crates/fhir/tests/data/json/R5/definition.json similarity index 100% rename from crates/fhir/tests/data/R5/definition.json rename to crates/fhir/tests/data/json/R5/definition.json diff --git a/crates/fhir/tests/data/R5/detectedissue-example-allergy.json b/crates/fhir/tests/data/json/R5/detectedissue-example-allergy.json similarity index 100% rename from crates/fhir/tests/data/R5/detectedissue-example-allergy.json rename to crates/fhir/tests/data/json/R5/detectedissue-example-allergy.json diff --git a/crates/fhir/tests/data/R5/detectedissue-example-dup.json b/crates/fhir/tests/data/json/R5/detectedissue-example-dup.json similarity index 100% rename from crates/fhir/tests/data/R5/detectedissue-example-dup.json rename to crates/fhir/tests/data/json/R5/detectedissue-example-dup.json diff --git a/crates/fhir/tests/data/R5/detectedissue-example-lab.json b/crates/fhir/tests/data/json/R5/detectedissue-example-lab.json similarity index 100% rename from crates/fhir/tests/data/R5/detectedissue-example-lab.json rename to crates/fhir/tests/data/json/R5/detectedissue-example-lab.json diff --git a/crates/fhir/tests/data/R5/detectedissue-example.json b/crates/fhir/tests/data/json/R5/detectedissue-example.json similarity index 100% rename from crates/fhir/tests/data/R5/detectedissue-example.json rename to crates/fhir/tests/data/json/R5/detectedissue-example.json diff --git a/crates/fhir/tests/data/R5/detectedissue-questionnaire.json b/crates/fhir/tests/data/json/R5/detectedissue-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/detectedissue-questionnaire.json rename to crates/fhir/tests/data/json/R5/detectedissue-questionnaire.json diff --git a/crates/fhir/tests/data/R5/detectedissue.profile.json b/crates/fhir/tests/data/json/R5/detectedissue.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/detectedissue.profile.json rename to crates/fhir/tests/data/json/R5/detectedissue.profile.json diff --git a/crates/fhir/tests/data/R5/device-example-AND20601BPMonitor.json b/crates/fhir/tests/data/json/R5/device-example-AND20601BPMonitor.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-AND20601BPMonitor.json rename to crates/fhir/tests/data/json/R5/device-example-AND20601BPMonitor.json diff --git a/crates/fhir/tests/data/R5/device-example-ANDThermometer.json b/crates/fhir/tests/data/json/R5/device-example-ANDThermometer.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-ANDThermometer.json rename to crates/fhir/tests/data/json/R5/device-example-ANDThermometer.json diff --git a/crates/fhir/tests/data/R5/device-example-AndroidGatewayPHG.json b/crates/fhir/tests/data/json/R5/device-example-AndroidGatewayPHG.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-AndroidGatewayPHG.json rename to crates/fhir/tests/data/json/R5/device-example-AndroidGatewayPHG.json diff --git a/crates/fhir/tests/data/R5/device-example-Bodimetrics.json b/crates/fhir/tests/data/json/R5/device-example-Bodimetrics.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-Bodimetrics.json rename to crates/fhir/tests/data/json/R5/device-example-Bodimetrics.json diff --git a/crates/fhir/tests/data/R5/device-example-KinsaThermometer.json b/crates/fhir/tests/data/json/R5/device-example-KinsaThermometer.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-KinsaThermometer.json rename to crates/fhir/tests/data/json/R5/device-example-KinsaThermometer.json diff --git a/crates/fhir/tests/data/R5/device-example-Nonin20601PulseOx.json b/crates/fhir/tests/data/json/R5/device-example-Nonin20601PulseOx.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-Nonin20601PulseOx.json rename to crates/fhir/tests/data/json/R5/device-example-Nonin20601PulseOx.json diff --git a/crates/fhir/tests/data/R5/device-example-NoninBlePulseOx.json b/crates/fhir/tests/data/json/R5/device-example-NoninBlePulseOx.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-NoninBlePulseOx.json rename to crates/fhir/tests/data/json/R5/device-example-NoninBlePulseOx.json diff --git a/crates/fhir/tests/data/R5/device-example-PhilipsThermometer.json b/crates/fhir/tests/data/json/R5/device-example-PhilipsThermometer.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-PhilipsThermometer.json rename to crates/fhir/tests/data/json/R5/device-example-PhilipsThermometer.json diff --git a/crates/fhir/tests/data/R5/device-example-RocheGlucoseMonitor.json b/crates/fhir/tests/data/json/R5/device-example-RocheGlucoseMonitor.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-RocheGlucoseMonitor.json rename to crates/fhir/tests/data/json/R5/device-example-RocheGlucoseMonitor.json diff --git a/crates/fhir/tests/data/R5/device-example-f001-feedingtube.json b/crates/fhir/tests/data/json/R5/device-example-f001-feedingtube.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-f001-feedingtube.json rename to crates/fhir/tests/data/json/R5/device-example-f001-feedingtube.json diff --git a/crates/fhir/tests/data/R5/device-example-ihe-pcd.json b/crates/fhir/tests/data/json/R5/device-example-ihe-pcd.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-ihe-pcd.json rename to crates/fhir/tests/data/json/R5/device-example-ihe-pcd.json diff --git a/crates/fhir/tests/data/R5/device-example-pacemaker.json b/crates/fhir/tests/data/json/R5/device-example-pacemaker.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-pacemaker.json rename to crates/fhir/tests/data/json/R5/device-example-pacemaker.json diff --git a/crates/fhir/tests/data/R5/device-example-software.json b/crates/fhir/tests/data/json/R5/device-example-software.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-software.json rename to crates/fhir/tests/data/json/R5/device-example-software.json diff --git a/crates/fhir/tests/data/R5/device-example-specimen-container-example-sst-vacutainer.json b/crates/fhir/tests/data/json/R5/device-example-specimen-container-example-sst-vacutainer.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-specimen-container-example-sst-vacutainer.json rename to crates/fhir/tests/data/json/R5/device-example-specimen-container-example-sst-vacutainer.json diff --git a/crates/fhir/tests/data/R5/device-example-specimen-container-green-gel-vacutainer.json b/crates/fhir/tests/data/json/R5/device-example-specimen-container-green-gel-vacutainer.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-specimen-container-green-gel-vacutainer.json rename to crates/fhir/tests/data/json/R5/device-example-specimen-container-green-gel-vacutainer.json diff --git a/crates/fhir/tests/data/R5/device-example-specimen-container-lavender-vacutainer.json b/crates/fhir/tests/data/json/R5/device-example-specimen-container-lavender-vacutainer.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-specimen-container-lavender-vacutainer.json rename to crates/fhir/tests/data/json/R5/device-example-specimen-container-lavender-vacutainer.json diff --git a/crates/fhir/tests/data/R5/device-example-specimen-container-polycup.json b/crates/fhir/tests/data/json/R5/device-example-specimen-container-polycup.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-specimen-container-polycup.json rename to crates/fhir/tests/data/json/R5/device-example-specimen-container-polycup.json diff --git a/crates/fhir/tests/data/R5/device-example-specimen-container-red-top-vacutainer.json b/crates/fhir/tests/data/json/R5/device-example-specimen-container-red-top-vacutainer.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-specimen-container-red-top-vacutainer.json rename to crates/fhir/tests/data/json/R5/device-example-specimen-container-red-top-vacutainer.json diff --git a/crates/fhir/tests/data/R5/device-example-udi1.json b/crates/fhir/tests/data/json/R5/device-example-udi1.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-udi1.json rename to crates/fhir/tests/data/json/R5/device-example-udi1.json diff --git a/crates/fhir/tests/data/R5/device-example-udi2.json b/crates/fhir/tests/data/json/R5/device-example-udi2.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-udi2.json rename to crates/fhir/tests/data/json/R5/device-example-udi2.json diff --git a/crates/fhir/tests/data/R5/device-example-udi3.json b/crates/fhir/tests/data/json/R5/device-example-udi3.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-udi3.json rename to crates/fhir/tests/data/json/R5/device-example-udi3.json diff --git a/crates/fhir/tests/data/R5/device-example-udi4.json b/crates/fhir/tests/data/json/R5/device-example-udi4.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example-udi4.json rename to crates/fhir/tests/data/json/R5/device-example-udi4.json diff --git a/crates/fhir/tests/data/R5/device-example.json b/crates/fhir/tests/data/json/R5/device-example.json similarity index 100% rename from crates/fhir/tests/data/R5/device-example.json rename to crates/fhir/tests/data/json/R5/device-example.json diff --git a/crates/fhir/tests/data/R5/device-questionnaire.json b/crates/fhir/tests/data/json/R5/device-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/device-questionnaire.json rename to crates/fhir/tests/data/json/R5/device-questionnaire.json diff --git a/crates/fhir/tests/data/R5/device.profile.json b/crates/fhir/tests/data/json/R5/device.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/device.profile.json rename to crates/fhir/tests/data/json/R5/device.profile.json diff --git a/crates/fhir/tests/data/R5/deviceassociation-example.json b/crates/fhir/tests/data/json/R5/deviceassociation-example.json similarity index 100% rename from crates/fhir/tests/data/R5/deviceassociation-example.json rename to crates/fhir/tests/data/json/R5/deviceassociation-example.json diff --git a/crates/fhir/tests/data/R5/deviceassociation-questionnaire.json b/crates/fhir/tests/data/json/R5/deviceassociation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/deviceassociation-questionnaire.json rename to crates/fhir/tests/data/json/R5/deviceassociation-questionnaire.json diff --git a/crates/fhir/tests/data/R5/deviceassociation.profile.json b/crates/fhir/tests/data/json/R5/deviceassociation.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/deviceassociation.profile.json rename to crates/fhir/tests/data/json/R5/deviceassociation.profile.json diff --git a/crates/fhir/tests/data/R5/devicedefinition-example.json b/crates/fhir/tests/data/json/R5/devicedefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R5/devicedefinition-example.json rename to crates/fhir/tests/data/json/R5/devicedefinition-example.json diff --git a/crates/fhir/tests/data/R5/devicedefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/devicedefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/devicedefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/devicedefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/devicedefinition.profile.json b/crates/fhir/tests/data/json/R5/devicedefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/devicedefinition.profile.json rename to crates/fhir/tests/data/json/R5/devicedefinition.profile.json diff --git a/crates/fhir/tests/data/R5/devicedispense-example.json b/crates/fhir/tests/data/json/R5/devicedispense-example.json similarity index 100% rename from crates/fhir/tests/data/R5/devicedispense-example.json rename to crates/fhir/tests/data/json/R5/devicedispense-example.json diff --git a/crates/fhir/tests/data/R5/devicedispense-questionnaire.json b/crates/fhir/tests/data/json/R5/devicedispense-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/devicedispense-questionnaire.json rename to crates/fhir/tests/data/json/R5/devicedispense-questionnaire.json diff --git a/crates/fhir/tests/data/R5/devicedispense.profile.json b/crates/fhir/tests/data/json/R5/devicedispense.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/devicedispense.profile.json rename to crates/fhir/tests/data/json/R5/devicedispense.profile.json diff --git a/crates/fhir/tests/data/R5/devicemetric-example.json b/crates/fhir/tests/data/json/R5/devicemetric-example.json similarity index 100% rename from crates/fhir/tests/data/R5/devicemetric-example.json rename to crates/fhir/tests/data/json/R5/devicemetric-example.json diff --git a/crates/fhir/tests/data/R5/devicemetric-questionnaire.json b/crates/fhir/tests/data/json/R5/devicemetric-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/devicemetric-questionnaire.json rename to crates/fhir/tests/data/json/R5/devicemetric-questionnaire.json diff --git a/crates/fhir/tests/data/R5/devicemetric.profile.json b/crates/fhir/tests/data/json/R5/devicemetric.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/devicemetric.profile.json rename to crates/fhir/tests/data/json/R5/devicemetric.profile.json diff --git a/crates/fhir/tests/data/R5/devicemetricobservation-questionnaire.json b/crates/fhir/tests/data/json/R5/devicemetricobservation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/devicemetricobservation-questionnaire.json rename to crates/fhir/tests/data/json/R5/devicemetricobservation-questionnaire.json diff --git a/crates/fhir/tests/data/R5/devicemetricobservation.profile.json b/crates/fhir/tests/data/json/R5/devicemetricobservation.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/devicemetricobservation.profile.json rename to crates/fhir/tests/data/json/R5/devicemetricobservation.profile.json diff --git a/crates/fhir/tests/data/R5/devicerequest-example-insulinpump.json b/crates/fhir/tests/data/json/R5/devicerequest-example-insulinpump.json similarity index 100% rename from crates/fhir/tests/data/R5/devicerequest-example-insulinpump.json rename to crates/fhir/tests/data/json/R5/devicerequest-example-insulinpump.json diff --git a/crates/fhir/tests/data/R5/devicerequest-example.json b/crates/fhir/tests/data/json/R5/devicerequest-example.json similarity index 100% rename from crates/fhir/tests/data/R5/devicerequest-example.json rename to crates/fhir/tests/data/json/R5/devicerequest-example.json diff --git a/crates/fhir/tests/data/R5/devicerequest-left-lens.json b/crates/fhir/tests/data/json/R5/devicerequest-left-lens.json similarity index 100% rename from crates/fhir/tests/data/R5/devicerequest-left-lens.json rename to crates/fhir/tests/data/json/R5/devicerequest-left-lens.json diff --git a/crates/fhir/tests/data/R5/devicerequest-questionnaire.json b/crates/fhir/tests/data/json/R5/devicerequest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/devicerequest-questionnaire.json rename to crates/fhir/tests/data/json/R5/devicerequest-questionnaire.json diff --git a/crates/fhir/tests/data/R5/devicerequest-right-lens.json b/crates/fhir/tests/data/json/R5/devicerequest-right-lens.json similarity index 100% rename from crates/fhir/tests/data/R5/devicerequest-right-lens.json rename to crates/fhir/tests/data/json/R5/devicerequest-right-lens.json diff --git a/crates/fhir/tests/data/R5/devicerequest.profile.json b/crates/fhir/tests/data/json/R5/devicerequest.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/devicerequest.profile.json rename to crates/fhir/tests/data/json/R5/devicerequest.profile.json diff --git a/crates/fhir/tests/data/R5/deviceusage-example.json b/crates/fhir/tests/data/json/R5/deviceusage-example.json similarity index 100% rename from crates/fhir/tests/data/R5/deviceusage-example.json rename to crates/fhir/tests/data/json/R5/deviceusage-example.json diff --git a/crates/fhir/tests/data/R5/deviceusage-questionnaire.json b/crates/fhir/tests/data/json/R5/deviceusage-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/deviceusage-questionnaire.json rename to crates/fhir/tests/data/json/R5/deviceusage-questionnaire.json diff --git a/crates/fhir/tests/data/R5/deviceusage.profile.json b/crates/fhir/tests/data/json/R5/deviceusage.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/deviceusage.profile.json rename to crates/fhir/tests/data/json/R5/deviceusage.profile.json diff --git a/crates/fhir/tests/data/R5/diagnosticreport-example-dxa.json b/crates/fhir/tests/data/json/R5/diagnosticreport-example-dxa.json similarity index 100% rename from crates/fhir/tests/data/R5/diagnosticreport-example-dxa.json rename to crates/fhir/tests/data/json/R5/diagnosticreport-example-dxa.json diff --git a/crates/fhir/tests/data/R5/diagnosticreport-example-f001-bloodexam.json b/crates/fhir/tests/data/json/R5/diagnosticreport-example-f001-bloodexam.json similarity index 100% rename from crates/fhir/tests/data/R5/diagnosticreport-example-f001-bloodexam.json rename to crates/fhir/tests/data/json/R5/diagnosticreport-example-f001-bloodexam.json diff --git a/crates/fhir/tests/data/R5/diagnosticreport-example-f201-brainct.json b/crates/fhir/tests/data/json/R5/diagnosticreport-example-f201-brainct.json similarity index 100% rename from crates/fhir/tests/data/R5/diagnosticreport-example-f201-brainct.json rename to crates/fhir/tests/data/json/R5/diagnosticreport-example-f201-brainct.json diff --git a/crates/fhir/tests/data/R5/diagnosticreport-example-f202-bloodculture.json b/crates/fhir/tests/data/json/R5/diagnosticreport-example-f202-bloodculture.json similarity index 100% rename from crates/fhir/tests/data/R5/diagnosticreport-example-f202-bloodculture.json rename to crates/fhir/tests/data/json/R5/diagnosticreport-example-f202-bloodculture.json diff --git a/crates/fhir/tests/data/R5/diagnosticreport-example-ghp.json b/crates/fhir/tests/data/json/R5/diagnosticreport-example-ghp.json similarity index 100% rename from crates/fhir/tests/data/R5/diagnosticreport-example-ghp.json rename to crates/fhir/tests/data/json/R5/diagnosticreport-example-ghp.json diff --git a/crates/fhir/tests/data/R5/diagnosticreport-example-gingival-biopsy.json b/crates/fhir/tests/data/json/R5/diagnosticreport-example-gingival-biopsy.json similarity index 100% rename from crates/fhir/tests/data/R5/diagnosticreport-example-gingival-biopsy.json rename to crates/fhir/tests/data/json/R5/diagnosticreport-example-gingival-biopsy.json diff --git a/crates/fhir/tests/data/R5/diagnosticreport-example-gingival-mass.json b/crates/fhir/tests/data/json/R5/diagnosticreport-example-gingival-mass.json similarity index 100% rename from crates/fhir/tests/data/R5/diagnosticreport-example-gingival-mass.json rename to crates/fhir/tests/data/json/R5/diagnosticreport-example-gingival-mass.json diff --git a/crates/fhir/tests/data/R5/diagnosticreport-example-papsmear.json b/crates/fhir/tests/data/json/R5/diagnosticreport-example-papsmear.json similarity index 100% rename from crates/fhir/tests/data/R5/diagnosticreport-example-papsmear.json rename to crates/fhir/tests/data/json/R5/diagnosticreport-example-papsmear.json diff --git a/crates/fhir/tests/data/R5/diagnosticreport-example-ultrasound.json b/crates/fhir/tests/data/json/R5/diagnosticreport-example-ultrasound.json similarity index 100% rename from crates/fhir/tests/data/R5/diagnosticreport-example-ultrasound.json rename to crates/fhir/tests/data/json/R5/diagnosticreport-example-ultrasound.json diff --git a/crates/fhir/tests/data/R5/diagnosticreport-example.json b/crates/fhir/tests/data/json/R5/diagnosticreport-example.json similarity index 100% rename from crates/fhir/tests/data/R5/diagnosticreport-example.json rename to crates/fhir/tests/data/json/R5/diagnosticreport-example.json diff --git a/crates/fhir/tests/data/R5/diagnosticreport-examples-general.json b/crates/fhir/tests/data/json/R5/diagnosticreport-examples-general.json similarity index 100% rename from crates/fhir/tests/data/R5/diagnosticreport-examples-general.json rename to crates/fhir/tests/data/json/R5/diagnosticreport-examples-general.json diff --git a/crates/fhir/tests/data/R5/diagnosticreport-micro1.json b/crates/fhir/tests/data/json/R5/diagnosticreport-micro1.json similarity index 100% rename from crates/fhir/tests/data/R5/diagnosticreport-micro1.json rename to crates/fhir/tests/data/json/R5/diagnosticreport-micro1.json diff --git a/crates/fhir/tests/data/R5/diagnosticreport-questionnaire.json b/crates/fhir/tests/data/json/R5/diagnosticreport-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/diagnosticreport-questionnaire.json rename to crates/fhir/tests/data/json/R5/diagnosticreport-questionnaire.json diff --git a/crates/fhir/tests/data/R5/diagnosticreport.profile.json b/crates/fhir/tests/data/json/R5/diagnosticreport.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/diagnosticreport.profile.json rename to crates/fhir/tests/data/json/R5/diagnosticreport.profile.json diff --git a/crates/fhir/tests/data/R5/distance.profile.json b/crates/fhir/tests/data/json/R5/distance.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/distance.profile.json rename to crates/fhir/tests/data/json/R5/distance.profile.json diff --git a/crates/fhir/tests/data/R5/document-bundle-questionnaire.json b/crates/fhir/tests/data/json/R5/document-bundle-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/document-bundle-questionnaire.json rename to crates/fhir/tests/data/json/R5/document-bundle-questionnaire.json diff --git a/crates/fhir/tests/data/R5/document-bundle.profile.json b/crates/fhir/tests/data/json/R5/document-bundle.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/document-bundle.profile.json rename to crates/fhir/tests/data/json/R5/document-bundle.profile.json diff --git a/crates/fhir/tests/data/R5/document-example-dischargesummary.json b/crates/fhir/tests/data/json/R5/document-example-dischargesummary.json similarity index 100% rename from crates/fhir/tests/data/R5/document-example-dischargesummary.json rename to crates/fhir/tests/data/json/R5/document-example-dischargesummary.json diff --git a/crates/fhir/tests/data/R5/documentreference-example-bundle.json b/crates/fhir/tests/data/json/R5/documentreference-example-bundle.json similarity index 100% rename from crates/fhir/tests/data/R5/documentreference-example-bundle.json rename to crates/fhir/tests/data/json/R5/documentreference-example-bundle.json diff --git a/crates/fhir/tests/data/R5/documentreference-example-composition.json b/crates/fhir/tests/data/json/R5/documentreference-example-composition.json similarity index 100% rename from crates/fhir/tests/data/R5/documentreference-example-composition.json rename to crates/fhir/tests/data/json/R5/documentreference-example-composition.json diff --git a/crates/fhir/tests/data/R5/documentreference-example-comprehensive.json b/crates/fhir/tests/data/json/R5/documentreference-example-comprehensive.json similarity index 100% rename from crates/fhir/tests/data/R5/documentreference-example-comprehensive.json rename to crates/fhir/tests/data/json/R5/documentreference-example-comprehensive.json diff --git a/crates/fhir/tests/data/R5/documentreference-example-diagram.json b/crates/fhir/tests/data/json/R5/documentreference-example-diagram.json similarity index 100% rename from crates/fhir/tests/data/R5/documentreference-example-diagram.json rename to crates/fhir/tests/data/json/R5/documentreference-example-diagram.json diff --git a/crates/fhir/tests/data/R5/documentreference-example-dicom.json b/crates/fhir/tests/data/json/R5/documentreference-example-dicom.json similarity index 100% rename from crates/fhir/tests/data/R5/documentreference-example-dicom.json rename to crates/fhir/tests/data/json/R5/documentreference-example-dicom.json diff --git a/crates/fhir/tests/data/R5/documentreference-example-sound.json b/crates/fhir/tests/data/json/R5/documentreference-example-sound.json similarity index 100% rename from crates/fhir/tests/data/R5/documentreference-example-sound.json rename to crates/fhir/tests/data/json/R5/documentreference-example-sound.json diff --git a/crates/fhir/tests/data/R5/documentreference-example-xray.json b/crates/fhir/tests/data/json/R5/documentreference-example-xray.json similarity index 100% rename from crates/fhir/tests/data/R5/documentreference-example-xray.json rename to crates/fhir/tests/data/json/R5/documentreference-example-xray.json diff --git a/crates/fhir/tests/data/R5/documentreference-example.json b/crates/fhir/tests/data/json/R5/documentreference-example.json similarity index 100% rename from crates/fhir/tests/data/R5/documentreference-example.json rename to crates/fhir/tests/data/json/R5/documentreference-example.json diff --git a/crates/fhir/tests/data/R5/documentreference-questionnaire.json b/crates/fhir/tests/data/json/R5/documentreference-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/documentreference-questionnaire.json rename to crates/fhir/tests/data/json/R5/documentreference-questionnaire.json diff --git a/crates/fhir/tests/data/R5/documentreference.profile.json b/crates/fhir/tests/data/json/R5/documentreference.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/documentreference.profile.json rename to crates/fhir/tests/data/json/R5/documentreference.profile.json diff --git a/crates/fhir/tests/data/R5/domainresource.profile.json b/crates/fhir/tests/data/json/R5/domainresource.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/domainresource.profile.json rename to crates/fhir/tests/data/json/R5/domainresource.profile.json diff --git a/crates/fhir/tests/data/R5/dosage.profile.json b/crates/fhir/tests/data/json/R5/dosage.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/dosage.profile.json rename to crates/fhir/tests/data/json/R5/dosage.profile.json diff --git a/crates/fhir/tests/data/R5/duration.profile.json b/crates/fhir/tests/data/json/R5/duration.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/duration.profile.json rename to crates/fhir/tests/data/json/R5/duration.profile.json diff --git a/crates/fhir/tests/data/R5/ebmrecommendation-questionnaire.json b/crates/fhir/tests/data/json/R5/ebmrecommendation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/ebmrecommendation-questionnaire.json rename to crates/fhir/tests/data/json/R5/ebmrecommendation-questionnaire.json diff --git a/crates/fhir/tests/data/R5/ebmrecommendation.profile.json b/crates/fhir/tests/data/json/R5/ebmrecommendation.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/ebmrecommendation.profile.json rename to crates/fhir/tests/data/json/R5/ebmrecommendation.profile.json diff --git a/crates/fhir/tests/data/R5/element.profile.json b/crates/fhir/tests/data/json/R5/element.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/element.profile.json rename to crates/fhir/tests/data/json/R5/element.profile.json diff --git a/crates/fhir/tests/data/R5/elementdefinition-de-questionnaire.json b/crates/fhir/tests/data/json/R5/elementdefinition-de-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/elementdefinition-de-questionnaire.json rename to crates/fhir/tests/data/json/R5/elementdefinition-de-questionnaire.json diff --git a/crates/fhir/tests/data/R5/elementdefinition-de.profile.json b/crates/fhir/tests/data/json/R5/elementdefinition-de.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/elementdefinition-de.profile.json rename to crates/fhir/tests/data/json/R5/elementdefinition-de.profile.json diff --git a/crates/fhir/tests/data/R5/elementdefinition.profile.json b/crates/fhir/tests/data/json/R5/elementdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/elementdefinition.profile.json rename to crates/fhir/tests/data/json/R5/elementdefinition.profile.json diff --git a/crates/fhir/tests/data/R5/elmlibrary-questionnaire.json b/crates/fhir/tests/data/json/R5/elmlibrary-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/elmlibrary-questionnaire.json rename to crates/fhir/tests/data/json/R5/elmlibrary-questionnaire.json diff --git a/crates/fhir/tests/data/R5/elmlibrary.profile.json b/crates/fhir/tests/data/json/R5/elmlibrary.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/elmlibrary.profile.json rename to crates/fhir/tests/data/json/R5/elmlibrary.profile.json diff --git a/crates/fhir/tests/data/R5/encounter-example-colonoscopy.json b/crates/fhir/tests/data/json/R5/encounter-example-colonoscopy.json similarity index 100% rename from crates/fhir/tests/data/R5/encounter-example-colonoscopy.json rename to crates/fhir/tests/data/json/R5/encounter-example-colonoscopy.json diff --git a/crates/fhir/tests/data/R5/encounter-example-emerg.json b/crates/fhir/tests/data/json/R5/encounter-example-emerg.json similarity index 100% rename from crates/fhir/tests/data/R5/encounter-example-emerg.json rename to crates/fhir/tests/data/json/R5/encounter-example-emerg.json diff --git a/crates/fhir/tests/data/R5/encounter-example-f001-heart.json b/crates/fhir/tests/data/json/R5/encounter-example-f001-heart.json similarity index 100% rename from crates/fhir/tests/data/R5/encounter-example-f001-heart.json rename to crates/fhir/tests/data/json/R5/encounter-example-f001-heart.json diff --git a/crates/fhir/tests/data/R5/encounter-example-f002-lung.json b/crates/fhir/tests/data/json/R5/encounter-example-f002-lung.json similarity index 100% rename from crates/fhir/tests/data/R5/encounter-example-f002-lung.json rename to crates/fhir/tests/data/json/R5/encounter-example-f002-lung.json diff --git a/crates/fhir/tests/data/R5/encounter-example-f003-abscess.json b/crates/fhir/tests/data/json/R5/encounter-example-f003-abscess.json similarity index 100% rename from crates/fhir/tests/data/R5/encounter-example-f003-abscess.json rename to crates/fhir/tests/data/json/R5/encounter-example-f003-abscess.json diff --git a/crates/fhir/tests/data/R5/encounter-example-f201-20130404.json b/crates/fhir/tests/data/json/R5/encounter-example-f201-20130404.json similarity index 100% rename from crates/fhir/tests/data/R5/encounter-example-f201-20130404.json rename to crates/fhir/tests/data/json/R5/encounter-example-f201-20130404.json diff --git a/crates/fhir/tests/data/R5/encounter-example-f202-20130128.json b/crates/fhir/tests/data/json/R5/encounter-example-f202-20130128.json similarity index 100% rename from crates/fhir/tests/data/R5/encounter-example-f202-20130128.json rename to crates/fhir/tests/data/json/R5/encounter-example-f202-20130128.json diff --git a/crates/fhir/tests/data/R5/encounter-example-f203-20130311.json b/crates/fhir/tests/data/json/R5/encounter-example-f203-20130311.json similarity index 100% rename from crates/fhir/tests/data/R5/encounter-example-f203-20130311.json rename to crates/fhir/tests/data/json/R5/encounter-example-f203-20130311.json diff --git a/crates/fhir/tests/data/R5/encounter-example-home.json b/crates/fhir/tests/data/json/R5/encounter-example-home.json similarity index 100% rename from crates/fhir/tests/data/R5/encounter-example-home.json rename to crates/fhir/tests/data/json/R5/encounter-example-home.json diff --git a/crates/fhir/tests/data/R5/encounter-example-xcda.json b/crates/fhir/tests/data/json/R5/encounter-example-xcda.json similarity index 100% rename from crates/fhir/tests/data/R5/encounter-example-xcda.json rename to crates/fhir/tests/data/json/R5/encounter-example-xcda.json diff --git a/crates/fhir/tests/data/R5/encounter-example.json b/crates/fhir/tests/data/json/R5/encounter-example.json similarity index 100% rename from crates/fhir/tests/data/R5/encounter-example.json rename to crates/fhir/tests/data/json/R5/encounter-example.json diff --git a/crates/fhir/tests/data/R5/encounter-questionnaire.json b/crates/fhir/tests/data/json/R5/encounter-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/encounter-questionnaire.json rename to crates/fhir/tests/data/json/R5/encounter-questionnaire.json diff --git a/crates/fhir/tests/data/R5/encounter.profile.json b/crates/fhir/tests/data/json/R5/encounter.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/encounter.profile.json rename to crates/fhir/tests/data/json/R5/encounter.profile.json diff --git a/crates/fhir/tests/data/R5/encounterhistory-example.json b/crates/fhir/tests/data/json/R5/encounterhistory-example.json similarity index 100% rename from crates/fhir/tests/data/R5/encounterhistory-example.json rename to crates/fhir/tests/data/json/R5/encounterhistory-example.json diff --git a/crates/fhir/tests/data/R5/encounterhistory-questionnaire.json b/crates/fhir/tests/data/json/R5/encounterhistory-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/encounterhistory-questionnaire.json rename to crates/fhir/tests/data/json/R5/encounterhistory-questionnaire.json diff --git a/crates/fhir/tests/data/R5/encounterhistory.profile.json b/crates/fhir/tests/data/json/R5/encounterhistory.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/encounterhistory.profile.json rename to crates/fhir/tests/data/json/R5/encounterhistory.profile.json diff --git a/crates/fhir/tests/data/R5/endpoint-example-direct.json b/crates/fhir/tests/data/json/R5/endpoint-example-direct.json similarity index 100% rename from crates/fhir/tests/data/R5/endpoint-example-direct.json rename to crates/fhir/tests/data/json/R5/endpoint-example-direct.json diff --git a/crates/fhir/tests/data/R5/endpoint-example-wadors.json b/crates/fhir/tests/data/json/R5/endpoint-example-wadors.json similarity index 100% rename from crates/fhir/tests/data/R5/endpoint-example-wadors.json rename to crates/fhir/tests/data/json/R5/endpoint-example-wadors.json diff --git a/crates/fhir/tests/data/R5/endpoint-example.json b/crates/fhir/tests/data/json/R5/endpoint-example.json similarity index 100% rename from crates/fhir/tests/data/R5/endpoint-example.json rename to crates/fhir/tests/data/json/R5/endpoint-example.json diff --git a/crates/fhir/tests/data/R5/endpoint-examples-general-template.json b/crates/fhir/tests/data/json/R5/endpoint-examples-general-template.json similarity index 100% rename from crates/fhir/tests/data/R5/endpoint-examples-general-template.json rename to crates/fhir/tests/data/json/R5/endpoint-examples-general-template.json diff --git a/crates/fhir/tests/data/R5/endpoint-questionnaire.json b/crates/fhir/tests/data/json/R5/endpoint-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/endpoint-questionnaire.json rename to crates/fhir/tests/data/json/R5/endpoint-questionnaire.json diff --git a/crates/fhir/tests/data/R5/endpoint.profile.json b/crates/fhir/tests/data/json/R5/endpoint.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/endpoint.profile.json rename to crates/fhir/tests/data/json/R5/endpoint.profile.json diff --git a/crates/fhir/tests/data/R5/enrollmentrequest-example.json b/crates/fhir/tests/data/json/R5/enrollmentrequest-example.json similarity index 100% rename from crates/fhir/tests/data/R5/enrollmentrequest-example.json rename to crates/fhir/tests/data/json/R5/enrollmentrequest-example.json diff --git a/crates/fhir/tests/data/R5/enrollmentrequest-questionnaire.json b/crates/fhir/tests/data/json/R5/enrollmentrequest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/enrollmentrequest-questionnaire.json rename to crates/fhir/tests/data/json/R5/enrollmentrequest-questionnaire.json diff --git a/crates/fhir/tests/data/R5/enrollmentrequest.profile.json b/crates/fhir/tests/data/json/R5/enrollmentrequest.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/enrollmentrequest.profile.json rename to crates/fhir/tests/data/json/R5/enrollmentrequest.profile.json diff --git a/crates/fhir/tests/data/R5/enrollmentresponse-example.json b/crates/fhir/tests/data/json/R5/enrollmentresponse-example.json similarity index 100% rename from crates/fhir/tests/data/R5/enrollmentresponse-example.json rename to crates/fhir/tests/data/json/R5/enrollmentresponse-example.json diff --git a/crates/fhir/tests/data/R5/enrollmentresponse-questionnaire.json b/crates/fhir/tests/data/json/R5/enrollmentresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/enrollmentresponse-questionnaire.json rename to crates/fhir/tests/data/json/R5/enrollmentresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R5/enrollmentresponse.profile.json b/crates/fhir/tests/data/json/R5/enrollmentresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/enrollmentresponse.profile.json rename to crates/fhir/tests/data/json/R5/enrollmentresponse.profile.json diff --git a/crates/fhir/tests/data/R5/episodeofcare-example.json b/crates/fhir/tests/data/json/R5/episodeofcare-example.json similarity index 100% rename from crates/fhir/tests/data/R5/episodeofcare-example.json rename to crates/fhir/tests/data/json/R5/episodeofcare-example.json diff --git a/crates/fhir/tests/data/R5/episodeofcare-questionnaire.json b/crates/fhir/tests/data/json/R5/episodeofcare-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/episodeofcare-questionnaire.json rename to crates/fhir/tests/data/json/R5/episodeofcare-questionnaire.json diff --git a/crates/fhir/tests/data/R5/episodeofcare.profile.json b/crates/fhir/tests/data/json/R5/episodeofcare.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/episodeofcare.profile.json rename to crates/fhir/tests/data/json/R5/episodeofcare.profile.json diff --git a/crates/fhir/tests/data/R5/event.json b/crates/fhir/tests/data/json/R5/event.json similarity index 100% rename from crates/fhir/tests/data/R5/event.json rename to crates/fhir/tests/data/json/R5/event.json diff --git a/crates/fhir/tests/data/R5/eventdefinition-example.json b/crates/fhir/tests/data/json/R5/eventdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R5/eventdefinition-example.json rename to crates/fhir/tests/data/json/R5/eventdefinition-example.json diff --git a/crates/fhir/tests/data/R5/eventdefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/eventdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/eventdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/eventdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/eventdefinition.profile.json b/crates/fhir/tests/data/json/R5/eventdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/eventdefinition.profile.json rename to crates/fhir/tests/data/json/R5/eventdefinition.profile.json diff --git a/crates/fhir/tests/data/R5/evidence-example-ASTRAL-12-alteplase-mRS3-6.json b/crates/fhir/tests/data/json/R5/evidence-example-ASTRAL-12-alteplase-mRS3-6.json similarity index 100% rename from crates/fhir/tests/data/R5/evidence-example-ASTRAL-12-alteplase-mRS3-6.json rename to crates/fhir/tests/data/json/R5/evidence-example-ASTRAL-12-alteplase-mRS3-6.json diff --git a/crates/fhir/tests/data/R5/evidence-example-stroke-0-3-alteplase-vs-no-alteplase-mRS3-6.json b/crates/fhir/tests/data/json/R5/evidence-example-stroke-0-3-alteplase-vs-no-alteplase-mRS3-6.json similarity index 100% rename from crates/fhir/tests/data/R5/evidence-example-stroke-0-3-alteplase-vs-no-alteplase-mRS3-6.json rename to crates/fhir/tests/data/json/R5/evidence-example-stroke-0-3-alteplase-vs-no-alteplase-mRS3-6.json diff --git a/crates/fhir/tests/data/R5/evidence-example-stroke-3-4half-alteplase-vs-no-alteplase-mRS0-2.json b/crates/fhir/tests/data/json/R5/evidence-example-stroke-3-4half-alteplase-vs-no-alteplase-mRS0-2.json similarity index 100% rename from crates/fhir/tests/data/R5/evidence-example-stroke-3-4half-alteplase-vs-no-alteplase-mRS0-2.json rename to crates/fhir/tests/data/json/R5/evidence-example-stroke-3-4half-alteplase-vs-no-alteplase-mRS0-2.json diff --git a/crates/fhir/tests/data/R5/evidence-example-stroke-alteplase-fatalICH.json b/crates/fhir/tests/data/json/R5/evidence-example-stroke-alteplase-fatalICH.json similarity index 100% rename from crates/fhir/tests/data/R5/evidence-example-stroke-alteplase-fatalICH.json rename to crates/fhir/tests/data/json/R5/evidence-example-stroke-alteplase-fatalICH.json diff --git a/crates/fhir/tests/data/R5/evidence-example-stroke-no-alteplase-fatalICH.json b/crates/fhir/tests/data/json/R5/evidence-example-stroke-no-alteplase-fatalICH.json similarity index 100% rename from crates/fhir/tests/data/R5/evidence-example-stroke-no-alteplase-fatalICH.json rename to crates/fhir/tests/data/json/R5/evidence-example-stroke-no-alteplase-fatalICH.json diff --git a/crates/fhir/tests/data/R5/evidence-questionnaire.json b/crates/fhir/tests/data/json/R5/evidence-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/evidence-questionnaire.json rename to crates/fhir/tests/data/json/R5/evidence-questionnaire.json diff --git a/crates/fhir/tests/data/R5/evidence.profile.json b/crates/fhir/tests/data/json/R5/evidence.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/evidence.profile.json rename to crates/fhir/tests/data/json/R5/evidence.profile.json diff --git a/crates/fhir/tests/data/R5/evidencereport-example.json b/crates/fhir/tests/data/json/R5/evidencereport-example.json similarity index 100% rename from crates/fhir/tests/data/R5/evidencereport-example.json rename to crates/fhir/tests/data/json/R5/evidencereport-example.json diff --git a/crates/fhir/tests/data/R5/evidencereport-questionnaire.json b/crates/fhir/tests/data/json/R5/evidencereport-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/evidencereport-questionnaire.json rename to crates/fhir/tests/data/json/R5/evidencereport-questionnaire.json diff --git a/crates/fhir/tests/data/R5/evidencereport.profile.json b/crates/fhir/tests/data/json/R5/evidencereport.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/evidencereport.profile.json rename to crates/fhir/tests/data/json/R5/evidencereport.profile.json diff --git a/crates/fhir/tests/data/R5/evidencevariable-example-Stroke-Thrombolysis-Trialists-2014-2016-IPD-MA-Cohort.json b/crates/fhir/tests/data/json/R5/evidencevariable-example-Stroke-Thrombolysis-Trialists-2014-2016-IPD-MA-Cohort.json similarity index 100% rename from crates/fhir/tests/data/R5/evidencevariable-example-Stroke-Thrombolysis-Trialists-2014-2016-IPD-MA-Cohort.json rename to crates/fhir/tests/data/json/R5/evidencevariable-example-Stroke-Thrombolysis-Trialists-2014-2016-IPD-MA-Cohort.json diff --git a/crates/fhir/tests/data/R5/evidencevariable-example-Wardlaw2014Analysis1.16.3EvidenceSet.json b/crates/fhir/tests/data/json/R5/evidencevariable-example-Wardlaw2014Analysis1.16.3EvidenceSet.json similarity index 100% rename from crates/fhir/tests/data/R5/evidencevariable-example-Wardlaw2014Analysis1.16.3EvidenceSet.json rename to crates/fhir/tests/data/json/R5/evidencevariable-example-Wardlaw2014Analysis1.16.3EvidenceSet.json diff --git a/crates/fhir/tests/data/R5/evidencevariable-example-alive-independent-90day.json b/crates/fhir/tests/data/json/R5/evidencevariable-example-alive-independent-90day.json similarity index 100% rename from crates/fhir/tests/data/R5/evidencevariable-example-alive-independent-90day.json rename to crates/fhir/tests/data/json/R5/evidencevariable-example-alive-independent-90day.json diff --git a/crates/fhir/tests/data/R5/evidencevariable-example-alteplase-for-stroke.json b/crates/fhir/tests/data/json/R5/evidencevariable-example-alteplase-for-stroke.json similarity index 100% rename from crates/fhir/tests/data/R5/evidencevariable-example-alteplase-for-stroke.json rename to crates/fhir/tests/data/json/R5/evidencevariable-example-alteplase-for-stroke.json diff --git a/crates/fhir/tests/data/R5/evidencevariable-example-dead-or-dependent-90day.json b/crates/fhir/tests/data/json/R5/evidencevariable-example-dead-or-dependent-90day.json similarity index 100% rename from crates/fhir/tests/data/R5/evidencevariable-example-dead-or-dependent-90day.json rename to crates/fhir/tests/data/json/R5/evidencevariable-example-dead-or-dependent-90day.json diff --git a/crates/fhir/tests/data/R5/evidencevariable-example-eligibility-criteria-ada-rec-bariatric.json b/crates/fhir/tests/data/json/R5/evidencevariable-example-eligibility-criteria-ada-rec-bariatric.json similarity index 100% rename from crates/fhir/tests/data/R5/evidencevariable-example-eligibility-criteria-ada-rec-bariatric.json rename to crates/fhir/tests/data/json/R5/evidencevariable-example-eligibility-criteria-ada-rec-bariatric.json diff --git a/crates/fhir/tests/data/R5/evidencevariable-example-eligibility-criteria-adults-with-obesity.json b/crates/fhir/tests/data/json/R5/evidencevariable-example-eligibility-criteria-adults-with-obesity.json similarity index 100% rename from crates/fhir/tests/data/R5/evidencevariable-example-eligibility-criteria-adults-with-obesity.json rename to crates/fhir/tests/data/json/R5/evidencevariable-example-eligibility-criteria-adults-with-obesity.json diff --git a/crates/fhir/tests/data/R5/evidencevariable-example-eligibility-criteria-diabetes-surgery.json b/crates/fhir/tests/data/json/R5/evidencevariable-example-eligibility-criteria-diabetes-surgery.json similarity index 100% rename from crates/fhir/tests/data/R5/evidencevariable-example-eligibility-criteria-diabetes-surgery.json rename to crates/fhir/tests/data/json/R5/evidencevariable-example-eligibility-criteria-diabetes-surgery.json diff --git a/crates/fhir/tests/data/R5/evidencevariable-example-fatal-ICH-in-7-days.json b/crates/fhir/tests/data/json/R5/evidencevariable-example-fatal-ICH-in-7-days.json similarity index 100% rename from crates/fhir/tests/data/R5/evidencevariable-example-fatal-ICH-in-7-days.json rename to crates/fhir/tests/data/json/R5/evidencevariable-example-fatal-ICH-in-7-days.json diff --git a/crates/fhir/tests/data/R5/evidencevariable-example-mRS0-2-at-90days.json b/crates/fhir/tests/data/json/R5/evidencevariable-example-mRS0-2-at-90days.json similarity index 100% rename from crates/fhir/tests/data/R5/evidencevariable-example-mRS0-2-at-90days.json rename to crates/fhir/tests/data/json/R5/evidencevariable-example-mRS0-2-at-90days.json diff --git a/crates/fhir/tests/data/R5/evidencevariable-example-mRS3-6-at-90days.json b/crates/fhir/tests/data/json/R5/evidencevariable-example-mRS3-6-at-90days.json similarity index 100% rename from crates/fhir/tests/data/R5/evidencevariable-example-mRS3-6-at-90days.json rename to crates/fhir/tests/data/json/R5/evidencevariable-example-mRS3-6-at-90days.json diff --git a/crates/fhir/tests/data/R5/evidencevariable-example-no-alteplase.json b/crates/fhir/tests/data/json/R5/evidencevariable-example-no-alteplase.json similarity index 100% rename from crates/fhir/tests/data/R5/evidencevariable-example-no-alteplase.json rename to crates/fhir/tests/data/json/R5/evidencevariable-example-no-alteplase.json diff --git a/crates/fhir/tests/data/R5/evidencevariable-example-placebo.json b/crates/fhir/tests/data/json/R5/evidencevariable-example-placebo.json similarity index 100% rename from crates/fhir/tests/data/R5/evidencevariable-example-placebo.json rename to crates/fhir/tests/data/json/R5/evidencevariable-example-placebo.json diff --git a/crates/fhir/tests/data/R5/evidencevariable-questionnaire.json b/crates/fhir/tests/data/json/R5/evidencevariable-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/evidencevariable-questionnaire.json rename to crates/fhir/tests/data/json/R5/evidencevariable-questionnaire.json diff --git a/crates/fhir/tests/data/R5/evidencevariable.profile.json b/crates/fhir/tests/data/json/R5/evidencevariable.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/evidencevariable.profile.json rename to crates/fhir/tests/data/json/R5/evidencevariable.profile.json diff --git a/crates/fhir/tests/data/R5/examples.json.zip b/crates/fhir/tests/data/json/R5/examples.json.zip similarity index 100% rename from crates/fhir/tests/data/R5/examples.json.zip rename to crates/fhir/tests/data/json/R5/examples.json.zip diff --git a/crates/fhir/tests/data/R5/examplescenario-example-laborder.json b/crates/fhir/tests/data/json/R5/examplescenario-example-laborder.json similarity index 100% rename from crates/fhir/tests/data/R5/examplescenario-example-laborder.json rename to crates/fhir/tests/data/json/R5/examplescenario-example-laborder.json diff --git a/crates/fhir/tests/data/R5/examplescenario-example.json b/crates/fhir/tests/data/json/R5/examplescenario-example.json similarity index 100% rename from crates/fhir/tests/data/R5/examplescenario-example.json rename to crates/fhir/tests/data/json/R5/examplescenario-example.json diff --git a/crates/fhir/tests/data/R5/examplescenario-questionnaire.json b/crates/fhir/tests/data/json/R5/examplescenario-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/examplescenario-questionnaire.json rename to crates/fhir/tests/data/json/R5/examplescenario-questionnaire.json diff --git a/crates/fhir/tests/data/R5/examplescenario.profile.json b/crates/fhir/tests/data/json/R5/examplescenario.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/examplescenario.profile.json rename to crates/fhir/tests/data/json/R5/examplescenario.profile.json diff --git a/crates/fhir/tests/data/R5/executablevalueset-questionnaire.json b/crates/fhir/tests/data/json/R5/executablevalueset-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/executablevalueset-questionnaire.json rename to crates/fhir/tests/data/json/R5/executablevalueset-questionnaire.json diff --git a/crates/fhir/tests/data/R5/executablevalueset.profile.json b/crates/fhir/tests/data/json/R5/executablevalueset.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/executablevalueset.profile.json rename to crates/fhir/tests/data/json/R5/executablevalueset.profile.json diff --git a/crates/fhir/tests/data/R5/explanationofbenefit-example-2.json b/crates/fhir/tests/data/json/R5/explanationofbenefit-example-2.json similarity index 100% rename from crates/fhir/tests/data/R5/explanationofbenefit-example-2.json rename to crates/fhir/tests/data/json/R5/explanationofbenefit-example-2.json diff --git a/crates/fhir/tests/data/R5/explanationofbenefit-example.json b/crates/fhir/tests/data/json/R5/explanationofbenefit-example.json similarity index 100% rename from crates/fhir/tests/data/R5/explanationofbenefit-example.json rename to crates/fhir/tests/data/json/R5/explanationofbenefit-example.json diff --git a/crates/fhir/tests/data/R5/explanationofbenefit-questionnaire.json b/crates/fhir/tests/data/json/R5/explanationofbenefit-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/explanationofbenefit-questionnaire.json rename to crates/fhir/tests/data/json/R5/explanationofbenefit-questionnaire.json diff --git a/crates/fhir/tests/data/R5/explanationofbenefit.profile.json b/crates/fhir/tests/data/json/R5/explanationofbenefit.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/explanationofbenefit.profile.json rename to crates/fhir/tests/data/json/R5/explanationofbenefit.profile.json diff --git a/crates/fhir/tests/data/R5/expression.profile.json b/crates/fhir/tests/data/json/R5/expression.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/expression.profile.json rename to crates/fhir/tests/data/json/R5/expression.profile.json diff --git a/crates/fhir/tests/data/R5/extendedcontactdetail.profile.json b/crates/fhir/tests/data/json/R5/extendedcontactdetail.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/extendedcontactdetail.profile.json rename to crates/fhir/tests/data/json/R5/extendedcontactdetail.profile.json diff --git a/crates/fhir/tests/data/R5/extension.profile.json b/crates/fhir/tests/data/json/R5/extension.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/extension.profile.json rename to crates/fhir/tests/data/json/R5/extension.profile.json diff --git a/crates/fhir/tests/data/R5/external-resources.json b/crates/fhir/tests/data/json/R5/external-resources.json similarity index 100% rename from crates/fhir/tests/data/R5/external-resources.json rename to crates/fhir/tests/data/json/R5/external-resources.json diff --git a/crates/fhir/tests/data/R5/familymemberhistory-example-mother.json b/crates/fhir/tests/data/json/R5/familymemberhistory-example-mother.json similarity index 100% rename from crates/fhir/tests/data/R5/familymemberhistory-example-mother.json rename to crates/fhir/tests/data/json/R5/familymemberhistory-example-mother.json diff --git a/crates/fhir/tests/data/R5/familymemberhistory-example-negation.json b/crates/fhir/tests/data/json/R5/familymemberhistory-example-negation.json similarity index 100% rename from crates/fhir/tests/data/R5/familymemberhistory-example-negation.json rename to crates/fhir/tests/data/json/R5/familymemberhistory-example-negation.json diff --git a/crates/fhir/tests/data/R5/familymemberhistory-example.json b/crates/fhir/tests/data/json/R5/familymemberhistory-example.json similarity index 100% rename from crates/fhir/tests/data/R5/familymemberhistory-example.json rename to crates/fhir/tests/data/json/R5/familymemberhistory-example.json diff --git a/crates/fhir/tests/data/R5/familymemberhistory-genetic-questionnaire.json b/crates/fhir/tests/data/json/R5/familymemberhistory-genetic-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/familymemberhistory-genetic-questionnaire.json rename to crates/fhir/tests/data/json/R5/familymemberhistory-genetic-questionnaire.json diff --git a/crates/fhir/tests/data/R5/familymemberhistory-genetic.profile.json b/crates/fhir/tests/data/json/R5/familymemberhistory-genetic.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/familymemberhistory-genetic.profile.json rename to crates/fhir/tests/data/json/R5/familymemberhistory-genetic.profile.json diff --git a/crates/fhir/tests/data/R5/familymemberhistory-questionnaire.json b/crates/fhir/tests/data/json/R5/familymemberhistory-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/familymemberhistory-questionnaire.json rename to crates/fhir/tests/data/json/R5/familymemberhistory-questionnaire.json diff --git a/crates/fhir/tests/data/R5/familymemberhistory.profile.json b/crates/fhir/tests/data/json/R5/familymemberhistory.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/familymemberhistory.profile.json rename to crates/fhir/tests/data/json/R5/familymemberhistory.profile.json diff --git a/crates/fhir/tests/data/R5/fhirpathlibrary-questionnaire.json b/crates/fhir/tests/data/json/R5/fhirpathlibrary-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/fhirpathlibrary-questionnaire.json rename to crates/fhir/tests/data/json/R5/fhirpathlibrary-questionnaire.json diff --git a/crates/fhir/tests/data/R5/fhirpathlibrary.profile.json b/crates/fhir/tests/data/json/R5/fhirpathlibrary.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/fhirpathlibrary.profile.json rename to crates/fhir/tests/data/json/R5/fhirpathlibrary.profile.json diff --git a/crates/fhir/tests/data/R5/fivews.json b/crates/fhir/tests/data/json/R5/fivews.json similarity index 100% rename from crates/fhir/tests/data/R5/fivews.json rename to crates/fhir/tests/data/json/R5/fivews.json diff --git a/crates/fhir/tests/data/R5/flag-example-encounter.json b/crates/fhir/tests/data/json/R5/flag-example-encounter.json similarity index 100% rename from crates/fhir/tests/data/R5/flag-example-encounter.json rename to crates/fhir/tests/data/json/R5/flag-example-encounter.json diff --git a/crates/fhir/tests/data/R5/flag-example.json b/crates/fhir/tests/data/json/R5/flag-example.json similarity index 100% rename from crates/fhir/tests/data/R5/flag-example.json rename to crates/fhir/tests/data/json/R5/flag-example.json diff --git a/crates/fhir/tests/data/R5/flag-questionnaire.json b/crates/fhir/tests/data/json/R5/flag-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/flag-questionnaire.json rename to crates/fhir/tests/data/json/R5/flag-questionnaire.json diff --git a/crates/fhir/tests/data/R5/flag.profile.json b/crates/fhir/tests/data/json/R5/flag.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/flag.profile.json rename to crates/fhir/tests/data/json/R5/flag.profile.json diff --git a/crates/fhir/tests/data/R5/formularyitem-questionnaire.json b/crates/fhir/tests/data/json/R5/formularyitem-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/formularyitem-questionnaire.json rename to crates/fhir/tests/data/json/R5/formularyitem-questionnaire.json diff --git a/crates/fhir/tests/data/R5/formularyitem.profile.json b/crates/fhir/tests/data/json/R5/formularyitem.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/formularyitem.profile.json rename to crates/fhir/tests/data/json/R5/formularyitem.profile.json diff --git a/crates/fhir/tests/data/R5/formularyitemexample01.json b/crates/fhir/tests/data/json/R5/formularyitemexample01.json similarity index 100% rename from crates/fhir/tests/data/R5/formularyitemexample01.json rename to crates/fhir/tests/data/json/R5/formularyitemexample01.json diff --git a/crates/fhir/tests/data/R5/genomicstudy-example-lungMass.json b/crates/fhir/tests/data/json/R5/genomicstudy-example-lungMass.json similarity index 100% rename from crates/fhir/tests/data/R5/genomicstudy-example-lungMass.json rename to crates/fhir/tests/data/json/R5/genomicstudy-example-lungMass.json diff --git a/crates/fhir/tests/data/R5/genomicstudy-example-trio2.json b/crates/fhir/tests/data/json/R5/genomicstudy-example-trio2.json similarity index 100% rename from crates/fhir/tests/data/R5/genomicstudy-example-trio2.json rename to crates/fhir/tests/data/json/R5/genomicstudy-example-trio2.json diff --git a/crates/fhir/tests/data/R5/genomicstudy-example.json b/crates/fhir/tests/data/json/R5/genomicstudy-example.json similarity index 100% rename from crates/fhir/tests/data/R5/genomicstudy-example.json rename to crates/fhir/tests/data/json/R5/genomicstudy-example.json diff --git a/crates/fhir/tests/data/R5/genomicstudy-questionnaire.json b/crates/fhir/tests/data/json/R5/genomicstudy-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/genomicstudy-questionnaire.json rename to crates/fhir/tests/data/json/R5/genomicstudy-questionnaire.json diff --git a/crates/fhir/tests/data/R5/genomicstudy.profile.json b/crates/fhir/tests/data/json/R5/genomicstudy.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/genomicstudy.profile.json rename to crates/fhir/tests/data/json/R5/genomicstudy.profile.json diff --git a/crates/fhir/tests/data/R5/goal-example-stop-smoking.json b/crates/fhir/tests/data/json/R5/goal-example-stop-smoking.json similarity index 100% rename from crates/fhir/tests/data/R5/goal-example-stop-smoking.json rename to crates/fhir/tests/data/json/R5/goal-example-stop-smoking.json diff --git a/crates/fhir/tests/data/R5/goal-example.json b/crates/fhir/tests/data/json/R5/goal-example.json similarity index 100% rename from crates/fhir/tests/data/R5/goal-example.json rename to crates/fhir/tests/data/json/R5/goal-example.json diff --git a/crates/fhir/tests/data/R5/goal-questionnaire.json b/crates/fhir/tests/data/json/R5/goal-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/goal-questionnaire.json rename to crates/fhir/tests/data/json/R5/goal-questionnaire.json diff --git a/crates/fhir/tests/data/R5/goal.profile.json b/crates/fhir/tests/data/json/R5/goal.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/goal.profile.json rename to crates/fhir/tests/data/json/R5/goal.profile.json diff --git a/crates/fhir/tests/data/R5/graphdefinition-example.json b/crates/fhir/tests/data/json/R5/graphdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R5/graphdefinition-example.json rename to crates/fhir/tests/data/json/R5/graphdefinition-example.json diff --git a/crates/fhir/tests/data/R5/graphdefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/graphdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/graphdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/graphdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/graphdefinition.profile.json b/crates/fhir/tests/data/json/R5/graphdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/graphdefinition.profile.json rename to crates/fhir/tests/data/json/R5/graphdefinition.profile.json diff --git a/crates/fhir/tests/data/R5/group-example-herd1.json b/crates/fhir/tests/data/json/R5/group-example-herd1.json similarity index 100% rename from crates/fhir/tests/data/R5/group-example-herd1.json rename to crates/fhir/tests/data/json/R5/group-example-herd1.json diff --git a/crates/fhir/tests/data/R5/group-example-member.json b/crates/fhir/tests/data/json/R5/group-example-member.json similarity index 100% rename from crates/fhir/tests/data/R5/group-example-member.json rename to crates/fhir/tests/data/json/R5/group-example-member.json diff --git a/crates/fhir/tests/data/R5/group-example-patientlist.json b/crates/fhir/tests/data/json/R5/group-example-patientlist.json similarity index 100% rename from crates/fhir/tests/data/R5/group-example-patientlist.json rename to crates/fhir/tests/data/json/R5/group-example-patientlist.json diff --git a/crates/fhir/tests/data/R5/group-example.json b/crates/fhir/tests/data/json/R5/group-example.json similarity index 100% rename from crates/fhir/tests/data/R5/group-example.json rename to crates/fhir/tests/data/json/R5/group-example.json diff --git a/crates/fhir/tests/data/R5/group-questionnaire.json b/crates/fhir/tests/data/json/R5/group-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/group-questionnaire.json rename to crates/fhir/tests/data/json/R5/group-questionnaire.json diff --git a/crates/fhir/tests/data/R5/group.profile.json b/crates/fhir/tests/data/json/R5/group.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/group.profile.json rename to crates/fhir/tests/data/json/R5/group.profile.json diff --git a/crates/fhir/tests/data/R5/groupdefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/groupdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/groupdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/groupdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/groupdefinition.profile.json b/crates/fhir/tests/data/json/R5/groupdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/groupdefinition.profile.json rename to crates/fhir/tests/data/json/R5/groupdefinition.profile.json diff --git a/crates/fhir/tests/data/R5/guidanceresponse-additional-data-example.json b/crates/fhir/tests/data/json/R5/guidanceresponse-additional-data-example.json similarity index 100% rename from crates/fhir/tests/data/R5/guidanceresponse-additional-data-example.json rename to crates/fhir/tests/data/json/R5/guidanceresponse-additional-data-example.json diff --git a/crates/fhir/tests/data/R5/guidanceresponse-example.json b/crates/fhir/tests/data/json/R5/guidanceresponse-example.json similarity index 100% rename from crates/fhir/tests/data/R5/guidanceresponse-example.json rename to crates/fhir/tests/data/json/R5/guidanceresponse-example.json diff --git a/crates/fhir/tests/data/R5/guidanceresponse-questionnaire.json b/crates/fhir/tests/data/json/R5/guidanceresponse-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/guidanceresponse-questionnaire.json rename to crates/fhir/tests/data/json/R5/guidanceresponse-questionnaire.json diff --git a/crates/fhir/tests/data/R5/guidanceresponse.profile.json b/crates/fhir/tests/data/json/R5/guidanceresponse.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/guidanceresponse.profile.json rename to crates/fhir/tests/data/json/R5/guidanceresponse.profile.json diff --git a/crates/fhir/tests/data/R5/hdlcholesterol-questionnaire.json b/crates/fhir/tests/data/json/R5/hdlcholesterol-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/hdlcholesterol-questionnaire.json rename to crates/fhir/tests/data/json/R5/hdlcholesterol-questionnaire.json diff --git a/crates/fhir/tests/data/R5/hdlcholesterol.profile.json b/crates/fhir/tests/data/json/R5/hdlcholesterol.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/hdlcholesterol.profile.json rename to crates/fhir/tests/data/json/R5/hdlcholesterol.profile.json diff --git a/crates/fhir/tests/data/R5/headcircum-questionnaire.json b/crates/fhir/tests/data/json/R5/headcircum-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/headcircum-questionnaire.json rename to crates/fhir/tests/data/json/R5/headcircum-questionnaire.json diff --git a/crates/fhir/tests/data/R5/headcircum.profile.json b/crates/fhir/tests/data/json/R5/headcircum.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/headcircum.profile.json rename to crates/fhir/tests/data/json/R5/headcircum.profile.json diff --git a/crates/fhir/tests/data/R5/healthcareservice-example.json b/crates/fhir/tests/data/json/R5/healthcareservice-example.json similarity index 100% rename from crates/fhir/tests/data/R5/healthcareservice-example.json rename to crates/fhir/tests/data/json/R5/healthcareservice-example.json diff --git a/crates/fhir/tests/data/R5/healthcareservice-questionnaire.json b/crates/fhir/tests/data/json/R5/healthcareservice-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/healthcareservice-questionnaire.json rename to crates/fhir/tests/data/json/R5/healthcareservice-questionnaire.json diff --git a/crates/fhir/tests/data/R5/healthcareservice.profile.json b/crates/fhir/tests/data/json/R5/healthcareservice.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/healthcareservice.profile.json rename to crates/fhir/tests/data/json/R5/healthcareservice.profile.json diff --git a/crates/fhir/tests/data/R5/heartrate-questionnaire.json b/crates/fhir/tests/data/json/R5/heartrate-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/heartrate-questionnaire.json rename to crates/fhir/tests/data/json/R5/heartrate-questionnaire.json diff --git a/crates/fhir/tests/data/R5/heartrate.profile.json b/crates/fhir/tests/data/json/R5/heartrate.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/heartrate.profile.json rename to crates/fhir/tests/data/json/R5/heartrate.profile.json diff --git a/crates/fhir/tests/data/R5/history-bundle-questionnaire.json b/crates/fhir/tests/data/json/R5/history-bundle-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/history-bundle-questionnaire.json rename to crates/fhir/tests/data/json/R5/history-bundle-questionnaire.json diff --git a/crates/fhir/tests/data/R5/history-bundle.profile.json b/crates/fhir/tests/data/json/R5/history-bundle.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/history-bundle.profile.json rename to crates/fhir/tests/data/json/R5/history-bundle.profile.json diff --git a/crates/fhir/tests/data/R5/humanname.profile.json b/crates/fhir/tests/data/json/R5/humanname.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/humanname.profile.json rename to crates/fhir/tests/data/json/R5/humanname.profile.json diff --git a/crates/fhir/tests/data/R5/id.profile.json b/crates/fhir/tests/data/json/R5/id.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/id.profile.json rename to crates/fhir/tests/data/json/R5/id.profile.json diff --git a/crates/fhir/tests/data/R5/identifier.profile.json b/crates/fhir/tests/data/json/R5/identifier.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/identifier.profile.json rename to crates/fhir/tests/data/json/R5/identifier.profile.json diff --git a/crates/fhir/tests/data/R5/imagingselection-example-2d-image-region-selection.json b/crates/fhir/tests/data/json/R5/imagingselection-example-2d-image-region-selection.json similarity index 100% rename from crates/fhir/tests/data/R5/imagingselection-example-2d-image-region-selection.json rename to crates/fhir/tests/data/json/R5/imagingselection-example-2d-image-region-selection.json diff --git a/crates/fhir/tests/data/R5/imagingselection-example-3d-image-region-selection.json b/crates/fhir/tests/data/json/R5/imagingselection-example-3d-image-region-selection.json similarity index 100% rename from crates/fhir/tests/data/R5/imagingselection-example-3d-image-region-selection.json rename to crates/fhir/tests/data/json/R5/imagingselection-example-3d-image-region-selection.json diff --git a/crates/fhir/tests/data/R5/imagingselection-example-basic-image-selection.json b/crates/fhir/tests/data/json/R5/imagingselection-example-basic-image-selection.json similarity index 100% rename from crates/fhir/tests/data/R5/imagingselection-example-basic-image-selection.json rename to crates/fhir/tests/data/json/R5/imagingselection-example-basic-image-selection.json diff --git a/crates/fhir/tests/data/R5/imagingselection-example-dicom-sr-selection.json b/crates/fhir/tests/data/json/R5/imagingselection-example-dicom-sr-selection.json similarity index 100% rename from crates/fhir/tests/data/R5/imagingselection-example-dicom-sr-selection.json rename to crates/fhir/tests/data/json/R5/imagingselection-example-dicom-sr-selection.json diff --git a/crates/fhir/tests/data/R5/imagingselection-example-multiframe-image-selection.json b/crates/fhir/tests/data/json/R5/imagingselection-example-multiframe-image-selection.json similarity index 100% rename from crates/fhir/tests/data/R5/imagingselection-example-multiframe-image-selection.json rename to crates/fhir/tests/data/json/R5/imagingselection-example-multiframe-image-selection.json diff --git a/crates/fhir/tests/data/R5/imagingselection-example-presentation-state-selection.json b/crates/fhir/tests/data/json/R5/imagingselection-example-presentation-state-selection.json similarity index 100% rename from crates/fhir/tests/data/R5/imagingselection-example-presentation-state-selection.json rename to crates/fhir/tests/data/json/R5/imagingselection-example-presentation-state-selection.json diff --git a/crates/fhir/tests/data/R5/imagingselection-example-segmentation-image-selection.json b/crates/fhir/tests/data/json/R5/imagingselection-example-segmentation-image-selection.json similarity index 100% rename from crates/fhir/tests/data/R5/imagingselection-example-segmentation-image-selection.json rename to crates/fhir/tests/data/json/R5/imagingselection-example-segmentation-image-selection.json diff --git a/crates/fhir/tests/data/R5/imagingselection-questionnaire.json b/crates/fhir/tests/data/json/R5/imagingselection-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/imagingselection-questionnaire.json rename to crates/fhir/tests/data/json/R5/imagingselection-questionnaire.json diff --git a/crates/fhir/tests/data/R5/imagingselection.profile.json b/crates/fhir/tests/data/json/R5/imagingselection.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/imagingselection.profile.json rename to crates/fhir/tests/data/json/R5/imagingselection.profile.json diff --git a/crates/fhir/tests/data/R5/imagingstudy-example-xr.json b/crates/fhir/tests/data/json/R5/imagingstudy-example-xr.json similarity index 100% rename from crates/fhir/tests/data/R5/imagingstudy-example-xr.json rename to crates/fhir/tests/data/json/R5/imagingstudy-example-xr.json diff --git a/crates/fhir/tests/data/R5/imagingstudy-example.json b/crates/fhir/tests/data/json/R5/imagingstudy-example.json similarity index 100% rename from crates/fhir/tests/data/R5/imagingstudy-example.json rename to crates/fhir/tests/data/json/R5/imagingstudy-example.json diff --git a/crates/fhir/tests/data/R5/imagingstudy-questionnaire.json b/crates/fhir/tests/data/json/R5/imagingstudy-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/imagingstudy-questionnaire.json rename to crates/fhir/tests/data/json/R5/imagingstudy-questionnaire.json diff --git a/crates/fhir/tests/data/R5/imagingstudy.profile.json b/crates/fhir/tests/data/json/R5/imagingstudy.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/imagingstudy.profile.json rename to crates/fhir/tests/data/json/R5/imagingstudy.profile.json diff --git a/crates/fhir/tests/data/R5/immunization-example-historical.json b/crates/fhir/tests/data/json/R5/immunization-example-historical.json similarity index 100% rename from crates/fhir/tests/data/R5/immunization-example-historical.json rename to crates/fhir/tests/data/json/R5/immunization-example-historical.json diff --git a/crates/fhir/tests/data/R5/immunization-example-protocol.json b/crates/fhir/tests/data/json/R5/immunization-example-protocol.json similarity index 100% rename from crates/fhir/tests/data/R5/immunization-example-protocol.json rename to crates/fhir/tests/data/json/R5/immunization-example-protocol.json diff --git a/crates/fhir/tests/data/R5/immunization-example-reaction.json b/crates/fhir/tests/data/json/R5/immunization-example-reaction.json similarity index 100% rename from crates/fhir/tests/data/R5/immunization-example-reaction.json rename to crates/fhir/tests/data/json/R5/immunization-example-reaction.json diff --git a/crates/fhir/tests/data/R5/immunization-example-refused.json b/crates/fhir/tests/data/json/R5/immunization-example-refused.json similarity index 100% rename from crates/fhir/tests/data/R5/immunization-example-refused.json rename to crates/fhir/tests/data/json/R5/immunization-example-refused.json diff --git a/crates/fhir/tests/data/R5/immunization-example-subpotent.json b/crates/fhir/tests/data/json/R5/immunization-example-subpotent.json similarity index 100% rename from crates/fhir/tests/data/R5/immunization-example-subpotent.json rename to crates/fhir/tests/data/json/R5/immunization-example-subpotent.json diff --git a/crates/fhir/tests/data/R5/immunization-example.json b/crates/fhir/tests/data/json/R5/immunization-example.json similarity index 100% rename from crates/fhir/tests/data/R5/immunization-example.json rename to crates/fhir/tests/data/json/R5/immunization-example.json diff --git a/crates/fhir/tests/data/R5/immunization-questionnaire.json b/crates/fhir/tests/data/json/R5/immunization-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/immunization-questionnaire.json rename to crates/fhir/tests/data/json/R5/immunization-questionnaire.json diff --git a/crates/fhir/tests/data/R5/immunization.profile.json b/crates/fhir/tests/data/json/R5/immunization.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/immunization.profile.json rename to crates/fhir/tests/data/json/R5/immunization.profile.json diff --git a/crates/fhir/tests/data/R5/immunizationevaluation-example-notvalid.json b/crates/fhir/tests/data/json/R5/immunizationevaluation-example-notvalid.json similarity index 100% rename from crates/fhir/tests/data/R5/immunizationevaluation-example-notvalid.json rename to crates/fhir/tests/data/json/R5/immunizationevaluation-example-notvalid.json diff --git a/crates/fhir/tests/data/R5/immunizationevaluation-example.json b/crates/fhir/tests/data/json/R5/immunizationevaluation-example.json similarity index 100% rename from crates/fhir/tests/data/R5/immunizationevaluation-example.json rename to crates/fhir/tests/data/json/R5/immunizationevaluation-example.json diff --git a/crates/fhir/tests/data/R5/immunizationevaluation-questionnaire.json b/crates/fhir/tests/data/json/R5/immunizationevaluation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/immunizationevaluation-questionnaire.json rename to crates/fhir/tests/data/json/R5/immunizationevaluation-questionnaire.json diff --git a/crates/fhir/tests/data/R5/immunizationevaluation.profile.json b/crates/fhir/tests/data/json/R5/immunizationevaluation.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/immunizationevaluation.profile.json rename to crates/fhir/tests/data/json/R5/immunizationevaluation.profile.json diff --git a/crates/fhir/tests/data/R5/immunizationrecommendation-example-target-disease.json b/crates/fhir/tests/data/json/R5/immunizationrecommendation-example-target-disease.json similarity index 100% rename from crates/fhir/tests/data/R5/immunizationrecommendation-example-target-disease.json rename to crates/fhir/tests/data/json/R5/immunizationrecommendation-example-target-disease.json diff --git a/crates/fhir/tests/data/R5/immunizationrecommendation-example.json b/crates/fhir/tests/data/json/R5/immunizationrecommendation-example.json similarity index 100% rename from crates/fhir/tests/data/R5/immunizationrecommendation-example.json rename to crates/fhir/tests/data/json/R5/immunizationrecommendation-example.json diff --git a/crates/fhir/tests/data/R5/immunizationrecommendation-questionnaire.json b/crates/fhir/tests/data/json/R5/immunizationrecommendation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/immunizationrecommendation-questionnaire.json rename to crates/fhir/tests/data/json/R5/immunizationrecommendation-questionnaire.json diff --git a/crates/fhir/tests/data/R5/immunizationrecommendation.profile.json b/crates/fhir/tests/data/json/R5/immunizationrecommendation.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/immunizationrecommendation.profile.json rename to crates/fhir/tests/data/json/R5/immunizationrecommendation.profile.json diff --git a/crates/fhir/tests/data/R5/implementationguide-example.json b/crates/fhir/tests/data/json/R5/implementationguide-example.json similarity index 100% rename from crates/fhir/tests/data/R5/implementationguide-example.json rename to crates/fhir/tests/data/json/R5/implementationguide-example.json diff --git a/crates/fhir/tests/data/R5/implementationguide-questionnaire.json b/crates/fhir/tests/data/json/R5/implementationguide-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/implementationguide-questionnaire.json rename to crates/fhir/tests/data/json/R5/implementationguide-questionnaire.json diff --git a/crates/fhir/tests/data/R5/implementationguide.profile.json b/crates/fhir/tests/data/json/R5/implementationguide.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/implementationguide.profile.json rename to crates/fhir/tests/data/json/R5/implementationguide.profile.json diff --git a/crates/fhir/tests/data/R5/ingredient-example-strength-repeat.json b/crates/fhir/tests/data/json/R5/ingredient-example-strength-repeat.json similarity index 100% rename from crates/fhir/tests/data/R5/ingredient-example-strength-repeat.json rename to crates/fhir/tests/data/json/R5/ingredient-example-strength-repeat.json diff --git a/crates/fhir/tests/data/R5/ingredient-example.json b/crates/fhir/tests/data/json/R5/ingredient-example.json similarity index 100% rename from crates/fhir/tests/data/R5/ingredient-example.json rename to crates/fhir/tests/data/json/R5/ingredient-example.json diff --git a/crates/fhir/tests/data/R5/ingredient-questionnaire.json b/crates/fhir/tests/data/json/R5/ingredient-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/ingredient-questionnaire.json rename to crates/fhir/tests/data/json/R5/ingredient-questionnaire.json diff --git a/crates/fhir/tests/data/R5/ingredient.profile.json b/crates/fhir/tests/data/json/R5/ingredient.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/ingredient.profile.json rename to crates/fhir/tests/data/json/R5/ingredient.profile.json diff --git a/crates/fhir/tests/data/R5/instant.profile.json b/crates/fhir/tests/data/json/R5/instant.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/instant.profile.json rename to crates/fhir/tests/data/json/R5/instant.profile.json diff --git a/crates/fhir/tests/data/R5/insuranceplan-example.json b/crates/fhir/tests/data/json/R5/insuranceplan-example.json similarity index 100% rename from crates/fhir/tests/data/R5/insuranceplan-example.json rename to crates/fhir/tests/data/json/R5/insuranceplan-example.json diff --git a/crates/fhir/tests/data/R5/insuranceplan-questionnaire.json b/crates/fhir/tests/data/json/R5/insuranceplan-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/insuranceplan-questionnaire.json rename to crates/fhir/tests/data/json/R5/insuranceplan-questionnaire.json diff --git a/crates/fhir/tests/data/R5/insuranceplan.profile.json b/crates/fhir/tests/data/json/R5/insuranceplan.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/insuranceplan.profile.json rename to crates/fhir/tests/data/json/R5/insuranceplan.profile.json diff --git a/crates/fhir/tests/data/R5/integer.profile.json b/crates/fhir/tests/data/json/R5/integer.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/integer.profile.json rename to crates/fhir/tests/data/json/R5/integer.profile.json diff --git a/crates/fhir/tests/data/R5/integer64.profile.json b/crates/fhir/tests/data/json/R5/integer64.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/integer64.profile.json rename to crates/fhir/tests/data/json/R5/integer64.profile.json diff --git a/crates/fhir/tests/data/R5/inventoryitem-example.json b/crates/fhir/tests/data/json/R5/inventoryitem-example.json similarity index 100% rename from crates/fhir/tests/data/R5/inventoryitem-example.json rename to crates/fhir/tests/data/json/R5/inventoryitem-example.json diff --git a/crates/fhir/tests/data/R5/inventoryitem-questionnaire.json b/crates/fhir/tests/data/json/R5/inventoryitem-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/inventoryitem-questionnaire.json rename to crates/fhir/tests/data/json/R5/inventoryitem-questionnaire.json diff --git a/crates/fhir/tests/data/R5/inventoryitem.profile.json b/crates/fhir/tests/data/json/R5/inventoryitem.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/inventoryitem.profile.json rename to crates/fhir/tests/data/json/R5/inventoryitem.profile.json diff --git a/crates/fhir/tests/data/R5/inventoryreport-example.json b/crates/fhir/tests/data/json/R5/inventoryreport-example.json similarity index 100% rename from crates/fhir/tests/data/R5/inventoryreport-example.json rename to crates/fhir/tests/data/json/R5/inventoryreport-example.json diff --git a/crates/fhir/tests/data/R5/inventoryreport-questionnaire.json b/crates/fhir/tests/data/json/R5/inventoryreport-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/inventoryreport-questionnaire.json rename to crates/fhir/tests/data/json/R5/inventoryreport-questionnaire.json diff --git a/crates/fhir/tests/data/R5/inventoryreport.profile.json b/crates/fhir/tests/data/json/R5/inventoryreport.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/inventoryreport.profile.json rename to crates/fhir/tests/data/json/R5/inventoryreport.profile.json diff --git a/crates/fhir/tests/data/R5/invoice-example.json b/crates/fhir/tests/data/json/R5/invoice-example.json similarity index 100% rename from crates/fhir/tests/data/R5/invoice-example.json rename to crates/fhir/tests/data/json/R5/invoice-example.json diff --git a/crates/fhir/tests/data/R5/invoice-questionnaire.json b/crates/fhir/tests/data/json/R5/invoice-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/invoice-questionnaire.json rename to crates/fhir/tests/data/json/R5/invoice-questionnaire.json diff --git a/crates/fhir/tests/data/R5/invoice.profile.json b/crates/fhir/tests/data/json/R5/invoice.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/invoice.profile.json rename to crates/fhir/tests/data/json/R5/invoice.profile.json diff --git a/crates/fhir/tests/data/R5/json-edge-cases.json b/crates/fhir/tests/data/json/R5/json-edge-cases.json similarity index 100% rename from crates/fhir/tests/data/R5/json-edge-cases.json rename to crates/fhir/tests/data/json/R5/json-edge-cases.json diff --git a/crates/fhir/tests/data/R5/krcore-observation-labresult-example-01.json b/crates/fhir/tests/data/json/R5/krcore-observation-labresult-example-01.json similarity index 100% rename from crates/fhir/tests/data/R5/krcore-observation-labresult-example-01.json rename to crates/fhir/tests/data/json/R5/krcore-observation-labresult-example-01.json diff --git a/crates/fhir/tests/data/R5/ldlcholesterol-questionnaire.json b/crates/fhir/tests/data/json/R5/ldlcholesterol-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/ldlcholesterol-questionnaire.json rename to crates/fhir/tests/data/json/R5/ldlcholesterol-questionnaire.json diff --git a/crates/fhir/tests/data/R5/ldlcholesterol.profile.json b/crates/fhir/tests/data/json/R5/ldlcholesterol.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/ldlcholesterol.profile.json rename to crates/fhir/tests/data/json/R5/ldlcholesterol.profile.json diff --git a/crates/fhir/tests/data/R5/library-cms146-example.json b/crates/fhir/tests/data/json/R5/library-cms146-example.json similarity index 100% rename from crates/fhir/tests/data/R5/library-cms146-example.json rename to crates/fhir/tests/data/json/R5/library-cms146-example.json diff --git a/crates/fhir/tests/data/R5/library-composition-example.json b/crates/fhir/tests/data/json/R5/library-composition-example.json similarity index 100% rename from crates/fhir/tests/data/R5/library-composition-example.json rename to crates/fhir/tests/data/json/R5/library-composition-example.json diff --git a/crates/fhir/tests/data/R5/library-example.json b/crates/fhir/tests/data/json/R5/library-example.json similarity index 100% rename from crates/fhir/tests/data/R5/library-example.json rename to crates/fhir/tests/data/json/R5/library-example.json diff --git a/crates/fhir/tests/data/R5/library-exclusive-breastfeeding-cds-logic.json b/crates/fhir/tests/data/json/R5/library-exclusive-breastfeeding-cds-logic.json similarity index 100% rename from crates/fhir/tests/data/R5/library-exclusive-breastfeeding-cds-logic.json rename to crates/fhir/tests/data/json/R5/library-exclusive-breastfeeding-cds-logic.json diff --git a/crates/fhir/tests/data/R5/library-exclusive-breastfeeding-cqm-logic.json b/crates/fhir/tests/data/json/R5/library-exclusive-breastfeeding-cqm-logic.json similarity index 100% rename from crates/fhir/tests/data/R5/library-exclusive-breastfeeding-cqm-logic.json rename to crates/fhir/tests/data/json/R5/library-exclusive-breastfeeding-cqm-logic.json diff --git a/crates/fhir/tests/data/R5/library-fhir-helpers.json b/crates/fhir/tests/data/json/R5/library-fhir-helpers.json similarity index 100% rename from crates/fhir/tests/data/R5/library-fhir-helpers.json rename to crates/fhir/tests/data/json/R5/library-fhir-helpers.json diff --git a/crates/fhir/tests/data/R5/library-fhir-model-definition.json b/crates/fhir/tests/data/json/R5/library-fhir-model-definition.json similarity index 100% rename from crates/fhir/tests/data/R5/library-fhir-model-definition.json rename to crates/fhir/tests/data/json/R5/library-fhir-model-definition.json diff --git a/crates/fhir/tests/data/R5/library-hiv-indicators.json b/crates/fhir/tests/data/json/R5/library-hiv-indicators.json similarity index 100% rename from crates/fhir/tests/data/R5/library-hiv-indicators.json rename to crates/fhir/tests/data/json/R5/library-hiv-indicators.json diff --git a/crates/fhir/tests/data/R5/library-mmi-suiciderisk-orderset-logic.json b/crates/fhir/tests/data/json/R5/library-mmi-suiciderisk-orderset-logic.json similarity index 100% rename from crates/fhir/tests/data/R5/library-mmi-suiciderisk-orderset-logic.json rename to crates/fhir/tests/data/json/R5/library-mmi-suiciderisk-orderset-logic.json diff --git a/crates/fhir/tests/data/R5/library-omtk-logic.json b/crates/fhir/tests/data/json/R5/library-omtk-logic.json similarity index 100% rename from crates/fhir/tests/data/R5/library-omtk-logic.json rename to crates/fhir/tests/data/json/R5/library-omtk-logic.json diff --git a/crates/fhir/tests/data/R5/library-omtk-modelinfo.json b/crates/fhir/tests/data/json/R5/library-omtk-modelinfo.json similarity index 100% rename from crates/fhir/tests/data/R5/library-omtk-modelinfo.json rename to crates/fhir/tests/data/json/R5/library-omtk-modelinfo.json diff --git a/crates/fhir/tests/data/R5/library-opioidcds-common.json b/crates/fhir/tests/data/json/R5/library-opioidcds-common.json similarity index 100% rename from crates/fhir/tests/data/R5/library-opioidcds-common.json rename to crates/fhir/tests/data/json/R5/library-opioidcds-common.json diff --git a/crates/fhir/tests/data/R5/library-opioidcds-recommendation-04.json b/crates/fhir/tests/data/json/R5/library-opioidcds-recommendation-04.json similarity index 100% rename from crates/fhir/tests/data/R5/library-opioidcds-recommendation-04.json rename to crates/fhir/tests/data/json/R5/library-opioidcds-recommendation-04.json diff --git a/crates/fhir/tests/data/R5/library-opioidcds-recommendation-05.json b/crates/fhir/tests/data/json/R5/library-opioidcds-recommendation-05.json similarity index 100% rename from crates/fhir/tests/data/R5/library-opioidcds-recommendation-05.json rename to crates/fhir/tests/data/json/R5/library-opioidcds-recommendation-05.json diff --git a/crates/fhir/tests/data/R5/library-opioidcds-recommendation-07.json b/crates/fhir/tests/data/json/R5/library-opioidcds-recommendation-07.json similarity index 100% rename from crates/fhir/tests/data/R5/library-opioidcds-recommendation-07.json rename to crates/fhir/tests/data/json/R5/library-opioidcds-recommendation-07.json diff --git a/crates/fhir/tests/data/R5/library-opioidcds-recommendation-08.json b/crates/fhir/tests/data/json/R5/library-opioidcds-recommendation-08.json similarity index 100% rename from crates/fhir/tests/data/R5/library-opioidcds-recommendation-08.json rename to crates/fhir/tests/data/json/R5/library-opioidcds-recommendation-08.json diff --git a/crates/fhir/tests/data/R5/library-opioidcds-recommendation-10.json b/crates/fhir/tests/data/json/R5/library-opioidcds-recommendation-10.json similarity index 100% rename from crates/fhir/tests/data/R5/library-opioidcds-recommendation-10.json rename to crates/fhir/tests/data/json/R5/library-opioidcds-recommendation-10.json diff --git a/crates/fhir/tests/data/R5/library-opioidcds-recommendation-11.json b/crates/fhir/tests/data/json/R5/library-opioidcds-recommendation-11.json similarity index 100% rename from crates/fhir/tests/data/R5/library-opioidcds-recommendation-11.json rename to crates/fhir/tests/data/json/R5/library-opioidcds-recommendation-11.json diff --git a/crates/fhir/tests/data/R5/library-predecessor-example.json b/crates/fhir/tests/data/json/R5/library-predecessor-example.json similarity index 100% rename from crates/fhir/tests/data/R5/library-predecessor-example.json rename to crates/fhir/tests/data/json/R5/library-predecessor-example.json diff --git a/crates/fhir/tests/data/R5/library-questionnaire.json b/crates/fhir/tests/data/json/R5/library-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/library-questionnaire.json rename to crates/fhir/tests/data/json/R5/library-questionnaire.json diff --git a/crates/fhir/tests/data/R5/library-quick-model-definition.json b/crates/fhir/tests/data/json/R5/library-quick-model-definition.json similarity index 100% rename from crates/fhir/tests/data/R5/library-quick-model-definition.json rename to crates/fhir/tests/data/json/R5/library-quick-model-definition.json diff --git a/crates/fhir/tests/data/R5/library-zika-virus-intervention-logic.json b/crates/fhir/tests/data/json/R5/library-zika-virus-intervention-logic.json similarity index 100% rename from crates/fhir/tests/data/R5/library-zika-virus-intervention-logic.json rename to crates/fhir/tests/data/json/R5/library-zika-virus-intervention-logic.json diff --git a/crates/fhir/tests/data/R5/library.profile.json b/crates/fhir/tests/data/json/R5/library.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/library.profile.json rename to crates/fhir/tests/data/json/R5/library.profile.json diff --git a/crates/fhir/tests/data/R5/linkage-example.json b/crates/fhir/tests/data/json/R5/linkage-example.json similarity index 100% rename from crates/fhir/tests/data/R5/linkage-example.json rename to crates/fhir/tests/data/json/R5/linkage-example.json diff --git a/crates/fhir/tests/data/R5/linkage-questionnaire.json b/crates/fhir/tests/data/json/R5/linkage-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/linkage-questionnaire.json rename to crates/fhir/tests/data/json/R5/linkage-questionnaire.json diff --git a/crates/fhir/tests/data/R5/linkage.profile.json b/crates/fhir/tests/data/json/R5/linkage.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/linkage.profile.json rename to crates/fhir/tests/data/json/R5/linkage.profile.json diff --git a/crates/fhir/tests/data/R5/lipidprofile-questionnaire.json b/crates/fhir/tests/data/json/R5/lipidprofile-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/lipidprofile-questionnaire.json rename to crates/fhir/tests/data/json/R5/lipidprofile-questionnaire.json diff --git a/crates/fhir/tests/data/R5/lipidprofile.profile.json b/crates/fhir/tests/data/json/R5/lipidprofile.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/lipidprofile.profile.json rename to crates/fhir/tests/data/json/R5/lipidprofile.profile.json diff --git a/crates/fhir/tests/data/R5/list-example-allergies.json b/crates/fhir/tests/data/json/R5/list-example-allergies.json similarity index 100% rename from crates/fhir/tests/data/R5/list-example-allergies.json rename to crates/fhir/tests/data/json/R5/list-example-allergies.json diff --git a/crates/fhir/tests/data/R5/list-example-double-cousin-relationship-pedigree.json b/crates/fhir/tests/data/json/R5/list-example-double-cousin-relationship-pedigree.json similarity index 100% rename from crates/fhir/tests/data/R5/list-example-double-cousin-relationship-pedigree.json rename to crates/fhir/tests/data/json/R5/list-example-double-cousin-relationship-pedigree.json diff --git a/crates/fhir/tests/data/R5/list-example-empty.json b/crates/fhir/tests/data/json/R5/list-example-empty.json similarity index 100% rename from crates/fhir/tests/data/R5/list-example-empty.json rename to crates/fhir/tests/data/json/R5/list-example-empty.json diff --git a/crates/fhir/tests/data/R5/list-example-familyhistory-f201-roel.json b/crates/fhir/tests/data/json/R5/list-example-familyhistory-f201-roel.json similarity index 100% rename from crates/fhir/tests/data/R5/list-example-familyhistory-f201-roel.json rename to crates/fhir/tests/data/json/R5/list-example-familyhistory-f201-roel.json diff --git a/crates/fhir/tests/data/R5/list-example-familyhistory-genetics-profile-annie.json b/crates/fhir/tests/data/json/R5/list-example-familyhistory-genetics-profile-annie.json similarity index 100% rename from crates/fhir/tests/data/R5/list-example-familyhistory-genetics-profile-annie.json rename to crates/fhir/tests/data/json/R5/list-example-familyhistory-genetics-profile-annie.json diff --git a/crates/fhir/tests/data/R5/list-example-familyhistory-genetics-profile.json b/crates/fhir/tests/data/json/R5/list-example-familyhistory-genetics-profile.json similarity index 100% rename from crates/fhir/tests/data/R5/list-example-familyhistory-genetics-profile.json rename to crates/fhir/tests/data/json/R5/list-example-familyhistory-genetics-profile.json diff --git a/crates/fhir/tests/data/R5/list-example-long.json b/crates/fhir/tests/data/json/R5/list-example-long.json similarity index 100% rename from crates/fhir/tests/data/R5/list-example-long.json rename to crates/fhir/tests/data/json/R5/list-example-long.json diff --git a/crates/fhir/tests/data/R5/list-example-medlist.json b/crates/fhir/tests/data/json/R5/list-example-medlist.json similarity index 100% rename from crates/fhir/tests/data/R5/list-example-medlist.json rename to crates/fhir/tests/data/json/R5/list-example-medlist.json diff --git a/crates/fhir/tests/data/R5/list-example-simple-empty.json b/crates/fhir/tests/data/json/R5/list-example-simple-empty.json similarity index 100% rename from crates/fhir/tests/data/R5/list-example-simple-empty.json rename to crates/fhir/tests/data/json/R5/list-example-simple-empty.json diff --git a/crates/fhir/tests/data/R5/list-example-xds.json b/crates/fhir/tests/data/json/R5/list-example-xds.json similarity index 100% rename from crates/fhir/tests/data/R5/list-example-xds.json rename to crates/fhir/tests/data/json/R5/list-example-xds.json diff --git a/crates/fhir/tests/data/R5/list-example.json b/crates/fhir/tests/data/json/R5/list-example.json similarity index 100% rename from crates/fhir/tests/data/R5/list-example.json rename to crates/fhir/tests/data/json/R5/list-example.json diff --git a/crates/fhir/tests/data/R5/list-questionnaire.json b/crates/fhir/tests/data/json/R5/list-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/list-questionnaire.json rename to crates/fhir/tests/data/json/R5/list-questionnaire.json diff --git a/crates/fhir/tests/data/R5/list.profile.json b/crates/fhir/tests/data/json/R5/list.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/list.profile.json rename to crates/fhir/tests/data/json/R5/list.profile.json diff --git a/crates/fhir/tests/data/R5/location-example-ambulance.json b/crates/fhir/tests/data/json/R5/location-example-ambulance.json similarity index 100% rename from crates/fhir/tests/data/R5/location-example-ambulance.json rename to crates/fhir/tests/data/json/R5/location-example-ambulance.json diff --git a/crates/fhir/tests/data/R5/location-example-hl7hq.json b/crates/fhir/tests/data/json/R5/location-example-hl7hq.json similarity index 100% rename from crates/fhir/tests/data/R5/location-example-hl7hq.json rename to crates/fhir/tests/data/json/R5/location-example-hl7hq.json diff --git a/crates/fhir/tests/data/R5/location-example-patients-home.json b/crates/fhir/tests/data/json/R5/location-example-patients-home.json similarity index 100% rename from crates/fhir/tests/data/R5/location-example-patients-home.json rename to crates/fhir/tests/data/json/R5/location-example-patients-home.json diff --git a/crates/fhir/tests/data/R5/location-example-room.json b/crates/fhir/tests/data/json/R5/location-example-room.json similarity index 100% rename from crates/fhir/tests/data/R5/location-example-room.json rename to crates/fhir/tests/data/json/R5/location-example-room.json diff --git a/crates/fhir/tests/data/R5/location-example-ukpharmacy.json b/crates/fhir/tests/data/json/R5/location-example-ukpharmacy.json similarity index 100% rename from crates/fhir/tests/data/R5/location-example-ukpharmacy.json rename to crates/fhir/tests/data/json/R5/location-example-ukpharmacy.json diff --git a/crates/fhir/tests/data/R5/location-example.json b/crates/fhir/tests/data/json/R5/location-example.json similarity index 100% rename from crates/fhir/tests/data/R5/location-example.json rename to crates/fhir/tests/data/json/R5/location-example.json diff --git a/crates/fhir/tests/data/R5/location-examples-general.json b/crates/fhir/tests/data/json/R5/location-examples-general.json similarity index 100% rename from crates/fhir/tests/data/R5/location-examples-general.json rename to crates/fhir/tests/data/json/R5/location-examples-general.json diff --git a/crates/fhir/tests/data/R5/location-questionnaire.json b/crates/fhir/tests/data/json/R5/location-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/location-questionnaire.json rename to crates/fhir/tests/data/json/R5/location-questionnaire.json diff --git a/crates/fhir/tests/data/R5/location-wash-dc-metro.json b/crates/fhir/tests/data/json/R5/location-wash-dc-metro.json similarity index 100% rename from crates/fhir/tests/data/R5/location-wash-dc-metro.json rename to crates/fhir/tests/data/json/R5/location-wash-dc-metro.json diff --git a/crates/fhir/tests/data/R5/location.profile.json b/crates/fhir/tests/data/json/R5/location.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/location.profile.json rename to crates/fhir/tests/data/json/R5/location.profile.json diff --git a/crates/fhir/tests/data/R5/logiclibrary-questionnaire.json b/crates/fhir/tests/data/json/R5/logiclibrary-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/logiclibrary-questionnaire.json rename to crates/fhir/tests/data/json/R5/logiclibrary-questionnaire.json diff --git a/crates/fhir/tests/data/R5/logiclibrary.profile.json b/crates/fhir/tests/data/json/R5/logiclibrary.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/logiclibrary.profile.json rename to crates/fhir/tests/data/json/R5/logiclibrary.profile.json diff --git a/crates/fhir/tests/data/R5/manufactureditemdefinition-example.json b/crates/fhir/tests/data/json/R5/manufactureditemdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R5/manufactureditemdefinition-example.json rename to crates/fhir/tests/data/json/R5/manufactureditemdefinition-example.json diff --git a/crates/fhir/tests/data/R5/manufactureditemdefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/manufactureditemdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/manufactureditemdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/manufactureditemdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/manufactureditemdefinition.profile.json b/crates/fhir/tests/data/json/R5/manufactureditemdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/manufactureditemdefinition.profile.json rename to crates/fhir/tests/data/json/R5/manufactureditemdefinition.profile.json diff --git a/crates/fhir/tests/data/R5/markdown.profile.json b/crates/fhir/tests/data/json/R5/markdown.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/markdown.profile.json rename to crates/fhir/tests/data/json/R5/markdown.profile.json diff --git a/crates/fhir/tests/data/R5/marketingstatus.profile.json b/crates/fhir/tests/data/json/R5/marketingstatus.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/marketingstatus.profile.json rename to crates/fhir/tests/data/json/R5/marketingstatus.profile.json diff --git a/crates/fhir/tests/data/R5/measure-cms146-example.json b/crates/fhir/tests/data/json/R5/measure-cms146-example.json similarity index 100% rename from crates/fhir/tests/data/R5/measure-cms146-example.json rename to crates/fhir/tests/data/json/R5/measure-cms146-example.json diff --git a/crates/fhir/tests/data/R5/measure-component-a-example.json b/crates/fhir/tests/data/json/R5/measure-component-a-example.json similarity index 100% rename from crates/fhir/tests/data/R5/measure-component-a-example.json rename to crates/fhir/tests/data/json/R5/measure-component-a-example.json diff --git a/crates/fhir/tests/data/R5/measure-component-b-example.json b/crates/fhir/tests/data/json/R5/measure-component-b-example.json similarity index 100% rename from crates/fhir/tests/data/R5/measure-component-b-example.json rename to crates/fhir/tests/data/json/R5/measure-component-b-example.json diff --git a/crates/fhir/tests/data/R5/measure-composite-example.json b/crates/fhir/tests/data/json/R5/measure-composite-example.json similarity index 100% rename from crates/fhir/tests/data/R5/measure-composite-example.json rename to crates/fhir/tests/data/json/R5/measure-composite-example.json diff --git a/crates/fhir/tests/data/R5/measure-exclusive-breastfeeding.json b/crates/fhir/tests/data/json/R5/measure-exclusive-breastfeeding.json similarity index 100% rename from crates/fhir/tests/data/R5/measure-exclusive-breastfeeding.json rename to crates/fhir/tests/data/json/R5/measure-exclusive-breastfeeding.json diff --git a/crates/fhir/tests/data/R5/measure-hiv-indicators.json b/crates/fhir/tests/data/json/R5/measure-hiv-indicators.json similarity index 100% rename from crates/fhir/tests/data/R5/measure-hiv-indicators.json rename to crates/fhir/tests/data/json/R5/measure-hiv-indicators.json diff --git a/crates/fhir/tests/data/R5/measure-predecessor-example.json b/crates/fhir/tests/data/json/R5/measure-predecessor-example.json similarity index 100% rename from crates/fhir/tests/data/R5/measure-predecessor-example.json rename to crates/fhir/tests/data/json/R5/measure-predecessor-example.json diff --git a/crates/fhir/tests/data/R5/measure-questionnaire.json b/crates/fhir/tests/data/json/R5/measure-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/measure-questionnaire.json rename to crates/fhir/tests/data/json/R5/measure-questionnaire.json diff --git a/crates/fhir/tests/data/R5/measure.profile.json b/crates/fhir/tests/data/json/R5/measure.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/measure.profile.json rename to crates/fhir/tests/data/json/R5/measure.profile.json diff --git a/crates/fhir/tests/data/R5/measurereport-788ca455-e11b1a59.json b/crates/fhir/tests/data/json/R5/measurereport-788ca455-e11b1a59.json similarity index 100% rename from crates/fhir/tests/data/R5/measurereport-788ca455-e11b1a59.json rename to crates/fhir/tests/data/json/R5/measurereport-788ca455-e11b1a59.json diff --git a/crates/fhir/tests/data/R5/measurereport-cms146-cat1-example.json b/crates/fhir/tests/data/json/R5/measurereport-cms146-cat1-example.json similarity index 100% rename from crates/fhir/tests/data/R5/measurereport-cms146-cat1-example.json rename to crates/fhir/tests/data/json/R5/measurereport-cms146-cat1-example.json diff --git a/crates/fhir/tests/data/R5/measurereport-cms146-cat3-example.json b/crates/fhir/tests/data/json/R5/measurereport-cms146-cat3-example.json similarity index 100% rename from crates/fhir/tests/data/R5/measurereport-cms146-cat3-example.json rename to crates/fhir/tests/data/json/R5/measurereport-cms146-cat3-example.json diff --git a/crates/fhir/tests/data/R5/measurereport-general-example.json b/crates/fhir/tests/data/json/R5/measurereport-general-example.json similarity index 100% rename from crates/fhir/tests/data/R5/measurereport-general-example.json rename to crates/fhir/tests/data/json/R5/measurereport-general-example.json diff --git a/crates/fhir/tests/data/R5/measurereport-hiv-indicators.json b/crates/fhir/tests/data/json/R5/measurereport-hiv-indicators.json similarity index 100% rename from crates/fhir/tests/data/R5/measurereport-hiv-indicators.json rename to crates/fhir/tests/data/json/R5/measurereport-hiv-indicators.json diff --git a/crates/fhir/tests/data/R5/measurereport-questionnaire.json b/crates/fhir/tests/data/json/R5/measurereport-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/measurereport-questionnaire.json rename to crates/fhir/tests/data/json/R5/measurereport-questionnaire.json diff --git a/crates/fhir/tests/data/R5/measurereport.profile.json b/crates/fhir/tests/data/json/R5/measurereport.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/measurereport.profile.json rename to crates/fhir/tests/data/json/R5/measurereport.profile.json diff --git a/crates/fhir/tests/data/R5/medication-questionnaire.json b/crates/fhir/tests/data/json/R5/medication-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/medication-questionnaire.json rename to crates/fhir/tests/data/json/R5/medication-questionnaire.json diff --git a/crates/fhir/tests/data/R5/medication.profile.json b/crates/fhir/tests/data/json/R5/medication.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/medication.profile.json rename to crates/fhir/tests/data/json/R5/medication.profile.json diff --git a/crates/fhir/tests/data/R5/medicationadministration-questionnaire.json b/crates/fhir/tests/data/json/R5/medicationadministration-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationadministration-questionnaire.json rename to crates/fhir/tests/data/json/R5/medicationadministration-questionnaire.json diff --git a/crates/fhir/tests/data/R5/medicationadministration.profile.json b/crates/fhir/tests/data/json/R5/medicationadministration.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationadministration.profile.json rename to crates/fhir/tests/data/json/R5/medicationadministration.profile.json diff --git a/crates/fhir/tests/data/R5/medicationadministration0301.json b/crates/fhir/tests/data/json/R5/medicationadministration0301.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationadministration0301.json rename to crates/fhir/tests/data/json/R5/medicationadministration0301.json diff --git a/crates/fhir/tests/data/R5/medicationadministration0302.json b/crates/fhir/tests/data/json/R5/medicationadministration0302.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationadministration0302.json rename to crates/fhir/tests/data/json/R5/medicationadministration0302.json diff --git a/crates/fhir/tests/data/R5/medicationadministration0303.json b/crates/fhir/tests/data/json/R5/medicationadministration0303.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationadministration0303.json rename to crates/fhir/tests/data/json/R5/medicationadministration0303.json diff --git a/crates/fhir/tests/data/R5/medicationadministration0304.json b/crates/fhir/tests/data/json/R5/medicationadministration0304.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationadministration0304.json rename to crates/fhir/tests/data/json/R5/medicationadministration0304.json diff --git a/crates/fhir/tests/data/R5/medicationadministration0305.json b/crates/fhir/tests/data/json/R5/medicationadministration0305.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationadministration0305.json rename to crates/fhir/tests/data/json/R5/medicationadministration0305.json diff --git a/crates/fhir/tests/data/R5/medicationadministration0306.json b/crates/fhir/tests/data/json/R5/medicationadministration0306.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationadministration0306.json rename to crates/fhir/tests/data/json/R5/medicationadministration0306.json diff --git a/crates/fhir/tests/data/R5/medicationadministration0307.json b/crates/fhir/tests/data/json/R5/medicationadministration0307.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationadministration0307.json rename to crates/fhir/tests/data/json/R5/medicationadministration0307.json diff --git a/crates/fhir/tests/data/R5/medicationadministration0308.json b/crates/fhir/tests/data/json/R5/medicationadministration0308.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationadministration0308.json rename to crates/fhir/tests/data/json/R5/medicationadministration0308.json diff --git a/crates/fhir/tests/data/R5/medicationadministration0309.json b/crates/fhir/tests/data/json/R5/medicationadministration0309.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationadministration0309.json rename to crates/fhir/tests/data/json/R5/medicationadministration0309.json diff --git a/crates/fhir/tests/data/R5/medicationadministration0310.json b/crates/fhir/tests/data/json/R5/medicationadministration0310.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationadministration0310.json rename to crates/fhir/tests/data/json/R5/medicationadministration0310.json diff --git a/crates/fhir/tests/data/R5/medicationadministration0311.json b/crates/fhir/tests/data/json/R5/medicationadministration0311.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationadministration0311.json rename to crates/fhir/tests/data/json/R5/medicationadministration0311.json diff --git a/crates/fhir/tests/data/R5/medicationadministration0312.json b/crates/fhir/tests/data/json/R5/medicationadministration0312.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationadministration0312.json rename to crates/fhir/tests/data/json/R5/medicationadministration0312.json diff --git a/crates/fhir/tests/data/R5/medicationadministration0313.json b/crates/fhir/tests/data/json/R5/medicationadministration0313.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationadministration0313.json rename to crates/fhir/tests/data/json/R5/medicationadministration0313.json diff --git a/crates/fhir/tests/data/R5/medicationadministrationexample3.json b/crates/fhir/tests/data/json/R5/medicationadministrationexample3.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationadministrationexample3.json rename to crates/fhir/tests/data/json/R5/medicationadministrationexample3.json diff --git a/crates/fhir/tests/data/R5/medicationdispense-questionnaire.json b/crates/fhir/tests/data/json/R5/medicationdispense-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense-questionnaire.json rename to crates/fhir/tests/data/json/R5/medicationdispense-questionnaire.json diff --git a/crates/fhir/tests/data/R5/medicationdispense.profile.json b/crates/fhir/tests/data/json/R5/medicationdispense.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense.profile.json rename to crates/fhir/tests/data/json/R5/medicationdispense.profile.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0301.json b/crates/fhir/tests/data/json/R5/medicationdispense0301.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0301.json rename to crates/fhir/tests/data/json/R5/medicationdispense0301.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0302.json b/crates/fhir/tests/data/json/R5/medicationdispense0302.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0302.json rename to crates/fhir/tests/data/json/R5/medicationdispense0302.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0303.json b/crates/fhir/tests/data/json/R5/medicationdispense0303.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0303.json rename to crates/fhir/tests/data/json/R5/medicationdispense0303.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0304.json b/crates/fhir/tests/data/json/R5/medicationdispense0304.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0304.json rename to crates/fhir/tests/data/json/R5/medicationdispense0304.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0305.json b/crates/fhir/tests/data/json/R5/medicationdispense0305.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0305.json rename to crates/fhir/tests/data/json/R5/medicationdispense0305.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0306.json b/crates/fhir/tests/data/json/R5/medicationdispense0306.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0306.json rename to crates/fhir/tests/data/json/R5/medicationdispense0306.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0307.json b/crates/fhir/tests/data/json/R5/medicationdispense0307.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0307.json rename to crates/fhir/tests/data/json/R5/medicationdispense0307.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0308.json b/crates/fhir/tests/data/json/R5/medicationdispense0308.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0308.json rename to crates/fhir/tests/data/json/R5/medicationdispense0308.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0309.json b/crates/fhir/tests/data/json/R5/medicationdispense0309.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0309.json rename to crates/fhir/tests/data/json/R5/medicationdispense0309.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0310.json b/crates/fhir/tests/data/json/R5/medicationdispense0310.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0310.json rename to crates/fhir/tests/data/json/R5/medicationdispense0310.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0311.json b/crates/fhir/tests/data/json/R5/medicationdispense0311.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0311.json rename to crates/fhir/tests/data/json/R5/medicationdispense0311.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0312.json b/crates/fhir/tests/data/json/R5/medicationdispense0312.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0312.json rename to crates/fhir/tests/data/json/R5/medicationdispense0312.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0313.json b/crates/fhir/tests/data/json/R5/medicationdispense0313.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0313.json rename to crates/fhir/tests/data/json/R5/medicationdispense0313.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0314.json b/crates/fhir/tests/data/json/R5/medicationdispense0314.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0314.json rename to crates/fhir/tests/data/json/R5/medicationdispense0314.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0315.json b/crates/fhir/tests/data/json/R5/medicationdispense0315.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0315.json rename to crates/fhir/tests/data/json/R5/medicationdispense0315.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0316.json b/crates/fhir/tests/data/json/R5/medicationdispense0316.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0316.json rename to crates/fhir/tests/data/json/R5/medicationdispense0316.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0317.json b/crates/fhir/tests/data/json/R5/medicationdispense0317.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0317.json rename to crates/fhir/tests/data/json/R5/medicationdispense0317.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0318.json b/crates/fhir/tests/data/json/R5/medicationdispense0318.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0318.json rename to crates/fhir/tests/data/json/R5/medicationdispense0318.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0319.json b/crates/fhir/tests/data/json/R5/medicationdispense0319.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0319.json rename to crates/fhir/tests/data/json/R5/medicationdispense0319.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0320.json b/crates/fhir/tests/data/json/R5/medicationdispense0320.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0320.json rename to crates/fhir/tests/data/json/R5/medicationdispense0320.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0321.json b/crates/fhir/tests/data/json/R5/medicationdispense0321.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0321.json rename to crates/fhir/tests/data/json/R5/medicationdispense0321.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0322.json b/crates/fhir/tests/data/json/R5/medicationdispense0322.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0322.json rename to crates/fhir/tests/data/json/R5/medicationdispense0322.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0324.json b/crates/fhir/tests/data/json/R5/medicationdispense0324.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0324.json rename to crates/fhir/tests/data/json/R5/medicationdispense0324.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0325.json b/crates/fhir/tests/data/json/R5/medicationdispense0325.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0325.json rename to crates/fhir/tests/data/json/R5/medicationdispense0325.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0326.json b/crates/fhir/tests/data/json/R5/medicationdispense0326.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0326.json rename to crates/fhir/tests/data/json/R5/medicationdispense0326.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0327.json b/crates/fhir/tests/data/json/R5/medicationdispense0327.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0327.json rename to crates/fhir/tests/data/json/R5/medicationdispense0327.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0328.json b/crates/fhir/tests/data/json/R5/medicationdispense0328.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0328.json rename to crates/fhir/tests/data/json/R5/medicationdispense0328.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0329.json b/crates/fhir/tests/data/json/R5/medicationdispense0329.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0329.json rename to crates/fhir/tests/data/json/R5/medicationdispense0329.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0330.json b/crates/fhir/tests/data/json/R5/medicationdispense0330.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0330.json rename to crates/fhir/tests/data/json/R5/medicationdispense0330.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0331.json b/crates/fhir/tests/data/json/R5/medicationdispense0331.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0331.json rename to crates/fhir/tests/data/json/R5/medicationdispense0331.json diff --git a/crates/fhir/tests/data/R5/medicationdispense0332.json b/crates/fhir/tests/data/json/R5/medicationdispense0332.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispense0332.json rename to crates/fhir/tests/data/json/R5/medicationdispense0332.json diff --git a/crates/fhir/tests/data/R5/medicationdispenseexample8.json b/crates/fhir/tests/data/json/R5/medicationdispenseexample8.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationdispenseexample8.json rename to crates/fhir/tests/data/json/R5/medicationdispenseexample8.json diff --git a/crates/fhir/tests/data/R5/medicationexample0301.json b/crates/fhir/tests/data/json/R5/medicationexample0301.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0301.json rename to crates/fhir/tests/data/json/R5/medicationexample0301.json diff --git a/crates/fhir/tests/data/R5/medicationexample0302.json b/crates/fhir/tests/data/json/R5/medicationexample0302.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0302.json rename to crates/fhir/tests/data/json/R5/medicationexample0302.json diff --git a/crates/fhir/tests/data/R5/medicationexample0303.json b/crates/fhir/tests/data/json/R5/medicationexample0303.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0303.json rename to crates/fhir/tests/data/json/R5/medicationexample0303.json diff --git a/crates/fhir/tests/data/R5/medicationexample0304.json b/crates/fhir/tests/data/json/R5/medicationexample0304.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0304.json rename to crates/fhir/tests/data/json/R5/medicationexample0304.json diff --git a/crates/fhir/tests/data/R5/medicationexample0305.json b/crates/fhir/tests/data/json/R5/medicationexample0305.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0305.json rename to crates/fhir/tests/data/json/R5/medicationexample0305.json diff --git a/crates/fhir/tests/data/R5/medicationexample0306.json b/crates/fhir/tests/data/json/R5/medicationexample0306.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0306.json rename to crates/fhir/tests/data/json/R5/medicationexample0306.json diff --git a/crates/fhir/tests/data/R5/medicationexample0307.json b/crates/fhir/tests/data/json/R5/medicationexample0307.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0307.json rename to crates/fhir/tests/data/json/R5/medicationexample0307.json diff --git a/crates/fhir/tests/data/R5/medicationexample0308.json b/crates/fhir/tests/data/json/R5/medicationexample0308.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0308.json rename to crates/fhir/tests/data/json/R5/medicationexample0308.json diff --git a/crates/fhir/tests/data/R5/medicationexample0309.json b/crates/fhir/tests/data/json/R5/medicationexample0309.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0309.json rename to crates/fhir/tests/data/json/R5/medicationexample0309.json diff --git a/crates/fhir/tests/data/R5/medicationexample0310.json b/crates/fhir/tests/data/json/R5/medicationexample0310.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0310.json rename to crates/fhir/tests/data/json/R5/medicationexample0310.json diff --git a/crates/fhir/tests/data/R5/medicationexample0311.json b/crates/fhir/tests/data/json/R5/medicationexample0311.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0311.json rename to crates/fhir/tests/data/json/R5/medicationexample0311.json diff --git a/crates/fhir/tests/data/R5/medicationexample0312.json b/crates/fhir/tests/data/json/R5/medicationexample0312.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0312.json rename to crates/fhir/tests/data/json/R5/medicationexample0312.json diff --git a/crates/fhir/tests/data/R5/medicationexample0313.json b/crates/fhir/tests/data/json/R5/medicationexample0313.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0313.json rename to crates/fhir/tests/data/json/R5/medicationexample0313.json diff --git a/crates/fhir/tests/data/R5/medicationexample0314.json b/crates/fhir/tests/data/json/R5/medicationexample0314.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0314.json rename to crates/fhir/tests/data/json/R5/medicationexample0314.json diff --git a/crates/fhir/tests/data/R5/medicationexample0315.json b/crates/fhir/tests/data/json/R5/medicationexample0315.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0315.json rename to crates/fhir/tests/data/json/R5/medicationexample0315.json diff --git a/crates/fhir/tests/data/R5/medicationexample0316.json b/crates/fhir/tests/data/json/R5/medicationexample0316.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0316.json rename to crates/fhir/tests/data/json/R5/medicationexample0316.json diff --git a/crates/fhir/tests/data/R5/medicationexample0317.json b/crates/fhir/tests/data/json/R5/medicationexample0317.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0317.json rename to crates/fhir/tests/data/json/R5/medicationexample0317.json diff --git a/crates/fhir/tests/data/R5/medicationexample0318.json b/crates/fhir/tests/data/json/R5/medicationexample0318.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0318.json rename to crates/fhir/tests/data/json/R5/medicationexample0318.json diff --git a/crates/fhir/tests/data/R5/medicationexample0319.json b/crates/fhir/tests/data/json/R5/medicationexample0319.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0319.json rename to crates/fhir/tests/data/json/R5/medicationexample0319.json diff --git a/crates/fhir/tests/data/R5/medicationexample0320.json b/crates/fhir/tests/data/json/R5/medicationexample0320.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0320.json rename to crates/fhir/tests/data/json/R5/medicationexample0320.json diff --git a/crates/fhir/tests/data/R5/medicationexample0321.json b/crates/fhir/tests/data/json/R5/medicationexample0321.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0321.json rename to crates/fhir/tests/data/json/R5/medicationexample0321.json diff --git a/crates/fhir/tests/data/R5/medicationexample0323.json b/crates/fhir/tests/data/json/R5/medicationexample0323.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample0323.json rename to crates/fhir/tests/data/json/R5/medicationexample0323.json diff --git a/crates/fhir/tests/data/R5/medicationexample1.json b/crates/fhir/tests/data/json/R5/medicationexample1.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample1.json rename to crates/fhir/tests/data/json/R5/medicationexample1.json diff --git a/crates/fhir/tests/data/R5/medicationexample15.json b/crates/fhir/tests/data/json/R5/medicationexample15.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationexample15.json rename to crates/fhir/tests/data/json/R5/medicationexample15.json diff --git a/crates/fhir/tests/data/R5/medicationknowledge-example.json b/crates/fhir/tests/data/json/R5/medicationknowledge-example.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationknowledge-example.json rename to crates/fhir/tests/data/json/R5/medicationknowledge-example.json diff --git a/crates/fhir/tests/data/R5/medicationknowledge-questionnaire.json b/crates/fhir/tests/data/json/R5/medicationknowledge-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationknowledge-questionnaire.json rename to crates/fhir/tests/data/json/R5/medicationknowledge-questionnaire.json diff --git a/crates/fhir/tests/data/R5/medicationknowledge.profile.json b/crates/fhir/tests/data/json/R5/medicationknowledge.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationknowledge.profile.json rename to crates/fhir/tests/data/json/R5/medicationknowledge.profile.json diff --git a/crates/fhir/tests/data/R5/medicationrequest-questionnaire.json b/crates/fhir/tests/data/json/R5/medicationrequest-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest-questionnaire.json rename to crates/fhir/tests/data/json/R5/medicationrequest-questionnaire.json diff --git a/crates/fhir/tests/data/R5/medicationrequest.profile.json b/crates/fhir/tests/data/json/R5/medicationrequest.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest.profile.json rename to crates/fhir/tests/data/json/R5/medicationrequest.profile.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0301.json b/crates/fhir/tests/data/json/R5/medicationrequest0301.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0301.json rename to crates/fhir/tests/data/json/R5/medicationrequest0301.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0302.json b/crates/fhir/tests/data/json/R5/medicationrequest0302.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0302.json rename to crates/fhir/tests/data/json/R5/medicationrequest0302.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0303.json b/crates/fhir/tests/data/json/R5/medicationrequest0303.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0303.json rename to crates/fhir/tests/data/json/R5/medicationrequest0303.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0304.json b/crates/fhir/tests/data/json/R5/medicationrequest0304.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0304.json rename to crates/fhir/tests/data/json/R5/medicationrequest0304.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0305.json b/crates/fhir/tests/data/json/R5/medicationrequest0305.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0305.json rename to crates/fhir/tests/data/json/R5/medicationrequest0305.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0306.json b/crates/fhir/tests/data/json/R5/medicationrequest0306.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0306.json rename to crates/fhir/tests/data/json/R5/medicationrequest0306.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0307.json b/crates/fhir/tests/data/json/R5/medicationrequest0307.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0307.json rename to crates/fhir/tests/data/json/R5/medicationrequest0307.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0308.json b/crates/fhir/tests/data/json/R5/medicationrequest0308.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0308.json rename to crates/fhir/tests/data/json/R5/medicationrequest0308.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0309.json b/crates/fhir/tests/data/json/R5/medicationrequest0309.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0309.json rename to crates/fhir/tests/data/json/R5/medicationrequest0309.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0310.json b/crates/fhir/tests/data/json/R5/medicationrequest0310.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0310.json rename to crates/fhir/tests/data/json/R5/medicationrequest0310.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0312.json b/crates/fhir/tests/data/json/R5/medicationrequest0312.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0312.json rename to crates/fhir/tests/data/json/R5/medicationrequest0312.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0313.json b/crates/fhir/tests/data/json/R5/medicationrequest0313.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0313.json rename to crates/fhir/tests/data/json/R5/medicationrequest0313.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0314.json b/crates/fhir/tests/data/json/R5/medicationrequest0314.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0314.json rename to crates/fhir/tests/data/json/R5/medicationrequest0314.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0315.json b/crates/fhir/tests/data/json/R5/medicationrequest0315.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0315.json rename to crates/fhir/tests/data/json/R5/medicationrequest0315.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0316.json b/crates/fhir/tests/data/json/R5/medicationrequest0316.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0316.json rename to crates/fhir/tests/data/json/R5/medicationrequest0316.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0317.json b/crates/fhir/tests/data/json/R5/medicationrequest0317.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0317.json rename to crates/fhir/tests/data/json/R5/medicationrequest0317.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0318.json b/crates/fhir/tests/data/json/R5/medicationrequest0318.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0318.json rename to crates/fhir/tests/data/json/R5/medicationrequest0318.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0319.json b/crates/fhir/tests/data/json/R5/medicationrequest0319.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0319.json rename to crates/fhir/tests/data/json/R5/medicationrequest0319.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0320.json b/crates/fhir/tests/data/json/R5/medicationrequest0320.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0320.json rename to crates/fhir/tests/data/json/R5/medicationrequest0320.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0321.json b/crates/fhir/tests/data/json/R5/medicationrequest0321.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0321.json rename to crates/fhir/tests/data/json/R5/medicationrequest0321.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0322.json b/crates/fhir/tests/data/json/R5/medicationrequest0322.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0322.json rename to crates/fhir/tests/data/json/R5/medicationrequest0322.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0323.json b/crates/fhir/tests/data/json/R5/medicationrequest0323.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0323.json rename to crates/fhir/tests/data/json/R5/medicationrequest0323.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0324.json b/crates/fhir/tests/data/json/R5/medicationrequest0324.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0324.json rename to crates/fhir/tests/data/json/R5/medicationrequest0324.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0325.json b/crates/fhir/tests/data/json/R5/medicationrequest0325.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0325.json rename to crates/fhir/tests/data/json/R5/medicationrequest0325.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0326.json b/crates/fhir/tests/data/json/R5/medicationrequest0326.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0326.json rename to crates/fhir/tests/data/json/R5/medicationrequest0326.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0327.json b/crates/fhir/tests/data/json/R5/medicationrequest0327.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0327.json rename to crates/fhir/tests/data/json/R5/medicationrequest0327.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0328.json b/crates/fhir/tests/data/json/R5/medicationrequest0328.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0328.json rename to crates/fhir/tests/data/json/R5/medicationrequest0328.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0329.json b/crates/fhir/tests/data/json/R5/medicationrequest0329.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0329.json rename to crates/fhir/tests/data/json/R5/medicationrequest0329.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0330.json b/crates/fhir/tests/data/json/R5/medicationrequest0330.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0330.json rename to crates/fhir/tests/data/json/R5/medicationrequest0330.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0331.json b/crates/fhir/tests/data/json/R5/medicationrequest0331.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0331.json rename to crates/fhir/tests/data/json/R5/medicationrequest0331.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0332.json b/crates/fhir/tests/data/json/R5/medicationrequest0332.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0332.json rename to crates/fhir/tests/data/json/R5/medicationrequest0332.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0333.json b/crates/fhir/tests/data/json/R5/medicationrequest0333.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0333.json rename to crates/fhir/tests/data/json/R5/medicationrequest0333.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0334.json b/crates/fhir/tests/data/json/R5/medicationrequest0334.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0334.json rename to crates/fhir/tests/data/json/R5/medicationrequest0334.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0335.json b/crates/fhir/tests/data/json/R5/medicationrequest0335.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0335.json rename to crates/fhir/tests/data/json/R5/medicationrequest0335.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0336.json b/crates/fhir/tests/data/json/R5/medicationrequest0336.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0336.json rename to crates/fhir/tests/data/json/R5/medicationrequest0336.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0337.json b/crates/fhir/tests/data/json/R5/medicationrequest0337.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0337.json rename to crates/fhir/tests/data/json/R5/medicationrequest0337.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0338.json b/crates/fhir/tests/data/json/R5/medicationrequest0338.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0338.json rename to crates/fhir/tests/data/json/R5/medicationrequest0338.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0339.json b/crates/fhir/tests/data/json/R5/medicationrequest0339.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0339.json rename to crates/fhir/tests/data/json/R5/medicationrequest0339.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0343a.json b/crates/fhir/tests/data/json/R5/medicationrequest0343a.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0343a.json rename to crates/fhir/tests/data/json/R5/medicationrequest0343a.json diff --git a/crates/fhir/tests/data/R5/medicationrequest0343b.json b/crates/fhir/tests/data/json/R5/medicationrequest0343b.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequest0343b.json rename to crates/fhir/tests/data/json/R5/medicationrequest0343b.json diff --git a/crates/fhir/tests/data/R5/medicationrequestexample1.json b/crates/fhir/tests/data/json/R5/medicationrequestexample1.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequestexample1.json rename to crates/fhir/tests/data/json/R5/medicationrequestexample1.json diff --git a/crates/fhir/tests/data/R5/medicationrequestexample2.json b/crates/fhir/tests/data/json/R5/medicationrequestexample2.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequestexample2.json rename to crates/fhir/tests/data/json/R5/medicationrequestexample2.json diff --git a/crates/fhir/tests/data/R5/medicationrequestexample3.json b/crates/fhir/tests/data/json/R5/medicationrequestexample3.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequestexample3.json rename to crates/fhir/tests/data/json/R5/medicationrequestexample3.json diff --git a/crates/fhir/tests/data/R5/medicationrequestexample4.json b/crates/fhir/tests/data/json/R5/medicationrequestexample4.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationrequestexample4.json rename to crates/fhir/tests/data/json/R5/medicationrequestexample4.json diff --git a/crates/fhir/tests/data/R5/medicationstatement-questionnaire.json b/crates/fhir/tests/data/json/R5/medicationstatement-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationstatement-questionnaire.json rename to crates/fhir/tests/data/json/R5/medicationstatement-questionnaire.json diff --git a/crates/fhir/tests/data/R5/medicationstatement.profile.json b/crates/fhir/tests/data/json/R5/medicationstatement.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationstatement.profile.json rename to crates/fhir/tests/data/json/R5/medicationstatement.profile.json diff --git a/crates/fhir/tests/data/R5/medicationstatementexample1.json b/crates/fhir/tests/data/json/R5/medicationstatementexample1.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationstatementexample1.json rename to crates/fhir/tests/data/json/R5/medicationstatementexample1.json diff --git a/crates/fhir/tests/data/R5/medicationstatementexample2.json b/crates/fhir/tests/data/json/R5/medicationstatementexample2.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationstatementexample2.json rename to crates/fhir/tests/data/json/R5/medicationstatementexample2.json diff --git a/crates/fhir/tests/data/R5/medicationstatementexample3.json b/crates/fhir/tests/data/json/R5/medicationstatementexample3.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationstatementexample3.json rename to crates/fhir/tests/data/json/R5/medicationstatementexample3.json diff --git a/crates/fhir/tests/data/R5/medicationstatementexample4.json b/crates/fhir/tests/data/json/R5/medicationstatementexample4.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationstatementexample4.json rename to crates/fhir/tests/data/json/R5/medicationstatementexample4.json diff --git a/crates/fhir/tests/data/R5/medicationstatementexample5.json b/crates/fhir/tests/data/json/R5/medicationstatementexample5.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationstatementexample5.json rename to crates/fhir/tests/data/json/R5/medicationstatementexample5.json diff --git a/crates/fhir/tests/data/R5/medicationstatementexample6.json b/crates/fhir/tests/data/json/R5/medicationstatementexample6.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationstatementexample6.json rename to crates/fhir/tests/data/json/R5/medicationstatementexample6.json diff --git a/crates/fhir/tests/data/R5/medicationstatementexample7.json b/crates/fhir/tests/data/json/R5/medicationstatementexample7.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationstatementexample7.json rename to crates/fhir/tests/data/json/R5/medicationstatementexample7.json diff --git a/crates/fhir/tests/data/R5/medicationstatementexample8.json b/crates/fhir/tests/data/json/R5/medicationstatementexample8.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationstatementexample8.json rename to crates/fhir/tests/data/json/R5/medicationstatementexample8.json diff --git a/crates/fhir/tests/data/R5/medicationstatementexample9.json b/crates/fhir/tests/data/json/R5/medicationstatementexample9.json similarity index 100% rename from crates/fhir/tests/data/R5/medicationstatementexample9.json rename to crates/fhir/tests/data/json/R5/medicationstatementexample9.json diff --git a/crates/fhir/tests/data/R5/medicinalproductdefinition-acetaminophen-500mg-tablets-box-of-20.json b/crates/fhir/tests/data/json/R5/medicinalproductdefinition-acetaminophen-500mg-tablets-box-of-20.json similarity index 100% rename from crates/fhir/tests/data/R5/medicinalproductdefinition-acetaminophen-500mg-tablets-box-of-20.json rename to crates/fhir/tests/data/json/R5/medicinalproductdefinition-acetaminophen-500mg-tablets-box-of-20.json diff --git a/crates/fhir/tests/data/R5/medicinalproductdefinition-example-co-packaged-liquid-and-syringe-complete.json b/crates/fhir/tests/data/json/R5/medicinalproductdefinition-example-co-packaged-liquid-and-syringe-complete.json similarity index 100% rename from crates/fhir/tests/data/R5/medicinalproductdefinition-example-co-packaged-liquid-and-syringe-complete.json rename to crates/fhir/tests/data/json/R5/medicinalproductdefinition-example-co-packaged-liquid-and-syringe-complete.json diff --git a/crates/fhir/tests/data/R5/medicinalproductdefinition-example-co-packaged-liquid-and-syringe.json b/crates/fhir/tests/data/json/R5/medicinalproductdefinition-example-co-packaged-liquid-and-syringe.json similarity index 100% rename from crates/fhir/tests/data/R5/medicinalproductdefinition-example-co-packaged-liquid-and-syringe.json rename to crates/fhir/tests/data/json/R5/medicinalproductdefinition-example-co-packaged-liquid-and-syringe.json diff --git a/crates/fhir/tests/data/R5/medicinalproductdefinition-example-combo-product-bundle.json b/crates/fhir/tests/data/json/R5/medicinalproductdefinition-example-combo-product-bundle.json similarity index 100% rename from crates/fhir/tests/data/R5/medicinalproductdefinition-example-combo-product-bundle.json rename to crates/fhir/tests/data/json/R5/medicinalproductdefinition-example-combo-product-bundle.json diff --git a/crates/fhir/tests/data/R5/medicinalproductdefinition-example-combo-product.json b/crates/fhir/tests/data/json/R5/medicinalproductdefinition-example-combo-product.json similarity index 100% rename from crates/fhir/tests/data/R5/medicinalproductdefinition-example-combo-product.json rename to crates/fhir/tests/data/json/R5/medicinalproductdefinition-example-combo-product.json diff --git a/crates/fhir/tests/data/R5/medicinalproductdefinition-example-equilidem-basics.json b/crates/fhir/tests/data/json/R5/medicinalproductdefinition-example-equilidem-basics.json similarity index 100% rename from crates/fhir/tests/data/R5/medicinalproductdefinition-example-equilidem-basics.json rename to crates/fhir/tests/data/json/R5/medicinalproductdefinition-example-equilidem-basics.json diff --git a/crates/fhir/tests/data/R5/medicinalproductdefinition-example-equilidem-using-ingredient-and-auth.json b/crates/fhir/tests/data/json/R5/medicinalproductdefinition-example-equilidem-using-ingredient-and-auth.json similarity index 100% rename from crates/fhir/tests/data/R5/medicinalproductdefinition-example-equilidem-using-ingredient-and-auth.json rename to crates/fhir/tests/data/json/R5/medicinalproductdefinition-example-equilidem-using-ingredient-and-auth.json diff --git a/crates/fhir/tests/data/R5/medicinalproductdefinition-example.json b/crates/fhir/tests/data/json/R5/medicinalproductdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R5/medicinalproductdefinition-example.json rename to crates/fhir/tests/data/json/R5/medicinalproductdefinition-example.json diff --git a/crates/fhir/tests/data/R5/medicinalproductdefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/medicinalproductdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/medicinalproductdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/medicinalproductdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/medicinalproductdefinition-with-contained-package-and-ingredient.json b/crates/fhir/tests/data/json/R5/medicinalproductdefinition-with-contained-package-and-ingredient.json similarity index 100% rename from crates/fhir/tests/data/R5/medicinalproductdefinition-with-contained-package-and-ingredient.json rename to crates/fhir/tests/data/json/R5/medicinalproductdefinition-with-contained-package-and-ingredient.json diff --git a/crates/fhir/tests/data/R5/medicinalproductdefinition.profile.json b/crates/fhir/tests/data/json/R5/medicinalproductdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/medicinalproductdefinition.profile.json rename to crates/fhir/tests/data/json/R5/medicinalproductdefinition.profile.json diff --git a/crates/fhir/tests/data/R5/message-request-link.json b/crates/fhir/tests/data/json/R5/message-request-link.json similarity index 100% rename from crates/fhir/tests/data/R5/message-request-link.json rename to crates/fhir/tests/data/json/R5/message-request-link.json diff --git a/crates/fhir/tests/data/R5/message-response-link.json b/crates/fhir/tests/data/json/R5/message-response-link.json similarity index 100% rename from crates/fhir/tests/data/R5/message-response-link.json rename to crates/fhir/tests/data/json/R5/message-response-link.json diff --git a/crates/fhir/tests/data/R5/messagedefinition-example.json b/crates/fhir/tests/data/json/R5/messagedefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R5/messagedefinition-example.json rename to crates/fhir/tests/data/json/R5/messagedefinition-example.json diff --git a/crates/fhir/tests/data/R5/messagedefinition-patient-link-notification.json b/crates/fhir/tests/data/json/R5/messagedefinition-patient-link-notification.json similarity index 100% rename from crates/fhir/tests/data/R5/messagedefinition-patient-link-notification.json rename to crates/fhir/tests/data/json/R5/messagedefinition-patient-link-notification.json diff --git a/crates/fhir/tests/data/R5/messagedefinition-patient-link-response.json b/crates/fhir/tests/data/json/R5/messagedefinition-patient-link-response.json similarity index 100% rename from crates/fhir/tests/data/R5/messagedefinition-patient-link-response.json rename to crates/fhir/tests/data/json/R5/messagedefinition-patient-link-response.json diff --git a/crates/fhir/tests/data/R5/messagedefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/messagedefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/messagedefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/messagedefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/messagedefinition.profile.json b/crates/fhir/tests/data/json/R5/messagedefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/messagedefinition.profile.json rename to crates/fhir/tests/data/json/R5/messagedefinition.profile.json diff --git a/crates/fhir/tests/data/R5/messageheader-example.json b/crates/fhir/tests/data/json/R5/messageheader-example.json similarity index 100% rename from crates/fhir/tests/data/R5/messageheader-example.json rename to crates/fhir/tests/data/json/R5/messageheader-example.json diff --git a/crates/fhir/tests/data/R5/messageheader-questionnaire.json b/crates/fhir/tests/data/json/R5/messageheader-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/messageheader-questionnaire.json rename to crates/fhir/tests/data/json/R5/messageheader-questionnaire.json diff --git a/crates/fhir/tests/data/R5/messageheader.profile.json b/crates/fhir/tests/data/json/R5/messageheader.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/messageheader.profile.json rename to crates/fhir/tests/data/json/R5/messageheader.profile.json diff --git a/crates/fhir/tests/data/R5/meta.profile.json b/crates/fhir/tests/data/json/R5/meta.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/meta.profile.json rename to crates/fhir/tests/data/json/R5/meta.profile.json diff --git a/crates/fhir/tests/data/R5/metadataresource.profile.json b/crates/fhir/tests/data/json/R5/metadataresource.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/metadataresource.profile.json rename to crates/fhir/tests/data/json/R5/metadataresource.profile.json diff --git a/crates/fhir/tests/data/R5/modelinfolibrary-questionnaire.json b/crates/fhir/tests/data/json/R5/modelinfolibrary-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/modelinfolibrary-questionnaire.json rename to crates/fhir/tests/data/json/R5/modelinfolibrary-questionnaire.json diff --git a/crates/fhir/tests/data/R5/modelinfolibrary.profile.json b/crates/fhir/tests/data/json/R5/modelinfolibrary.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/modelinfolibrary.profile.json rename to crates/fhir/tests/data/json/R5/modelinfolibrary.profile.json diff --git a/crates/fhir/tests/data/R5/moduledefinitionlibrary-questionnaire.json b/crates/fhir/tests/data/json/R5/moduledefinitionlibrary-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/moduledefinitionlibrary-questionnaire.json rename to crates/fhir/tests/data/json/R5/moduledefinitionlibrary-questionnaire.json diff --git a/crates/fhir/tests/data/R5/moduledefinitionlibrary.profile.json b/crates/fhir/tests/data/json/R5/moduledefinitionlibrary.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/moduledefinitionlibrary.profile.json rename to crates/fhir/tests/data/json/R5/moduledefinitionlibrary.profile.json diff --git a/crates/fhir/tests/data/R5/molecularsequence-example.json b/crates/fhir/tests/data/json/R5/molecularsequence-example.json similarity index 100% rename from crates/fhir/tests/data/R5/molecularsequence-example.json rename to crates/fhir/tests/data/json/R5/molecularsequence-example.json diff --git a/crates/fhir/tests/data/R5/molecularsequence-focus-example.json b/crates/fhir/tests/data/json/R5/molecularsequence-focus-example.json similarity index 100% rename from crates/fhir/tests/data/R5/molecularsequence-focus-example.json rename to crates/fhir/tests/data/json/R5/molecularsequence-focus-example.json diff --git a/crates/fhir/tests/data/R5/molecularsequence-questionnaire.json b/crates/fhir/tests/data/json/R5/molecularsequence-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/molecularsequence-questionnaire.json rename to crates/fhir/tests/data/json/R5/molecularsequence-questionnaire.json diff --git a/crates/fhir/tests/data/R5/molecularsequence.profile.json b/crates/fhir/tests/data/json/R5/molecularsequence.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/molecularsequence.profile.json rename to crates/fhir/tests/data/json/R5/molecularsequence.profile.json diff --git a/crates/fhir/tests/data/R5/monetarycomponent.profile.json b/crates/fhir/tests/data/json/R5/monetarycomponent.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/monetarycomponent.profile.json rename to crates/fhir/tests/data/json/R5/monetarycomponent.profile.json diff --git a/crates/fhir/tests/data/R5/money.profile.json b/crates/fhir/tests/data/json/R5/money.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/money.profile.json rename to crates/fhir/tests/data/json/R5/money.profile.json diff --git a/crates/fhir/tests/data/R5/moneyquantity.profile.json b/crates/fhir/tests/data/json/R5/moneyquantity.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/moneyquantity.profile.json rename to crates/fhir/tests/data/json/R5/moneyquantity.profile.json diff --git a/crates/fhir/tests/data/R5/namingsystem-example-id.json b/crates/fhir/tests/data/json/R5/namingsystem-example-id.json similarity index 100% rename from crates/fhir/tests/data/R5/namingsystem-example-id.json rename to crates/fhir/tests/data/json/R5/namingsystem-example-id.json diff --git a/crates/fhir/tests/data/R5/namingsystem-example-metadata-2.json b/crates/fhir/tests/data/json/R5/namingsystem-example-metadata-2.json similarity index 100% rename from crates/fhir/tests/data/R5/namingsystem-example-metadata-2.json rename to crates/fhir/tests/data/json/R5/namingsystem-example-metadata-2.json diff --git a/crates/fhir/tests/data/R5/namingsystem-example-metadata.json b/crates/fhir/tests/data/json/R5/namingsystem-example-metadata.json similarity index 100% rename from crates/fhir/tests/data/R5/namingsystem-example-metadata.json rename to crates/fhir/tests/data/json/R5/namingsystem-example-metadata.json diff --git a/crates/fhir/tests/data/R5/namingsystem-example.json b/crates/fhir/tests/data/json/R5/namingsystem-example.json similarity index 100% rename from crates/fhir/tests/data/R5/namingsystem-example.json rename to crates/fhir/tests/data/json/R5/namingsystem-example.json diff --git a/crates/fhir/tests/data/R5/namingsystem-questionnaire.json b/crates/fhir/tests/data/json/R5/namingsystem-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/namingsystem-questionnaire.json rename to crates/fhir/tests/data/json/R5/namingsystem-questionnaire.json diff --git a/crates/fhir/tests/data/R5/namingsystem-terminologies.json b/crates/fhir/tests/data/json/R5/namingsystem-terminologies.json similarity index 100% rename from crates/fhir/tests/data/R5/namingsystem-terminologies.json rename to crates/fhir/tests/data/json/R5/namingsystem-terminologies.json diff --git a/crates/fhir/tests/data/R5/namingsystem.profile.json b/crates/fhir/tests/data/json/R5/namingsystem.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/namingsystem.profile.json rename to crates/fhir/tests/data/json/R5/namingsystem.profile.json diff --git a/crates/fhir/tests/data/R5/narrative.profile.json b/crates/fhir/tests/data/json/R5/narrative.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/narrative.profile.json rename to crates/fhir/tests/data/json/R5/narrative.profile.json diff --git a/crates/fhir/tests/data/R5/notification-empty.json b/crates/fhir/tests/data/json/R5/notification-empty.json similarity index 100% rename from crates/fhir/tests/data/R5/notification-empty.json rename to crates/fhir/tests/data/json/R5/notification-empty.json diff --git a/crates/fhir/tests/data/R5/notification-error.json b/crates/fhir/tests/data/json/R5/notification-error.json similarity index 100% rename from crates/fhir/tests/data/R5/notification-error.json rename to crates/fhir/tests/data/json/R5/notification-error.json diff --git a/crates/fhir/tests/data/R5/notification-full-resource-with-patient.json b/crates/fhir/tests/data/json/R5/notification-full-resource-with-patient.json similarity index 100% rename from crates/fhir/tests/data/R5/notification-full-resource-with-patient.json rename to crates/fhir/tests/data/json/R5/notification-full-resource-with-patient.json diff --git a/crates/fhir/tests/data/R5/notification-full-resource.json b/crates/fhir/tests/data/json/R5/notification-full-resource.json similarity index 100% rename from crates/fhir/tests/data/R5/notification-full-resource.json rename to crates/fhir/tests/data/json/R5/notification-full-resource.json diff --git a/crates/fhir/tests/data/R5/notification-handshake.json b/crates/fhir/tests/data/json/R5/notification-handshake.json similarity index 100% rename from crates/fhir/tests/data/R5/notification-handshake.json rename to crates/fhir/tests/data/json/R5/notification-handshake.json diff --git a/crates/fhir/tests/data/R5/notification-heartbeat.json b/crates/fhir/tests/data/json/R5/notification-heartbeat.json similarity index 100% rename from crates/fhir/tests/data/R5/notification-heartbeat.json rename to crates/fhir/tests/data/json/R5/notification-heartbeat.json diff --git a/crates/fhir/tests/data/R5/notification-id-only-with-patient.json b/crates/fhir/tests/data/json/R5/notification-id-only-with-patient.json similarity index 100% rename from crates/fhir/tests/data/R5/notification-id-only-with-patient.json rename to crates/fhir/tests/data/json/R5/notification-id-only-with-patient.json diff --git a/crates/fhir/tests/data/R5/notification-id-only.json b/crates/fhir/tests/data/json/R5/notification-id-only.json similarity index 100% rename from crates/fhir/tests/data/R5/notification-id-only.json rename to crates/fhir/tests/data/json/R5/notification-id-only.json diff --git a/crates/fhir/tests/data/R5/notification-message-full-resource.json b/crates/fhir/tests/data/json/R5/notification-message-full-resource.json similarity index 100% rename from crates/fhir/tests/data/R5/notification-message-full-resource.json rename to crates/fhir/tests/data/json/R5/notification-message-full-resource.json diff --git a/crates/fhir/tests/data/R5/notification-query-event.json b/crates/fhir/tests/data/json/R5/notification-query-event.json similarity index 100% rename from crates/fhir/tests/data/R5/notification-query-event.json rename to crates/fhir/tests/data/json/R5/notification-query-event.json diff --git a/crates/fhir/tests/data/R5/notification-query-status.json b/crates/fhir/tests/data/json/R5/notification-query-status.json similarity index 100% rename from crates/fhir/tests/data/R5/notification-query-status.json rename to crates/fhir/tests/data/json/R5/notification-query-status.json diff --git a/crates/fhir/tests/data/R5/nutritionintake-example.json b/crates/fhir/tests/data/json/R5/nutritionintake-example.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionintake-example.json rename to crates/fhir/tests/data/json/R5/nutritionintake-example.json diff --git a/crates/fhir/tests/data/R5/nutritionintake-questionnaire.json b/crates/fhir/tests/data/json/R5/nutritionintake-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionintake-questionnaire.json rename to crates/fhir/tests/data/json/R5/nutritionintake-questionnaire.json diff --git a/crates/fhir/tests/data/R5/nutritionintake.profile.json b/crates/fhir/tests/data/json/R5/nutritionintake.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionintake.profile.json rename to crates/fhir/tests/data/json/R5/nutritionintake.profile.json diff --git a/crates/fhir/tests/data/R5/nutritionorder-example-cardiacdiet.json b/crates/fhir/tests/data/json/R5/nutritionorder-example-cardiacdiet.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionorder-example-cardiacdiet.json rename to crates/fhir/tests/data/json/R5/nutritionorder-example-cardiacdiet.json diff --git a/crates/fhir/tests/data/R5/nutritionorder-example-diabeticdiet.json b/crates/fhir/tests/data/json/R5/nutritionorder-example-diabeticdiet.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionorder-example-diabeticdiet.json rename to crates/fhir/tests/data/json/R5/nutritionorder-example-diabeticdiet.json diff --git a/crates/fhir/tests/data/R5/nutritionorder-example-diabeticsupplement.json b/crates/fhir/tests/data/json/R5/nutritionorder-example-diabeticsupplement.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionorder-example-diabeticsupplement.json rename to crates/fhir/tests/data/json/R5/nutritionorder-example-diabeticsupplement.json diff --git a/crates/fhir/tests/data/R5/nutritionorder-example-energysupplement.json b/crates/fhir/tests/data/json/R5/nutritionorder-example-energysupplement.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionorder-example-energysupplement.json rename to crates/fhir/tests/data/json/R5/nutritionorder-example-energysupplement.json diff --git a/crates/fhir/tests/data/R5/nutritionorder-example-enteralbolus.json b/crates/fhir/tests/data/json/R5/nutritionorder-example-enteralbolus.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionorder-example-enteralbolus.json rename to crates/fhir/tests/data/json/R5/nutritionorder-example-enteralbolus.json diff --git a/crates/fhir/tests/data/R5/nutritionorder-example-enteralcontinuous.json b/crates/fhir/tests/data/json/R5/nutritionorder-example-enteralcontinuous.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionorder-example-enteralcontinuous.json rename to crates/fhir/tests/data/json/R5/nutritionorder-example-enteralcontinuous.json diff --git a/crates/fhir/tests/data/R5/nutritionorder-example-fiberrestricteddiet.json b/crates/fhir/tests/data/json/R5/nutritionorder-example-fiberrestricteddiet.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionorder-example-fiberrestricteddiet.json rename to crates/fhir/tests/data/json/R5/nutritionorder-example-fiberrestricteddiet.json diff --git a/crates/fhir/tests/data/R5/nutritionorder-example-infantenteral.json b/crates/fhir/tests/data/json/R5/nutritionorder-example-infantenteral.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionorder-example-infantenteral.json rename to crates/fhir/tests/data/json/R5/nutritionorder-example-infantenteral.json diff --git a/crates/fhir/tests/data/R5/nutritionorder-example-proteinsupplement.json b/crates/fhir/tests/data/json/R5/nutritionorder-example-proteinsupplement.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionorder-example-proteinsupplement.json rename to crates/fhir/tests/data/json/R5/nutritionorder-example-proteinsupplement.json diff --git a/crates/fhir/tests/data/R5/nutritionorder-example-pureeddiet-simple.json b/crates/fhir/tests/data/json/R5/nutritionorder-example-pureeddiet-simple.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionorder-example-pureeddiet-simple.json rename to crates/fhir/tests/data/json/R5/nutritionorder-example-pureeddiet-simple.json diff --git a/crates/fhir/tests/data/R5/nutritionorder-example-pureeddiet.json b/crates/fhir/tests/data/json/R5/nutritionorder-example-pureeddiet.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionorder-example-pureeddiet.json rename to crates/fhir/tests/data/json/R5/nutritionorder-example-pureeddiet.json diff --git a/crates/fhir/tests/data/R5/nutritionorder-example-renaldiet.json b/crates/fhir/tests/data/json/R5/nutritionorder-example-renaldiet.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionorder-example-renaldiet.json rename to crates/fhir/tests/data/json/R5/nutritionorder-example-renaldiet.json diff --git a/crates/fhir/tests/data/R5/nutritionorder-example-texture-modified.json b/crates/fhir/tests/data/json/R5/nutritionorder-example-texture-modified.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionorder-example-texture-modified.json rename to crates/fhir/tests/data/json/R5/nutritionorder-example-texture-modified.json diff --git a/crates/fhir/tests/data/R5/nutritionorder-questionnaire.json b/crates/fhir/tests/data/json/R5/nutritionorder-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionorder-questionnaire.json rename to crates/fhir/tests/data/json/R5/nutritionorder-questionnaire.json diff --git a/crates/fhir/tests/data/R5/nutritionorder.profile.json b/crates/fhir/tests/data/json/R5/nutritionorder.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionorder.profile.json rename to crates/fhir/tests/data/json/R5/nutritionorder.profile.json diff --git a/crates/fhir/tests/data/R5/nutritionproduct-example.json b/crates/fhir/tests/data/json/R5/nutritionproduct-example.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionproduct-example.json rename to crates/fhir/tests/data/json/R5/nutritionproduct-example.json diff --git a/crates/fhir/tests/data/R5/nutritionproduct-questionnaire.json b/crates/fhir/tests/data/json/R5/nutritionproduct-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionproduct-questionnaire.json rename to crates/fhir/tests/data/json/R5/nutritionproduct-questionnaire.json diff --git a/crates/fhir/tests/data/R5/nutritionproduct.profile.json b/crates/fhir/tests/data/json/R5/nutritionproduct.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/nutritionproduct.profile.json rename to crates/fhir/tests/data/json/R5/nutritionproduct.profile.json diff --git a/crates/fhir/tests/data/R5/observation-decimal.json b/crates/fhir/tests/data/json/R5/observation-decimal.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-decimal.json rename to crates/fhir/tests/data/json/R5/observation-decimal.json diff --git a/crates/fhir/tests/data/R5/observation-example-10minute-apgar-score.json b/crates/fhir/tests/data/json/R5/observation-example-10minute-apgar-score.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-10minute-apgar-score.json rename to crates/fhir/tests/data/json/R5/observation-example-10minute-apgar-score.json diff --git a/crates/fhir/tests/data/R5/observation-example-1minute-apgar-score.json b/crates/fhir/tests/data/json/R5/observation-example-1minute-apgar-score.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-1minute-apgar-score.json rename to crates/fhir/tests/data/json/R5/observation-example-1minute-apgar-score.json diff --git a/crates/fhir/tests/data/R5/observation-example-20minute-apgar-score.json b/crates/fhir/tests/data/json/R5/observation-example-20minute-apgar-score.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-20minute-apgar-score.json rename to crates/fhir/tests/data/json/R5/observation-example-20minute-apgar-score.json diff --git a/crates/fhir/tests/data/R5/observation-example-2minute-apgar-score.json b/crates/fhir/tests/data/json/R5/observation-example-2minute-apgar-score.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-2minute-apgar-score.json rename to crates/fhir/tests/data/json/R5/observation-example-2minute-apgar-score.json diff --git a/crates/fhir/tests/data/R5/observation-example-5minute-apgar-score.json b/crates/fhir/tests/data/json/R5/observation-example-5minute-apgar-score.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-5minute-apgar-score.json rename to crates/fhir/tests/data/json/R5/observation-example-5minute-apgar-score.json diff --git a/crates/fhir/tests/data/R5/observation-example-abdo-tender.json b/crates/fhir/tests/data/json/R5/observation-example-abdo-tender.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-abdo-tender.json rename to crates/fhir/tests/data/json/R5/observation-example-abdo-tender.json diff --git a/crates/fhir/tests/data/R5/observation-example-alcohol-type.json b/crates/fhir/tests/data/json/R5/observation-example-alcohol-type.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-alcohol-type.json rename to crates/fhir/tests/data/json/R5/observation-example-alcohol-type.json diff --git a/crates/fhir/tests/data/R5/observation-example-bgpanel.json b/crates/fhir/tests/data/json/R5/observation-example-bgpanel.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-bgpanel.json rename to crates/fhir/tests/data/json/R5/observation-example-bgpanel.json diff --git a/crates/fhir/tests/data/R5/observation-example-bloodgroup.json b/crates/fhir/tests/data/json/R5/observation-example-bloodgroup.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-bloodgroup.json rename to crates/fhir/tests/data/json/R5/observation-example-bloodgroup.json diff --git a/crates/fhir/tests/data/R5/observation-example-bloodpressure-cancel.json b/crates/fhir/tests/data/json/R5/observation-example-bloodpressure-cancel.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-bloodpressure-cancel.json rename to crates/fhir/tests/data/json/R5/observation-example-bloodpressure-cancel.json diff --git a/crates/fhir/tests/data/R5/observation-example-bloodpressure-dar.json b/crates/fhir/tests/data/json/R5/observation-example-bloodpressure-dar.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-bloodpressure-dar.json rename to crates/fhir/tests/data/json/R5/observation-example-bloodpressure-dar.json diff --git a/crates/fhir/tests/data/R5/observation-example-bloodpressure.json b/crates/fhir/tests/data/json/R5/observation-example-bloodpressure.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-bloodpressure.json rename to crates/fhir/tests/data/json/R5/observation-example-bloodpressure.json diff --git a/crates/fhir/tests/data/R5/observation-example-bmd.json b/crates/fhir/tests/data/json/R5/observation-example-bmd.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-bmd.json rename to crates/fhir/tests/data/json/R5/observation-example-bmd.json diff --git a/crates/fhir/tests/data/R5/observation-example-bmi-using-related.json b/crates/fhir/tests/data/json/R5/observation-example-bmi-using-related.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-bmi-using-related.json rename to crates/fhir/tests/data/json/R5/observation-example-bmi-using-related.json diff --git a/crates/fhir/tests/data/R5/observation-example-bmi.json b/crates/fhir/tests/data/json/R5/observation-example-bmi.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-bmi.json rename to crates/fhir/tests/data/json/R5/observation-example-bmi.json diff --git a/crates/fhir/tests/data/R5/observation-example-body-height.json b/crates/fhir/tests/data/json/R5/observation-example-body-height.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-body-height.json rename to crates/fhir/tests/data/json/R5/observation-example-body-height.json diff --git a/crates/fhir/tests/data/R5/observation-example-body-length.json b/crates/fhir/tests/data/json/R5/observation-example-body-length.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-body-length.json rename to crates/fhir/tests/data/json/R5/observation-example-body-length.json diff --git a/crates/fhir/tests/data/R5/observation-example-body-temperature.json b/crates/fhir/tests/data/json/R5/observation-example-body-temperature.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-body-temperature.json rename to crates/fhir/tests/data/json/R5/observation-example-body-temperature.json diff --git a/crates/fhir/tests/data/R5/observation-example-body-weight-with-arabic-code.json b/crates/fhir/tests/data/json/R5/observation-example-body-weight-with-arabic-code.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-body-weight-with-arabic-code.json rename to crates/fhir/tests/data/json/R5/observation-example-body-weight-with-arabic-code.json diff --git a/crates/fhir/tests/data/R5/observation-example-clinical-gender.json b/crates/fhir/tests/data/json/R5/observation-example-clinical-gender.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-clinical-gender.json rename to crates/fhir/tests/data/json/R5/observation-example-clinical-gender.json diff --git a/crates/fhir/tests/data/R5/observation-example-date-lastmp.json b/crates/fhir/tests/data/json/R5/observation-example-date-lastmp.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-date-lastmp.json rename to crates/fhir/tests/data/json/R5/observation-example-date-lastmp.json diff --git a/crates/fhir/tests/data/R5/observation-example-eye-color.json b/crates/fhir/tests/data/json/R5/observation-example-eye-color.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-eye-color.json rename to crates/fhir/tests/data/json/R5/observation-example-eye-color.json diff --git a/crates/fhir/tests/data/R5/observation-example-f001-glucose.json b/crates/fhir/tests/data/json/R5/observation-example-f001-glucose.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-f001-glucose.json rename to crates/fhir/tests/data/json/R5/observation-example-f001-glucose.json diff --git a/crates/fhir/tests/data/R5/observation-example-f002-excess.json b/crates/fhir/tests/data/json/R5/observation-example-f002-excess.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-f002-excess.json rename to crates/fhir/tests/data/json/R5/observation-example-f002-excess.json diff --git a/crates/fhir/tests/data/R5/observation-example-f003-co2.json b/crates/fhir/tests/data/json/R5/observation-example-f003-co2.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-f003-co2.json rename to crates/fhir/tests/data/json/R5/observation-example-f003-co2.json diff --git a/crates/fhir/tests/data/R5/observation-example-f004-erythrocyte.json b/crates/fhir/tests/data/json/R5/observation-example-f004-erythrocyte.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-f004-erythrocyte.json rename to crates/fhir/tests/data/json/R5/observation-example-f004-erythrocyte.json diff --git a/crates/fhir/tests/data/R5/observation-example-f005-hemoglobin.json b/crates/fhir/tests/data/json/R5/observation-example-f005-hemoglobin.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-f005-hemoglobin.json rename to crates/fhir/tests/data/json/R5/observation-example-f005-hemoglobin.json diff --git a/crates/fhir/tests/data/R5/observation-example-f202-temperature.json b/crates/fhir/tests/data/json/R5/observation-example-f202-temperature.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-f202-temperature.json rename to crates/fhir/tests/data/json/R5/observation-example-f202-temperature.json diff --git a/crates/fhir/tests/data/R5/observation-example-f203-bicarbonate.json b/crates/fhir/tests/data/json/R5/observation-example-f203-bicarbonate.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-f203-bicarbonate.json rename to crates/fhir/tests/data/json/R5/observation-example-f203-bicarbonate.json diff --git a/crates/fhir/tests/data/R5/observation-example-f204-creatinine.json b/crates/fhir/tests/data/json/R5/observation-example-f204-creatinine.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-f204-creatinine.json rename to crates/fhir/tests/data/json/R5/observation-example-f204-creatinine.json diff --git a/crates/fhir/tests/data/R5/observation-example-f205-egfr.json b/crates/fhir/tests/data/json/R5/observation-example-f205-egfr.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-f205-egfr.json rename to crates/fhir/tests/data/json/R5/observation-example-f205-egfr.json diff --git a/crates/fhir/tests/data/R5/observation-example-f206-staphylococcus.json b/crates/fhir/tests/data/json/R5/observation-example-f206-staphylococcus.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-f206-staphylococcus.json rename to crates/fhir/tests/data/json/R5/observation-example-f206-staphylococcus.json diff --git a/crates/fhir/tests/data/R5/observation-example-glasgow-qa.json b/crates/fhir/tests/data/json/R5/observation-example-glasgow-qa.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-glasgow-qa.json rename to crates/fhir/tests/data/json/R5/observation-example-glasgow-qa.json diff --git a/crates/fhir/tests/data/R5/observation-example-glasgow.json b/crates/fhir/tests/data/json/R5/observation-example-glasgow.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-glasgow.json rename to crates/fhir/tests/data/json/R5/observation-example-glasgow.json diff --git a/crates/fhir/tests/data/R5/observation-example-head-circumference.json b/crates/fhir/tests/data/json/R5/observation-example-head-circumference.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-head-circumference.json rename to crates/fhir/tests/data/json/R5/observation-example-head-circumference.json diff --git a/crates/fhir/tests/data/R5/observation-example-heart-rate.json b/crates/fhir/tests/data/json/R5/observation-example-heart-rate.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-heart-rate.json rename to crates/fhir/tests/data/json/R5/observation-example-heart-rate.json diff --git a/crates/fhir/tests/data/R5/observation-example-herd1.json b/crates/fhir/tests/data/json/R5/observation-example-herd1.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-herd1.json rename to crates/fhir/tests/data/json/R5/observation-example-herd1.json diff --git a/crates/fhir/tests/data/R5/observation-example-map-sitting.json b/crates/fhir/tests/data/json/R5/observation-example-map-sitting.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-map-sitting.json rename to crates/fhir/tests/data/json/R5/observation-example-map-sitting.json diff --git a/crates/fhir/tests/data/R5/observation-example-mbp.json b/crates/fhir/tests/data/json/R5/observation-example-mbp.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-mbp.json rename to crates/fhir/tests/data/json/R5/observation-example-mbp.json diff --git a/crates/fhir/tests/data/R5/observation-example-respiratory-rate.json b/crates/fhir/tests/data/json/R5/observation-example-respiratory-rate.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-respiratory-rate.json rename to crates/fhir/tests/data/json/R5/observation-example-respiratory-rate.json diff --git a/crates/fhir/tests/data/R5/observation-example-rhstatus.json b/crates/fhir/tests/data/json/R5/observation-example-rhstatus.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-rhstatus.json rename to crates/fhir/tests/data/json/R5/observation-example-rhstatus.json diff --git a/crates/fhir/tests/data/R5/observation-example-sample-data.json b/crates/fhir/tests/data/json/R5/observation-example-sample-data.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-sample-data.json rename to crates/fhir/tests/data/json/R5/observation-example-sample-data.json diff --git a/crates/fhir/tests/data/R5/observation-example-satO2.json b/crates/fhir/tests/data/json/R5/observation-example-satO2.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-satO2.json rename to crates/fhir/tests/data/json/R5/observation-example-satO2.json diff --git a/crates/fhir/tests/data/R5/observation-example-secondsmoke.json b/crates/fhir/tests/data/json/R5/observation-example-secondsmoke.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-secondsmoke.json rename to crates/fhir/tests/data/json/R5/observation-example-secondsmoke.json diff --git a/crates/fhir/tests/data/R5/observation-example-spirometry.json b/crates/fhir/tests/data/json/R5/observation-example-spirometry.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-spirometry.json rename to crates/fhir/tests/data/json/R5/observation-example-spirometry.json diff --git a/crates/fhir/tests/data/R5/observation-example-trachcare.json b/crates/fhir/tests/data/json/R5/observation-example-trachcare.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-trachcare.json rename to crates/fhir/tests/data/json/R5/observation-example-trachcare.json diff --git a/crates/fhir/tests/data/R5/observation-example-unsat.json b/crates/fhir/tests/data/json/R5/observation-example-unsat.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-unsat.json rename to crates/fhir/tests/data/json/R5/observation-example-unsat.json diff --git a/crates/fhir/tests/data/R5/observation-example-vitals-panel.json b/crates/fhir/tests/data/json/R5/observation-example-vitals-panel.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-vitals-panel.json rename to crates/fhir/tests/data/json/R5/observation-example-vitals-panel.json diff --git a/crates/fhir/tests/data/R5/observation-example-vomiting.json b/crates/fhir/tests/data/json/R5/observation-example-vomiting.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-vomiting.json rename to crates/fhir/tests/data/json/R5/observation-example-vomiting.json diff --git a/crates/fhir/tests/data/R5/observation-example-vp-oyster.json b/crates/fhir/tests/data/json/R5/observation-example-vp-oyster.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example-vp-oyster.json rename to crates/fhir/tests/data/json/R5/observation-example-vp-oyster.json diff --git a/crates/fhir/tests/data/R5/observation-example.json b/crates/fhir/tests/data/json/R5/observation-example.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-example.json rename to crates/fhir/tests/data/json/R5/observation-example.json diff --git a/crates/fhir/tests/data/R5/observation-questionnaire.json b/crates/fhir/tests/data/json/R5/observation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/observation-questionnaire.json rename to crates/fhir/tests/data/json/R5/observation-questionnaire.json diff --git a/crates/fhir/tests/data/R5/observation.profile.json b/crates/fhir/tests/data/json/R5/observation.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/observation.profile.json rename to crates/fhir/tests/data/json/R5/observation.profile.json diff --git a/crates/fhir/tests/data/R5/observationdefinition-example.json b/crates/fhir/tests/data/json/R5/observationdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R5/observationdefinition-example.json rename to crates/fhir/tests/data/json/R5/observationdefinition-example.json diff --git a/crates/fhir/tests/data/R5/observationdefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/observationdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/observationdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/observationdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/observationdefinition.profile.json b/crates/fhir/tests/data/json/R5/observationdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/observationdefinition.profile.json rename to crates/fhir/tests/data/json/R5/observationdefinition.profile.json diff --git a/crates/fhir/tests/data/R5/oid.profile.json b/crates/fhir/tests/data/json/R5/oid.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/oid.profile.json rename to crates/fhir/tests/data/json/R5/oid.profile.json diff --git a/crates/fhir/tests/data/R5/operation-activitydefinition-apply.json b/crates/fhir/tests/data/json/R5/operation-activitydefinition-apply.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-activitydefinition-apply.json rename to crates/fhir/tests/data/json/R5/operation-activitydefinition-apply.json diff --git a/crates/fhir/tests/data/R5/operation-activitydefinition-data-requirements.json b/crates/fhir/tests/data/json/R5/operation-activitydefinition-data-requirements.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-activitydefinition-data-requirements.json rename to crates/fhir/tests/data/json/R5/operation-activitydefinition-data-requirements.json diff --git a/crates/fhir/tests/data/R5/operation-canonicalresource-current-canonical.json b/crates/fhir/tests/data/json/R5/operation-canonicalresource-current-canonical.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-canonicalresource-current-canonical.json rename to crates/fhir/tests/data/json/R5/operation-canonicalresource-current-canonical.json diff --git a/crates/fhir/tests/data/R5/operation-capabilitystatement-conforms.json b/crates/fhir/tests/data/json/R5/operation-capabilitystatement-conforms.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-capabilitystatement-conforms.json rename to crates/fhir/tests/data/json/R5/operation-capabilitystatement-conforms.json diff --git a/crates/fhir/tests/data/R5/operation-capabilitystatement-implements.json b/crates/fhir/tests/data/json/R5/operation-capabilitystatement-implements.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-capabilitystatement-implements.json rename to crates/fhir/tests/data/json/R5/operation-capabilitystatement-implements.json diff --git a/crates/fhir/tests/data/R5/operation-capabilitystatement-subset.json b/crates/fhir/tests/data/json/R5/operation-capabilitystatement-subset.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-capabilitystatement-subset.json rename to crates/fhir/tests/data/json/R5/operation-capabilitystatement-subset.json diff --git a/crates/fhir/tests/data/R5/operation-capabilitystatement-versions.json b/crates/fhir/tests/data/json/R5/operation-capabilitystatement-versions.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-capabilitystatement-versions.json rename to crates/fhir/tests/data/json/R5/operation-capabilitystatement-versions.json diff --git a/crates/fhir/tests/data/R5/operation-chargeitemdefinition-apply.json b/crates/fhir/tests/data/json/R5/operation-chargeitemdefinition-apply.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-chargeitemdefinition-apply.json rename to crates/fhir/tests/data/json/R5/operation-chargeitemdefinition-apply.json diff --git a/crates/fhir/tests/data/R5/operation-claim-submit.json b/crates/fhir/tests/data/json/R5/operation-claim-submit.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-claim-submit.json rename to crates/fhir/tests/data/json/R5/operation-claim-submit.json diff --git a/crates/fhir/tests/data/R5/operation-codesystem-find-matches.json b/crates/fhir/tests/data/json/R5/operation-codesystem-find-matches.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-codesystem-find-matches.json rename to crates/fhir/tests/data/json/R5/operation-codesystem-find-matches.json diff --git a/crates/fhir/tests/data/R5/operation-codesystem-lookup.json b/crates/fhir/tests/data/json/R5/operation-codesystem-lookup.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-codesystem-lookup.json rename to crates/fhir/tests/data/json/R5/operation-codesystem-lookup.json diff --git a/crates/fhir/tests/data/R5/operation-codesystem-subsumes.json b/crates/fhir/tests/data/json/R5/operation-codesystem-subsumes.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-codesystem-subsumes.json rename to crates/fhir/tests/data/json/R5/operation-codesystem-subsumes.json diff --git a/crates/fhir/tests/data/R5/operation-codesystem-validate-code.json b/crates/fhir/tests/data/json/R5/operation-codesystem-validate-code.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-codesystem-validate-code.json rename to crates/fhir/tests/data/json/R5/operation-codesystem-validate-code.json diff --git a/crates/fhir/tests/data/R5/operation-composition-document.json b/crates/fhir/tests/data/json/R5/operation-composition-document.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-composition-document.json rename to crates/fhir/tests/data/json/R5/operation-composition-document.json diff --git a/crates/fhir/tests/data/R5/operation-conceptmap-closure.json b/crates/fhir/tests/data/json/R5/operation-conceptmap-closure.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-conceptmap-closure.json rename to crates/fhir/tests/data/json/R5/operation-conceptmap-closure.json diff --git a/crates/fhir/tests/data/R5/operation-conceptmap-translate.json b/crates/fhir/tests/data/json/R5/operation-conceptmap-translate.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-conceptmap-translate.json rename to crates/fhir/tests/data/json/R5/operation-conceptmap-translate.json diff --git a/crates/fhir/tests/data/R5/operation-coverageeligibilityrequest-submit.json b/crates/fhir/tests/data/json/R5/operation-coverageeligibilityrequest-submit.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-coverageeligibilityrequest-submit.json rename to crates/fhir/tests/data/json/R5/operation-coverageeligibilityrequest-submit.json diff --git a/crates/fhir/tests/data/R5/operation-documentreference-docref.json b/crates/fhir/tests/data/json/R5/operation-documentreference-docref.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-documentreference-docref.json rename to crates/fhir/tests/data/json/R5/operation-documentreference-docref.json diff --git a/crates/fhir/tests/data/R5/operation-documentreference-generate.json b/crates/fhir/tests/data/json/R5/operation-documentreference-generate.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-documentreference-generate.json rename to crates/fhir/tests/data/json/R5/operation-documentreference-generate.json diff --git a/crates/fhir/tests/data/R5/operation-encounter-everything.json b/crates/fhir/tests/data/json/R5/operation-encounter-everything.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-encounter-everything.json rename to crates/fhir/tests/data/json/R5/operation-encounter-everything.json diff --git a/crates/fhir/tests/data/R5/operation-episodeofcare-everything.json b/crates/fhir/tests/data/json/R5/operation-episodeofcare-everything.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-episodeofcare-everything.json rename to crates/fhir/tests/data/json/R5/operation-episodeofcare-everything.json diff --git a/crates/fhir/tests/data/R5/operation-group-everything.json b/crates/fhir/tests/data/json/R5/operation-group-everything.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-group-everything.json rename to crates/fhir/tests/data/json/R5/operation-group-everything.json diff --git a/crates/fhir/tests/data/R5/operation-library-data-requirements.json b/crates/fhir/tests/data/json/R5/operation-library-data-requirements.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-library-data-requirements.json rename to crates/fhir/tests/data/json/R5/operation-library-data-requirements.json diff --git a/crates/fhir/tests/data/R5/operation-list-find.json b/crates/fhir/tests/data/json/R5/operation-list-find.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-list-find.json rename to crates/fhir/tests/data/json/R5/operation-list-find.json diff --git a/crates/fhir/tests/data/R5/operation-measure-care-gaps.json b/crates/fhir/tests/data/json/R5/operation-measure-care-gaps.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-measure-care-gaps.json rename to crates/fhir/tests/data/json/R5/operation-measure-care-gaps.json diff --git a/crates/fhir/tests/data/R5/operation-measure-collect-data.json b/crates/fhir/tests/data/json/R5/operation-measure-collect-data.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-measure-collect-data.json rename to crates/fhir/tests/data/json/R5/operation-measure-collect-data.json diff --git a/crates/fhir/tests/data/R5/operation-measure-data-requirements.json b/crates/fhir/tests/data/json/R5/operation-measure-data-requirements.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-measure-data-requirements.json rename to crates/fhir/tests/data/json/R5/operation-measure-data-requirements.json diff --git a/crates/fhir/tests/data/R5/operation-measure-evaluate-measure.json b/crates/fhir/tests/data/json/R5/operation-measure-evaluate-measure.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-measure-evaluate-measure.json rename to crates/fhir/tests/data/json/R5/operation-measure-evaluate-measure.json diff --git a/crates/fhir/tests/data/R5/operation-measure-submit-data.json b/crates/fhir/tests/data/json/R5/operation-measure-submit-data.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-measure-submit-data.json rename to crates/fhir/tests/data/json/R5/operation-measure-submit-data.json diff --git a/crates/fhir/tests/data/R5/operation-medicinalproductdefinition-everything.json b/crates/fhir/tests/data/json/R5/operation-medicinalproductdefinition-everything.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-medicinalproductdefinition-everything.json rename to crates/fhir/tests/data/json/R5/operation-medicinalproductdefinition-everything.json diff --git a/crates/fhir/tests/data/R5/operation-messageheader-process-message.json b/crates/fhir/tests/data/json/R5/operation-messageheader-process-message.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-messageheader-process-message.json rename to crates/fhir/tests/data/json/R5/operation-messageheader-process-message.json diff --git a/crates/fhir/tests/data/R5/operation-namingsystem-preferred-id.json b/crates/fhir/tests/data/json/R5/operation-namingsystem-preferred-id.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-namingsystem-preferred-id.json rename to crates/fhir/tests/data/json/R5/operation-namingsystem-preferred-id.json diff --git a/crates/fhir/tests/data/R5/operation-namingsystem-translate-id.json b/crates/fhir/tests/data/json/R5/operation-namingsystem-translate-id.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-namingsystem-translate-id.json rename to crates/fhir/tests/data/json/R5/operation-namingsystem-translate-id.json diff --git a/crates/fhir/tests/data/R5/operation-observation-lastn.json b/crates/fhir/tests/data/json/R5/operation-observation-lastn.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-observation-lastn.json rename to crates/fhir/tests/data/json/R5/operation-observation-lastn.json diff --git a/crates/fhir/tests/data/R5/operation-observation-stats.json b/crates/fhir/tests/data/json/R5/operation-observation-stats.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-observation-stats.json rename to crates/fhir/tests/data/json/R5/operation-observation-stats.json diff --git a/crates/fhir/tests/data/R5/operation-patient-everything.json b/crates/fhir/tests/data/json/R5/operation-patient-everything.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-patient-everything.json rename to crates/fhir/tests/data/json/R5/operation-patient-everything.json diff --git a/crates/fhir/tests/data/R5/operation-patient-match.json b/crates/fhir/tests/data/json/R5/operation-patient-match.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-patient-match.json rename to crates/fhir/tests/data/json/R5/operation-patient-match.json diff --git a/crates/fhir/tests/data/R5/operation-patient-merge.json b/crates/fhir/tests/data/json/R5/operation-patient-merge.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-patient-merge.json rename to crates/fhir/tests/data/json/R5/operation-patient-merge.json diff --git a/crates/fhir/tests/data/R5/operation-plandefinition-apply.json b/crates/fhir/tests/data/json/R5/operation-plandefinition-apply.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-plandefinition-apply.json rename to crates/fhir/tests/data/json/R5/operation-plandefinition-apply.json diff --git a/crates/fhir/tests/data/R5/operation-plandefinition-data-requirements.json b/crates/fhir/tests/data/json/R5/operation-plandefinition-data-requirements.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-plandefinition-data-requirements.json rename to crates/fhir/tests/data/json/R5/operation-plandefinition-data-requirements.json diff --git a/crates/fhir/tests/data/R5/operation-resource-add.json b/crates/fhir/tests/data/json/R5/operation-resource-add.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-resource-add.json rename to crates/fhir/tests/data/json/R5/operation-resource-add.json diff --git a/crates/fhir/tests/data/R5/operation-resource-convert.json b/crates/fhir/tests/data/json/R5/operation-resource-convert.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-resource-convert.json rename to crates/fhir/tests/data/json/R5/operation-resource-convert.json diff --git a/crates/fhir/tests/data/R5/operation-resource-filter.json b/crates/fhir/tests/data/json/R5/operation-resource-filter.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-resource-filter.json rename to crates/fhir/tests/data/json/R5/operation-resource-filter.json diff --git a/crates/fhir/tests/data/R5/operation-resource-graph.json b/crates/fhir/tests/data/json/R5/operation-resource-graph.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-resource-graph.json rename to crates/fhir/tests/data/json/R5/operation-resource-graph.json diff --git a/crates/fhir/tests/data/R5/operation-resource-graphql.json b/crates/fhir/tests/data/json/R5/operation-resource-graphql.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-resource-graphql.json rename to crates/fhir/tests/data/json/R5/operation-resource-graphql.json diff --git a/crates/fhir/tests/data/R5/operation-resource-meta-add.json b/crates/fhir/tests/data/json/R5/operation-resource-meta-add.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-resource-meta-add.json rename to crates/fhir/tests/data/json/R5/operation-resource-meta-add.json diff --git a/crates/fhir/tests/data/R5/operation-resource-meta-delete.json b/crates/fhir/tests/data/json/R5/operation-resource-meta-delete.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-resource-meta-delete.json rename to crates/fhir/tests/data/json/R5/operation-resource-meta-delete.json diff --git a/crates/fhir/tests/data/R5/operation-resource-meta.json b/crates/fhir/tests/data/json/R5/operation-resource-meta.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-resource-meta.json rename to crates/fhir/tests/data/json/R5/operation-resource-meta.json diff --git a/crates/fhir/tests/data/R5/operation-resource-remove.json b/crates/fhir/tests/data/json/R5/operation-resource-remove.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-resource-remove.json rename to crates/fhir/tests/data/json/R5/operation-resource-remove.json diff --git a/crates/fhir/tests/data/R5/operation-resource-validate.json b/crates/fhir/tests/data/json/R5/operation-resource-validate.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-resource-validate.json rename to crates/fhir/tests/data/json/R5/operation-resource-validate.json diff --git a/crates/fhir/tests/data/R5/operation-specimendefinition-apply.json b/crates/fhir/tests/data/json/R5/operation-specimendefinition-apply.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-specimendefinition-apply.json rename to crates/fhir/tests/data/json/R5/operation-specimendefinition-apply.json diff --git a/crates/fhir/tests/data/R5/operation-structuredefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/operation-structuredefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-structuredefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/operation-structuredefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/operation-structuredefinition-snapshot.json b/crates/fhir/tests/data/json/R5/operation-structuredefinition-snapshot.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-structuredefinition-snapshot.json rename to crates/fhir/tests/data/json/R5/operation-structuredefinition-snapshot.json diff --git a/crates/fhir/tests/data/R5/operation-structuremap-transform.json b/crates/fhir/tests/data/json/R5/operation-structuremap-transform.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-structuremap-transform.json rename to crates/fhir/tests/data/json/R5/operation-structuremap-transform.json diff --git a/crates/fhir/tests/data/R5/operation-subscription-events.json b/crates/fhir/tests/data/json/R5/operation-subscription-events.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-subscription-events.json rename to crates/fhir/tests/data/json/R5/operation-subscription-events.json diff --git a/crates/fhir/tests/data/R5/operation-subscription-get-ws-binding-token.json b/crates/fhir/tests/data/json/R5/operation-subscription-get-ws-binding-token.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-subscription-get-ws-binding-token.json rename to crates/fhir/tests/data/json/R5/operation-subscription-get-ws-binding-token.json diff --git a/crates/fhir/tests/data/R5/operation-subscription-status.json b/crates/fhir/tests/data/json/R5/operation-subscription-status.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-subscription-status.json rename to crates/fhir/tests/data/json/R5/operation-subscription-status.json diff --git a/crates/fhir/tests/data/R5/operation-valueset-expand.json b/crates/fhir/tests/data/json/R5/operation-valueset-expand.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-valueset-expand.json rename to crates/fhir/tests/data/json/R5/operation-valueset-expand.json diff --git a/crates/fhir/tests/data/R5/operation-valueset-validate-code.json b/crates/fhir/tests/data/json/R5/operation-valueset-validate-code.json similarity index 100% rename from crates/fhir/tests/data/R5/operation-valueset-validate-code.json rename to crates/fhir/tests/data/json/R5/operation-valueset-validate-code.json diff --git a/crates/fhir/tests/data/R5/operationdefinition-example-query-high-risk.json b/crates/fhir/tests/data/json/R5/operationdefinition-example-query-high-risk.json similarity index 100% rename from crates/fhir/tests/data/R5/operationdefinition-example-query-high-risk.json rename to crates/fhir/tests/data/json/R5/operationdefinition-example-query-high-risk.json diff --git a/crates/fhir/tests/data/R5/operationdefinition-example.json b/crates/fhir/tests/data/json/R5/operationdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R5/operationdefinition-example.json rename to crates/fhir/tests/data/json/R5/operationdefinition-example.json diff --git a/crates/fhir/tests/data/R5/operationdefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/operationdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/operationdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/operationdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/operationdefinition.profile.json b/crates/fhir/tests/data/json/R5/operationdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/operationdefinition.profile.json rename to crates/fhir/tests/data/json/R5/operationdefinition.profile.json diff --git a/crates/fhir/tests/data/R5/operationoutcome-example-allok.json b/crates/fhir/tests/data/json/R5/operationoutcome-example-allok.json similarity index 100% rename from crates/fhir/tests/data/R5/operationoutcome-example-allok.json rename to crates/fhir/tests/data/json/R5/operationoutcome-example-allok.json diff --git a/crates/fhir/tests/data/R5/operationoutcome-example-break-the-glass.json b/crates/fhir/tests/data/json/R5/operationoutcome-example-break-the-glass.json similarity index 100% rename from crates/fhir/tests/data/R5/operationoutcome-example-break-the-glass.json rename to crates/fhir/tests/data/json/R5/operationoutcome-example-break-the-glass.json diff --git a/crates/fhir/tests/data/R5/operationoutcome-example-exception.json b/crates/fhir/tests/data/json/R5/operationoutcome-example-exception.json similarity index 100% rename from crates/fhir/tests/data/R5/operationoutcome-example-exception.json rename to crates/fhir/tests/data/json/R5/operationoutcome-example-exception.json diff --git a/crates/fhir/tests/data/R5/operationoutcome-example-searchfail.json b/crates/fhir/tests/data/json/R5/operationoutcome-example-searchfail.json similarity index 100% rename from crates/fhir/tests/data/R5/operationoutcome-example-searchfail.json rename to crates/fhir/tests/data/json/R5/operationoutcome-example-searchfail.json diff --git a/crates/fhir/tests/data/R5/operationoutcome-example-validationfail.json b/crates/fhir/tests/data/json/R5/operationoutcome-example-validationfail.json similarity index 100% rename from crates/fhir/tests/data/R5/operationoutcome-example-validationfail.json rename to crates/fhir/tests/data/json/R5/operationoutcome-example-validationfail.json diff --git a/crates/fhir/tests/data/R5/operationoutcome-example.json b/crates/fhir/tests/data/json/R5/operationoutcome-example.json similarity index 100% rename from crates/fhir/tests/data/R5/operationoutcome-example.json rename to crates/fhir/tests/data/json/R5/operationoutcome-example.json diff --git a/crates/fhir/tests/data/R5/operationoutcome-questionnaire.json b/crates/fhir/tests/data/json/R5/operationoutcome-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/operationoutcome-questionnaire.json rename to crates/fhir/tests/data/json/R5/operationoutcome-questionnaire.json diff --git a/crates/fhir/tests/data/R5/operationoutcome.profile.json b/crates/fhir/tests/data/json/R5/operationoutcome.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/operationoutcome.profile.json rename to crates/fhir/tests/data/json/R5/operationoutcome.profile.json diff --git a/crates/fhir/tests/data/R5/organization-example-f001-burgers.json b/crates/fhir/tests/data/json/R5/organization-example-f001-burgers.json similarity index 100% rename from crates/fhir/tests/data/R5/organization-example-f001-burgers.json rename to crates/fhir/tests/data/json/R5/organization-example-f001-burgers.json diff --git a/crates/fhir/tests/data/R5/organization-example-f002-burgers-card.json b/crates/fhir/tests/data/json/R5/organization-example-f002-burgers-card.json similarity index 100% rename from crates/fhir/tests/data/R5/organization-example-f002-burgers-card.json rename to crates/fhir/tests/data/json/R5/organization-example-f002-burgers-card.json diff --git a/crates/fhir/tests/data/R5/organization-example-f003-burgers-ENT.json b/crates/fhir/tests/data/json/R5/organization-example-f003-burgers-ENT.json similarity index 100% rename from crates/fhir/tests/data/R5/organization-example-f003-burgers-ENT.json rename to crates/fhir/tests/data/json/R5/organization-example-f003-burgers-ENT.json diff --git a/crates/fhir/tests/data/R5/organization-example-f201-aumc.json b/crates/fhir/tests/data/json/R5/organization-example-f201-aumc.json similarity index 100% rename from crates/fhir/tests/data/R5/organization-example-f201-aumc.json rename to crates/fhir/tests/data/json/R5/organization-example-f201-aumc.json diff --git a/crates/fhir/tests/data/R5/organization-example-f203-bumc.json b/crates/fhir/tests/data/json/R5/organization-example-f203-bumc.json similarity index 100% rename from crates/fhir/tests/data/R5/organization-example-f203-bumc.json rename to crates/fhir/tests/data/json/R5/organization-example-f203-bumc.json diff --git a/crates/fhir/tests/data/R5/organization-example-gastro.json b/crates/fhir/tests/data/json/R5/organization-example-gastro.json similarity index 100% rename from crates/fhir/tests/data/R5/organization-example-gastro.json rename to crates/fhir/tests/data/json/R5/organization-example-gastro.json diff --git a/crates/fhir/tests/data/R5/organization-example-good-health-care.json b/crates/fhir/tests/data/json/R5/organization-example-good-health-care.json similarity index 100% rename from crates/fhir/tests/data/R5/organization-example-good-health-care.json rename to crates/fhir/tests/data/json/R5/organization-example-good-health-care.json diff --git a/crates/fhir/tests/data/R5/organization-example-hl7pay.json b/crates/fhir/tests/data/json/R5/organization-example-hl7pay.json similarity index 100% rename from crates/fhir/tests/data/R5/organization-example-hl7pay.json rename to crates/fhir/tests/data/json/R5/organization-example-hl7pay.json diff --git a/crates/fhir/tests/data/R5/organization-example-insurer.json b/crates/fhir/tests/data/json/R5/organization-example-insurer.json similarity index 100% rename from crates/fhir/tests/data/R5/organization-example-insurer.json rename to crates/fhir/tests/data/json/R5/organization-example-insurer.json diff --git a/crates/fhir/tests/data/R5/organization-example-lab.json b/crates/fhir/tests/data/json/R5/organization-example-lab.json similarity index 100% rename from crates/fhir/tests/data/R5/organization-example-lab.json rename to crates/fhir/tests/data/json/R5/organization-example-lab.json diff --git a/crates/fhir/tests/data/R5/organization-example-mihealth.json b/crates/fhir/tests/data/json/R5/organization-example-mihealth.json similarity index 100% rename from crates/fhir/tests/data/R5/organization-example-mihealth.json rename to crates/fhir/tests/data/json/R5/organization-example-mihealth.json diff --git a/crates/fhir/tests/data/R5/organization-example-mmanu.json b/crates/fhir/tests/data/json/R5/organization-example-mmanu.json similarity index 100% rename from crates/fhir/tests/data/R5/organization-example-mmanu.json rename to crates/fhir/tests/data/json/R5/organization-example-mmanu.json diff --git a/crates/fhir/tests/data/R5/organization-example.json b/crates/fhir/tests/data/json/R5/organization-example.json similarity index 100% rename from crates/fhir/tests/data/R5/organization-example.json rename to crates/fhir/tests/data/json/R5/organization-example.json diff --git a/crates/fhir/tests/data/R5/organization-questionnaire.json b/crates/fhir/tests/data/json/R5/organization-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/organization-questionnaire.json rename to crates/fhir/tests/data/json/R5/organization-questionnaire.json diff --git a/crates/fhir/tests/data/R5/organization.profile.json b/crates/fhir/tests/data/json/R5/organization.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/organization.profile.json rename to crates/fhir/tests/data/json/R5/organization.profile.json diff --git a/crates/fhir/tests/data/R5/organizationaffiliation-example.json b/crates/fhir/tests/data/json/R5/organizationaffiliation-example.json similarity index 100% rename from crates/fhir/tests/data/R5/organizationaffiliation-example.json rename to crates/fhir/tests/data/json/R5/organizationaffiliation-example.json diff --git a/crates/fhir/tests/data/R5/organizationaffiliation-questionnaire.json b/crates/fhir/tests/data/json/R5/organizationaffiliation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/organizationaffiliation-questionnaire.json rename to crates/fhir/tests/data/json/R5/organizationaffiliation-questionnaire.json diff --git a/crates/fhir/tests/data/R5/organizationaffiliation.profile.json b/crates/fhir/tests/data/json/R5/organizationaffiliation.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/organizationaffiliation.profile.json rename to crates/fhir/tests/data/json/R5/organizationaffiliation.profile.json diff --git a/crates/fhir/tests/data/R5/orgrole-example-hie.json b/crates/fhir/tests/data/json/R5/orgrole-example-hie.json similarity index 100% rename from crates/fhir/tests/data/R5/orgrole-example-hie.json rename to crates/fhir/tests/data/json/R5/orgrole-example-hie.json diff --git a/crates/fhir/tests/data/R5/orgrole-example-services.json b/crates/fhir/tests/data/json/R5/orgrole-example-services.json similarity index 100% rename from crates/fhir/tests/data/R5/orgrole-example-services.json rename to crates/fhir/tests/data/json/R5/orgrole-example-services.json diff --git a/crates/fhir/tests/data/R5/oxygensat-questionnaire.json b/crates/fhir/tests/data/json/R5/oxygensat-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/oxygensat-questionnaire.json rename to crates/fhir/tests/data/json/R5/oxygensat-questionnaire.json diff --git a/crates/fhir/tests/data/R5/oxygensat.profile.json b/crates/fhir/tests/data/json/R5/oxygensat.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/oxygensat.profile.json rename to crates/fhir/tests/data/json/R5/oxygensat.profile.json diff --git a/crates/fhir/tests/data/R5/packagedproductdefinition-example-co-packaged-liquid-and-syringe.json b/crates/fhir/tests/data/json/R5/packagedproductdefinition-example-co-packaged-liquid-and-syringe.json similarity index 100% rename from crates/fhir/tests/data/R5/packagedproductdefinition-example-co-packaged-liquid-and-syringe.json rename to crates/fhir/tests/data/json/R5/packagedproductdefinition-example-co-packaged-liquid-and-syringe.json diff --git a/crates/fhir/tests/data/R5/packagedproductdefinition-example.json b/crates/fhir/tests/data/json/R5/packagedproductdefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R5/packagedproductdefinition-example.json rename to crates/fhir/tests/data/json/R5/packagedproductdefinition-example.json diff --git a/crates/fhir/tests/data/R5/packagedproductdefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/packagedproductdefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/packagedproductdefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/packagedproductdefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/packagedproductdefinition.profile.json b/crates/fhir/tests/data/json/R5/packagedproductdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/packagedproductdefinition.profile.json rename to crates/fhir/tests/data/json/R5/packagedproductdefinition.profile.json diff --git a/crates/fhir/tests/data/R5/parameterdefinition.profile.json b/crates/fhir/tests/data/json/R5/parameterdefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/parameterdefinition.profile.json rename to crates/fhir/tests/data/json/R5/parameterdefinition.profile.json diff --git a/crates/fhir/tests/data/R5/parameters-example.json b/crates/fhir/tests/data/json/R5/parameters-example.json similarity index 100% rename from crates/fhir/tests/data/R5/parameters-example.json rename to crates/fhir/tests/data/json/R5/parameters-example.json diff --git a/crates/fhir/tests/data/R5/parameters-questionnaire.json b/crates/fhir/tests/data/json/R5/parameters-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/parameters-questionnaire.json rename to crates/fhir/tests/data/json/R5/parameters-questionnaire.json diff --git a/crates/fhir/tests/data/R5/parameters.profile.json b/crates/fhir/tests/data/json/R5/parameters.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/parameters.profile.json rename to crates/fhir/tests/data/json/R5/parameters.profile.json diff --git a/crates/fhir/tests/data/R5/participant.json b/crates/fhir/tests/data/json/R5/participant.json similarity index 100% rename from crates/fhir/tests/data/R5/participant.json rename to crates/fhir/tests/data/json/R5/participant.json diff --git a/crates/fhir/tests/data/R5/participantcontactable.json b/crates/fhir/tests/data/json/R5/participantcontactable.json similarity index 100% rename from crates/fhir/tests/data/R5/participantcontactable.json rename to crates/fhir/tests/data/json/R5/participantcontactable.json diff --git a/crates/fhir/tests/data/R5/participantliving.json b/crates/fhir/tests/data/json/R5/participantliving.json similarity index 100% rename from crates/fhir/tests/data/R5/participantliving.json rename to crates/fhir/tests/data/json/R5/participantliving.json diff --git a/crates/fhir/tests/data/R5/patient-example-a.json b/crates/fhir/tests/data/json/R5/patient-example-a.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-a.json rename to crates/fhir/tests/data/json/R5/patient-example-a.json diff --git a/crates/fhir/tests/data/R5/patient-example-animal.json b/crates/fhir/tests/data/json/R5/patient-example-animal.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-animal.json rename to crates/fhir/tests/data/json/R5/patient-example-animal.json diff --git a/crates/fhir/tests/data/R5/patient-example-b.json b/crates/fhir/tests/data/json/R5/patient-example-b.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-b.json rename to crates/fhir/tests/data/json/R5/patient-example-b.json diff --git a/crates/fhir/tests/data/R5/patient-example-c.json b/crates/fhir/tests/data/json/R5/patient-example-c.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-c.json rename to crates/fhir/tests/data/json/R5/patient-example-c.json diff --git a/crates/fhir/tests/data/R5/patient-example-chinese.json b/crates/fhir/tests/data/json/R5/patient-example-chinese.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-chinese.json rename to crates/fhir/tests/data/json/R5/patient-example-chinese.json diff --git a/crates/fhir/tests/data/R5/patient-example-d.json b/crates/fhir/tests/data/json/R5/patient-example-d.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-d.json rename to crates/fhir/tests/data/json/R5/patient-example-d.json diff --git a/crates/fhir/tests/data/R5/patient-example-dicom.json b/crates/fhir/tests/data/json/R5/patient-example-dicom.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-dicom.json rename to crates/fhir/tests/data/json/R5/patient-example-dicom.json diff --git a/crates/fhir/tests/data/R5/patient-example-f001-pieter.json b/crates/fhir/tests/data/json/R5/patient-example-f001-pieter.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-f001-pieter.json rename to crates/fhir/tests/data/json/R5/patient-example-f001-pieter.json diff --git a/crates/fhir/tests/data/R5/patient-example-f201-roel.json b/crates/fhir/tests/data/json/R5/patient-example-f201-roel.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-f201-roel.json rename to crates/fhir/tests/data/json/R5/patient-example-f201-roel.json diff --git a/crates/fhir/tests/data/R5/patient-example-ihe-pcd.json b/crates/fhir/tests/data/json/R5/patient-example-ihe-pcd.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-ihe-pcd.json rename to crates/fhir/tests/data/json/R5/patient-example-ihe-pcd.json diff --git a/crates/fhir/tests/data/R5/patient-example-infant-fetal.json b/crates/fhir/tests/data/json/R5/patient-example-infant-fetal.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-infant-fetal.json rename to crates/fhir/tests/data/json/R5/patient-example-infant-fetal.json diff --git a/crates/fhir/tests/data/R5/patient-example-infant-mom.json b/crates/fhir/tests/data/json/R5/patient-example-infant-mom.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-infant-mom.json rename to crates/fhir/tests/data/json/R5/patient-example-infant-mom.json diff --git a/crates/fhir/tests/data/R5/patient-example-infant-twin-1.json b/crates/fhir/tests/data/json/R5/patient-example-infant-twin-1.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-infant-twin-1.json rename to crates/fhir/tests/data/json/R5/patient-example-infant-twin-1.json diff --git a/crates/fhir/tests/data/R5/patient-example-infant-twin-2.json b/crates/fhir/tests/data/json/R5/patient-example-infant-twin-2.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-infant-twin-2.json rename to crates/fhir/tests/data/json/R5/patient-example-infant-twin-2.json diff --git a/crates/fhir/tests/data/R5/patient-example-mom.json b/crates/fhir/tests/data/json/R5/patient-example-mom.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-mom.json rename to crates/fhir/tests/data/json/R5/patient-example-mom.json diff --git a/crates/fhir/tests/data/R5/patient-example-newborn.json b/crates/fhir/tests/data/json/R5/patient-example-newborn.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-newborn.json rename to crates/fhir/tests/data/json/R5/patient-example-newborn.json diff --git a/crates/fhir/tests/data/R5/patient-example-proband.json b/crates/fhir/tests/data/json/R5/patient-example-proband.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-proband.json rename to crates/fhir/tests/data/json/R5/patient-example-proband.json diff --git a/crates/fhir/tests/data/R5/patient-example-sex-and-gender.json b/crates/fhir/tests/data/json/R5/patient-example-sex-and-gender.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-sex-and-gender.json rename to crates/fhir/tests/data/json/R5/patient-example-sex-and-gender.json diff --git a/crates/fhir/tests/data/R5/patient-example-xcda.json b/crates/fhir/tests/data/json/R5/patient-example-xcda.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-xcda.json rename to crates/fhir/tests/data/json/R5/patient-example-xcda.json diff --git a/crates/fhir/tests/data/R5/patient-example-xds.json b/crates/fhir/tests/data/json/R5/patient-example-xds.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example-xds.json rename to crates/fhir/tests/data/json/R5/patient-example-xds.json diff --git a/crates/fhir/tests/data/R5/patient-example.json b/crates/fhir/tests/data/json/R5/patient-example.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-example.json rename to crates/fhir/tests/data/json/R5/patient-example.json diff --git a/crates/fhir/tests/data/R5/patient-examples-cypress-template.json b/crates/fhir/tests/data/json/R5/patient-examples-cypress-template.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-examples-cypress-template.json rename to crates/fhir/tests/data/json/R5/patient-examples-cypress-template.json diff --git a/crates/fhir/tests/data/R5/patient-examples-general.json b/crates/fhir/tests/data/json/R5/patient-examples-general.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-examples-general.json rename to crates/fhir/tests/data/json/R5/patient-examples-general.json diff --git a/crates/fhir/tests/data/R5/patient-genetics-example1.json b/crates/fhir/tests/data/json/R5/patient-genetics-example1.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-genetics-example1.json rename to crates/fhir/tests/data/json/R5/patient-genetics-example1.json diff --git a/crates/fhir/tests/data/R5/patient-glossy-example.json b/crates/fhir/tests/data/json/R5/patient-glossy-example.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-glossy-example.json rename to crates/fhir/tests/data/json/R5/patient-glossy-example.json diff --git a/crates/fhir/tests/data/R5/patient-questionnaire.json b/crates/fhir/tests/data/json/R5/patient-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/patient-questionnaire.json rename to crates/fhir/tests/data/json/R5/patient-questionnaire.json diff --git a/crates/fhir/tests/data/R5/patient.profile.json b/crates/fhir/tests/data/json/R5/patient.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/patient.profile.json rename to crates/fhir/tests/data/json/R5/patient.profile.json diff --git a/crates/fhir/tests/data/R5/paymentnotice-example.json b/crates/fhir/tests/data/json/R5/paymentnotice-example.json similarity index 100% rename from crates/fhir/tests/data/R5/paymentnotice-example.json rename to crates/fhir/tests/data/json/R5/paymentnotice-example.json diff --git a/crates/fhir/tests/data/R5/paymentnotice-questionnaire.json b/crates/fhir/tests/data/json/R5/paymentnotice-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/paymentnotice-questionnaire.json rename to crates/fhir/tests/data/json/R5/paymentnotice-questionnaire.json diff --git a/crates/fhir/tests/data/R5/paymentnotice.profile.json b/crates/fhir/tests/data/json/R5/paymentnotice.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/paymentnotice.profile.json rename to crates/fhir/tests/data/json/R5/paymentnotice.profile.json diff --git a/crates/fhir/tests/data/R5/paymentreconciliation-example.json b/crates/fhir/tests/data/json/R5/paymentreconciliation-example.json similarity index 100% rename from crates/fhir/tests/data/R5/paymentreconciliation-example.json rename to crates/fhir/tests/data/json/R5/paymentreconciliation-example.json diff --git a/crates/fhir/tests/data/R5/paymentreconciliation-questionnaire.json b/crates/fhir/tests/data/json/R5/paymentreconciliation-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/paymentreconciliation-questionnaire.json rename to crates/fhir/tests/data/json/R5/paymentreconciliation-questionnaire.json diff --git a/crates/fhir/tests/data/R5/paymentreconciliation.profile.json b/crates/fhir/tests/data/json/R5/paymentreconciliation.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/paymentreconciliation.profile.json rename to crates/fhir/tests/data/json/R5/paymentreconciliation.profile.json diff --git a/crates/fhir/tests/data/R5/pcd-example-notAuthor.json b/crates/fhir/tests/data/json/R5/pcd-example-notAuthor.json similarity index 100% rename from crates/fhir/tests/data/R5/pcd-example-notAuthor.json rename to crates/fhir/tests/data/json/R5/pcd-example-notAuthor.json diff --git a/crates/fhir/tests/data/R5/pcd-example-notLabs.json b/crates/fhir/tests/data/json/R5/pcd-example-notLabs.json similarity index 100% rename from crates/fhir/tests/data/R5/pcd-example-notLabs.json rename to crates/fhir/tests/data/json/R5/pcd-example-notLabs.json diff --git a/crates/fhir/tests/data/R5/pcd-example-notOrg.json b/crates/fhir/tests/data/json/R5/pcd-example-notOrg.json similarity index 100% rename from crates/fhir/tests/data/R5/pcd-example-notOrg.json rename to crates/fhir/tests/data/json/R5/pcd-example-notOrg.json diff --git a/crates/fhir/tests/data/R5/pcd-example-notThem.json b/crates/fhir/tests/data/json/R5/pcd-example-notThem.json similarity index 100% rename from crates/fhir/tests/data/R5/pcd-example-notThem.json rename to crates/fhir/tests/data/json/R5/pcd-example-notThem.json diff --git a/crates/fhir/tests/data/R5/pcd-example-notThis.json b/crates/fhir/tests/data/json/R5/pcd-example-notThis.json similarity index 100% rename from crates/fhir/tests/data/R5/pcd-example-notThis.json rename to crates/fhir/tests/data/json/R5/pcd-example-notThis.json diff --git a/crates/fhir/tests/data/R5/period.profile.json b/crates/fhir/tests/data/json/R5/period.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/period.profile.json rename to crates/fhir/tests/data/json/R5/period.profile.json diff --git a/crates/fhir/tests/data/R5/permission-example-saner.json b/crates/fhir/tests/data/json/R5/permission-example-saner.json similarity index 100% rename from crates/fhir/tests/data/R5/permission-example-saner.json rename to crates/fhir/tests/data/json/R5/permission-example-saner.json diff --git a/crates/fhir/tests/data/R5/permission-example-vhdir.json b/crates/fhir/tests/data/json/R5/permission-example-vhdir.json similarity index 100% rename from crates/fhir/tests/data/R5/permission-example-vhdir.json rename to crates/fhir/tests/data/json/R5/permission-example-vhdir.json diff --git a/crates/fhir/tests/data/R5/permission-example.json b/crates/fhir/tests/data/json/R5/permission-example.json similarity index 100% rename from crates/fhir/tests/data/R5/permission-example.json rename to crates/fhir/tests/data/json/R5/permission-example.json diff --git a/crates/fhir/tests/data/R5/permission-questionnaire.json b/crates/fhir/tests/data/json/R5/permission-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/permission-questionnaire.json rename to crates/fhir/tests/data/json/R5/permission-questionnaire.json diff --git a/crates/fhir/tests/data/R5/permission.profile.json b/crates/fhir/tests/data/json/R5/permission.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/permission.profile.json rename to crates/fhir/tests/data/json/R5/permission.profile.json diff --git a/crates/fhir/tests/data/R5/person-example-f002-ariadne.json b/crates/fhir/tests/data/json/R5/person-example-f002-ariadne.json similarity index 100% rename from crates/fhir/tests/data/R5/person-example-f002-ariadne.json rename to crates/fhir/tests/data/json/R5/person-example-f002-ariadne.json diff --git a/crates/fhir/tests/data/R5/person-example-per4.json b/crates/fhir/tests/data/json/R5/person-example-per4.json similarity index 100% rename from crates/fhir/tests/data/R5/person-example-per4.json rename to crates/fhir/tests/data/json/R5/person-example-per4.json diff --git a/crates/fhir/tests/data/R5/person-example.json b/crates/fhir/tests/data/json/R5/person-example.json similarity index 100% rename from crates/fhir/tests/data/R5/person-example.json rename to crates/fhir/tests/data/json/R5/person-example.json diff --git a/crates/fhir/tests/data/R5/person-grahame.json b/crates/fhir/tests/data/json/R5/person-grahame.json similarity index 100% rename from crates/fhir/tests/data/R5/person-grahame.json rename to crates/fhir/tests/data/json/R5/person-grahame.json diff --git a/crates/fhir/tests/data/R5/person-patient-portal.json b/crates/fhir/tests/data/json/R5/person-patient-portal.json similarity index 100% rename from crates/fhir/tests/data/R5/person-patient-portal.json rename to crates/fhir/tests/data/json/R5/person-patient-portal.json diff --git a/crates/fhir/tests/data/R5/person-provider-directory.json b/crates/fhir/tests/data/json/R5/person-provider-directory.json similarity index 100% rename from crates/fhir/tests/data/R5/person-provider-directory.json rename to crates/fhir/tests/data/json/R5/person-provider-directory.json diff --git a/crates/fhir/tests/data/R5/person-questionnaire.json b/crates/fhir/tests/data/json/R5/person-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/person-questionnaire.json rename to crates/fhir/tests/data/json/R5/person-questionnaire.json diff --git a/crates/fhir/tests/data/R5/person.profile.json b/crates/fhir/tests/data/json/R5/person.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/person.profile.json rename to crates/fhir/tests/data/json/R5/person.profile.json diff --git a/crates/fhir/tests/data/R5/plandefinition-chlamydia-screening-intervention.json b/crates/fhir/tests/data/json/R5/plandefinition-chlamydia-screening-intervention.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition-chlamydia-screening-intervention.json rename to crates/fhir/tests/data/json/R5/plandefinition-chlamydia-screening-intervention.json diff --git a/crates/fhir/tests/data/R5/plandefinition-example-cardiology-os.json b/crates/fhir/tests/data/json/R5/plandefinition-example-cardiology-os.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition-example-cardiology-os.json rename to crates/fhir/tests/data/json/R5/plandefinition-example-cardiology-os.json diff --git a/crates/fhir/tests/data/R5/plandefinition-example-kdn5-simplified.json b/crates/fhir/tests/data/json/R5/plandefinition-example-kdn5-simplified.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition-example-kdn5-simplified.json rename to crates/fhir/tests/data/json/R5/plandefinition-example-kdn5-simplified.json diff --git a/crates/fhir/tests/data/R5/plandefinition-example.json b/crates/fhir/tests/data/json/R5/plandefinition-example.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition-example.json rename to crates/fhir/tests/data/json/R5/plandefinition-example.json diff --git a/crates/fhir/tests/data/R5/plandefinition-exclusive-breastfeeding-intervention-01.json b/crates/fhir/tests/data/json/R5/plandefinition-exclusive-breastfeeding-intervention-01.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition-exclusive-breastfeeding-intervention-01.json rename to crates/fhir/tests/data/json/R5/plandefinition-exclusive-breastfeeding-intervention-01.json diff --git a/crates/fhir/tests/data/R5/plandefinition-exclusive-breastfeeding-intervention-02.json b/crates/fhir/tests/data/json/R5/plandefinition-exclusive-breastfeeding-intervention-02.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition-exclusive-breastfeeding-intervention-02.json rename to crates/fhir/tests/data/json/R5/plandefinition-exclusive-breastfeeding-intervention-02.json diff --git a/crates/fhir/tests/data/R5/plandefinition-exclusive-breastfeeding-intervention-03.json b/crates/fhir/tests/data/json/R5/plandefinition-exclusive-breastfeeding-intervention-03.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition-exclusive-breastfeeding-intervention-03.json rename to crates/fhir/tests/data/json/R5/plandefinition-exclusive-breastfeeding-intervention-03.json diff --git a/crates/fhir/tests/data/R5/plandefinition-exclusive-breastfeeding-intervention-04.json b/crates/fhir/tests/data/json/R5/plandefinition-exclusive-breastfeeding-intervention-04.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition-exclusive-breastfeeding-intervention-04.json rename to crates/fhir/tests/data/json/R5/plandefinition-exclusive-breastfeeding-intervention-04.json diff --git a/crates/fhir/tests/data/R5/plandefinition-opioidcds-04.json b/crates/fhir/tests/data/json/R5/plandefinition-opioidcds-04.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition-opioidcds-04.json rename to crates/fhir/tests/data/json/R5/plandefinition-opioidcds-04.json diff --git a/crates/fhir/tests/data/R5/plandefinition-opioidcds-05.json b/crates/fhir/tests/data/json/R5/plandefinition-opioidcds-05.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition-opioidcds-05.json rename to crates/fhir/tests/data/json/R5/plandefinition-opioidcds-05.json diff --git a/crates/fhir/tests/data/R5/plandefinition-opioidcds-07.json b/crates/fhir/tests/data/json/R5/plandefinition-opioidcds-07.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition-opioidcds-07.json rename to crates/fhir/tests/data/json/R5/plandefinition-opioidcds-07.json diff --git a/crates/fhir/tests/data/R5/plandefinition-opioidcds-08.json b/crates/fhir/tests/data/json/R5/plandefinition-opioidcds-08.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition-opioidcds-08.json rename to crates/fhir/tests/data/json/R5/plandefinition-opioidcds-08.json diff --git a/crates/fhir/tests/data/R5/plandefinition-opioidcds-10.json b/crates/fhir/tests/data/json/R5/plandefinition-opioidcds-10.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition-opioidcds-10.json rename to crates/fhir/tests/data/json/R5/plandefinition-opioidcds-10.json diff --git a/crates/fhir/tests/data/R5/plandefinition-opioidcds-11.json b/crates/fhir/tests/data/json/R5/plandefinition-opioidcds-11.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition-opioidcds-11.json rename to crates/fhir/tests/data/json/R5/plandefinition-opioidcds-11.json diff --git a/crates/fhir/tests/data/R5/plandefinition-options-example.json b/crates/fhir/tests/data/json/R5/plandefinition-options-example.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition-options-example.json rename to crates/fhir/tests/data/json/R5/plandefinition-options-example.json diff --git a/crates/fhir/tests/data/R5/plandefinition-predecessor-example.json b/crates/fhir/tests/data/json/R5/plandefinition-predecessor-example.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition-predecessor-example.json rename to crates/fhir/tests/data/json/R5/plandefinition-predecessor-example.json diff --git a/crates/fhir/tests/data/R5/plandefinition-protocol-example.json b/crates/fhir/tests/data/json/R5/plandefinition-protocol-example.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition-protocol-example.json rename to crates/fhir/tests/data/json/R5/plandefinition-protocol-example.json diff --git a/crates/fhir/tests/data/R5/plandefinition-questionnaire.json b/crates/fhir/tests/data/json/R5/plandefinition-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition-questionnaire.json rename to crates/fhir/tests/data/json/R5/plandefinition-questionnaire.json diff --git a/crates/fhir/tests/data/R5/plandefinition-zika-virus-intervention.json b/crates/fhir/tests/data/json/R5/plandefinition-zika-virus-intervention.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition-zika-virus-intervention.json rename to crates/fhir/tests/data/json/R5/plandefinition-zika-virus-intervention.json diff --git a/crates/fhir/tests/data/R5/plandefinition.profile.json b/crates/fhir/tests/data/json/R5/plandefinition.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/plandefinition.profile.json rename to crates/fhir/tests/data/json/R5/plandefinition.profile.json diff --git a/crates/fhir/tests/data/R5/positiveint.profile.json b/crates/fhir/tests/data/json/R5/positiveint.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/positiveint.profile.json rename to crates/fhir/tests/data/json/R5/positiveint.profile.json diff --git a/crates/fhir/tests/data/R5/practitioner-example-f001-evdb.json b/crates/fhir/tests/data/json/R5/practitioner-example-f001-evdb.json similarity index 100% rename from crates/fhir/tests/data/R5/practitioner-example-f001-evdb.json rename to crates/fhir/tests/data/json/R5/practitioner-example-f001-evdb.json diff --git a/crates/fhir/tests/data/R5/practitioner-example-f002-pv.json b/crates/fhir/tests/data/json/R5/practitioner-example-f002-pv.json similarity index 100% rename from crates/fhir/tests/data/R5/practitioner-example-f002-pv.json rename to crates/fhir/tests/data/json/R5/practitioner-example-f002-pv.json diff --git a/crates/fhir/tests/data/R5/practitioner-example-f003-mv.json b/crates/fhir/tests/data/json/R5/practitioner-example-f003-mv.json similarity index 100% rename from crates/fhir/tests/data/R5/practitioner-example-f003-mv.json rename to crates/fhir/tests/data/json/R5/practitioner-example-f003-mv.json diff --git a/crates/fhir/tests/data/R5/practitioner-example-f004-rb.json b/crates/fhir/tests/data/json/R5/practitioner-example-f004-rb.json similarity index 100% rename from crates/fhir/tests/data/R5/practitioner-example-f004-rb.json rename to crates/fhir/tests/data/json/R5/practitioner-example-f004-rb.json diff --git a/crates/fhir/tests/data/R5/practitioner-example-f005-al.json b/crates/fhir/tests/data/json/R5/practitioner-example-f005-al.json similarity index 100% rename from crates/fhir/tests/data/R5/practitioner-example-f005-al.json rename to crates/fhir/tests/data/json/R5/practitioner-example-f005-al.json diff --git a/crates/fhir/tests/data/R5/practitioner-example-f006-rvdb.json b/crates/fhir/tests/data/json/R5/practitioner-example-f006-rvdb.json similarity index 100% rename from crates/fhir/tests/data/R5/practitioner-example-f006-rvdb.json rename to crates/fhir/tests/data/json/R5/practitioner-example-f006-rvdb.json diff --git a/crates/fhir/tests/data/R5/practitioner-example-f007-sh.json b/crates/fhir/tests/data/json/R5/practitioner-example-f007-sh.json similarity index 100% rename from crates/fhir/tests/data/R5/practitioner-example-f007-sh.json rename to crates/fhir/tests/data/json/R5/practitioner-example-f007-sh.json diff --git a/crates/fhir/tests/data/R5/practitioner-example-f201-ab.json b/crates/fhir/tests/data/json/R5/practitioner-example-f201-ab.json similarity index 100% rename from crates/fhir/tests/data/R5/practitioner-example-f201-ab.json rename to crates/fhir/tests/data/json/R5/practitioner-example-f201-ab.json diff --git a/crates/fhir/tests/data/R5/practitioner-example-f202-lm.json b/crates/fhir/tests/data/json/R5/practitioner-example-f202-lm.json similarity index 100% rename from crates/fhir/tests/data/R5/practitioner-example-f202-lm.json rename to crates/fhir/tests/data/json/R5/practitioner-example-f202-lm.json diff --git a/crates/fhir/tests/data/R5/practitioner-example-f203-jvg.json b/crates/fhir/tests/data/json/R5/practitioner-example-f203-jvg.json similarity index 100% rename from crates/fhir/tests/data/R5/practitioner-example-f203-jvg.json rename to crates/fhir/tests/data/json/R5/practitioner-example-f203-jvg.json diff --git a/crates/fhir/tests/data/R5/practitioner-example-f204-ce.json b/crates/fhir/tests/data/json/R5/practitioner-example-f204-ce.json similarity index 100% rename from crates/fhir/tests/data/R5/practitioner-example-f204-ce.json rename to crates/fhir/tests/data/json/R5/practitioner-example-f204-ce.json diff --git a/crates/fhir/tests/data/R5/practitioner-example-prac4.json b/crates/fhir/tests/data/json/R5/practitioner-example-prac4.json similarity index 100% rename from crates/fhir/tests/data/R5/practitioner-example-prac4.json rename to crates/fhir/tests/data/json/R5/practitioner-example-prac4.json diff --git a/crates/fhir/tests/data/R5/practitioner-example-xcda-author.json b/crates/fhir/tests/data/json/R5/practitioner-example-xcda-author.json similarity index 100% rename from crates/fhir/tests/data/R5/practitioner-example-xcda-author.json rename to crates/fhir/tests/data/json/R5/practitioner-example-xcda-author.json diff --git a/crates/fhir/tests/data/R5/practitioner-example-xcda1.json b/crates/fhir/tests/data/json/R5/practitioner-example-xcda1.json similarity index 100% rename from crates/fhir/tests/data/R5/practitioner-example-xcda1.json rename to crates/fhir/tests/data/json/R5/practitioner-example-xcda1.json diff --git a/crates/fhir/tests/data/R5/practitioner-example.json b/crates/fhir/tests/data/json/R5/practitioner-example.json similarity index 100% rename from crates/fhir/tests/data/R5/practitioner-example.json rename to crates/fhir/tests/data/json/R5/practitioner-example.json diff --git a/crates/fhir/tests/data/R5/practitioner-examples-general.json b/crates/fhir/tests/data/json/R5/practitioner-examples-general.json similarity index 100% rename from crates/fhir/tests/data/R5/practitioner-examples-general.json rename to crates/fhir/tests/data/json/R5/practitioner-examples-general.json diff --git a/crates/fhir/tests/data/R5/practitioner-questionnaire.json b/crates/fhir/tests/data/json/R5/practitioner-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/practitioner-questionnaire.json rename to crates/fhir/tests/data/json/R5/practitioner-questionnaire.json diff --git a/crates/fhir/tests/data/R5/practitioner.profile.json b/crates/fhir/tests/data/json/R5/practitioner.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/practitioner.profile.json rename to crates/fhir/tests/data/json/R5/practitioner.profile.json diff --git a/crates/fhir/tests/data/R5/practitionerrole-example.json b/crates/fhir/tests/data/json/R5/practitionerrole-example.json similarity index 100% rename from crates/fhir/tests/data/R5/practitionerrole-example.json rename to crates/fhir/tests/data/json/R5/practitionerrole-example.json diff --git a/crates/fhir/tests/data/R5/practitionerrole-examples-general.json b/crates/fhir/tests/data/json/R5/practitionerrole-examples-general.json similarity index 100% rename from crates/fhir/tests/data/R5/practitionerrole-examples-general.json rename to crates/fhir/tests/data/json/R5/practitionerrole-examples-general.json diff --git a/crates/fhir/tests/data/R5/practitionerrole-questionnaire.json b/crates/fhir/tests/data/json/R5/practitionerrole-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/practitionerrole-questionnaire.json rename to crates/fhir/tests/data/json/R5/practitionerrole-questionnaire.json diff --git a/crates/fhir/tests/data/R5/practitionerrole.profile.json b/crates/fhir/tests/data/json/R5/practitionerrole.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/practitionerrole.profile.json rename to crates/fhir/tests/data/json/R5/practitionerrole.profile.json diff --git a/crates/fhir/tests/data/R5/primitivetype.profile.json b/crates/fhir/tests/data/json/R5/primitivetype.profile.json similarity index 100% rename from crates/fhir/tests/data/R5/primitivetype.profile.json rename to crates/fhir/tests/data/json/R5/primitivetype.profile.json diff --git a/crates/fhir/tests/data/R5/procedure-example-HCBS.json b/crates/fhir/tests/data/json/R5/procedure-example-HCBS.json similarity index 100% rename from crates/fhir/tests/data/R5/procedure-example-HCBS.json rename to crates/fhir/tests/data/json/R5/procedure-example-HCBS.json diff --git a/crates/fhir/tests/data/R5/procedure-example-ambulation.json b/crates/fhir/tests/data/json/R5/procedure-example-ambulation.json similarity index 100% rename from crates/fhir/tests/data/R5/procedure-example-ambulation.json rename to crates/fhir/tests/data/json/R5/procedure-example-ambulation.json diff --git a/crates/fhir/tests/data/R5/procedure-example-appendectomy-narrative.json b/crates/fhir/tests/data/json/R5/procedure-example-appendectomy-narrative.json similarity index 100% rename from crates/fhir/tests/data/R5/procedure-example-appendectomy-narrative.json rename to crates/fhir/tests/data/json/R5/procedure-example-appendectomy-narrative.json diff --git a/crates/fhir/tests/data/R5/procedure-example-biopsy.json b/crates/fhir/tests/data/json/R5/procedure-example-biopsy.json similarity index 100% rename from crates/fhir/tests/data/R5/procedure-example-biopsy.json rename to crates/fhir/tests/data/json/R5/procedure-example-biopsy.json diff --git a/crates/fhir/tests/data/R5/procedure-example-colon-biopsy.json b/crates/fhir/tests/data/json/R5/procedure-example-colon-biopsy.json similarity index 100% rename from crates/fhir/tests/data/R5/procedure-example-colon-biopsy.json rename to crates/fhir/tests/data/json/R5/procedure-example-colon-biopsy.json diff --git a/crates/fhir/tests/data/R5/procedure-example-colonoscopy.json b/crates/fhir/tests/data/json/R5/procedure-example-colonoscopy.json similarity index 100% rename from crates/fhir/tests/data/R5/procedure-example-colonoscopy.json rename to crates/fhir/tests/data/json/R5/procedure-example-colonoscopy.json diff --git a/crates/fhir/tests/data/R5/procedure-example-education.json b/crates/fhir/tests/data/json/R5/procedure-example-education.json similarity index 100% rename from crates/fhir/tests/data/R5/procedure-example-education.json rename to crates/fhir/tests/data/json/R5/procedure-example-education.json diff --git a/crates/fhir/tests/data/R5/procedure-example-f001-heart.json b/crates/fhir/tests/data/json/R5/procedure-example-f001-heart.json similarity index 100% rename from crates/fhir/tests/data/R5/procedure-example-f001-heart.json rename to crates/fhir/tests/data/json/R5/procedure-example-f001-heart.json diff --git a/crates/fhir/tests/data/R5/procedure-example-f002-lung.json b/crates/fhir/tests/data/json/R5/procedure-example-f002-lung.json similarity index 100% rename from crates/fhir/tests/data/R5/procedure-example-f002-lung.json rename to crates/fhir/tests/data/json/R5/procedure-example-f002-lung.json diff --git a/crates/fhir/tests/data/R5/procedure-example-f003-abscess.json b/crates/fhir/tests/data/json/R5/procedure-example-f003-abscess.json similarity index 100% rename from crates/fhir/tests/data/R5/procedure-example-f003-abscess.json rename to crates/fhir/tests/data/json/R5/procedure-example-f003-abscess.json diff --git a/crates/fhir/tests/data/R5/procedure-example-f004-tracheotomy.json b/crates/fhir/tests/data/json/R5/procedure-example-f004-tracheotomy.json similarity index 100% rename from crates/fhir/tests/data/R5/procedure-example-f004-tracheotomy.json rename to crates/fhir/tests/data/json/R5/procedure-example-f004-tracheotomy.json diff --git a/crates/fhir/tests/data/R5/procedure-example-f201-tpf.json b/crates/fhir/tests/data/json/R5/procedure-example-f201-tpf.json similarity index 100% rename from crates/fhir/tests/data/R5/procedure-example-f201-tpf.json rename to crates/fhir/tests/data/json/R5/procedure-example-f201-tpf.json diff --git a/crates/fhir/tests/data/R5/procedure-example-implant.json b/crates/fhir/tests/data/json/R5/procedure-example-implant.json similarity index 100% rename from crates/fhir/tests/data/R5/procedure-example-implant.json rename to crates/fhir/tests/data/json/R5/procedure-example-implant.json diff --git a/crates/fhir/tests/data/R5/procedure-example-ob.json b/crates/fhir/tests/data/json/R5/procedure-example-ob.json similarity index 100% rename from crates/fhir/tests/data/R5/procedure-example-ob.json rename to crates/fhir/tests/data/json/R5/procedure-example-ob.json diff --git a/crates/fhir/tests/data/R5/procedure-example-physical-therapy.json b/crates/fhir/tests/data/json/R5/procedure-example-physical-therapy.json similarity index 100% rename from crates/fhir/tests/data/R5/procedure-example-physical-therapy.json rename to crates/fhir/tests/data/json/R5/procedure-example-physical-therapy.json diff --git a/crates/fhir/tests/data/R5/procedure-example.json b/crates/fhir/tests/data/json/R5/procedure-example.json similarity index 100% rename from crates/fhir/tests/data/R5/procedure-example.json rename to crates/fhir/tests/data/json/R5/procedure-example.json diff --git a/crates/fhir/tests/data/R5/procedure-questionnaire.json b/crates/fhir/tests/data/json/R5/procedure-questionnaire.json similarity index 100% rename from crates/fhir/tests/data/R5/procedure-questionnaire.json rename to crates/fhir/tests/data/json/R5/procedure-questionnaire.json diff --git a/crates/fhir/tests/data/R5/procedure.profile.json b/crates/fhir/tests/data/json/R5/procedure.profile.json similarity index {"code":"deadline_exceeded","msg":"operation timed out"}