template dir cleanup

dcarbone · Apr 15, 2024 · c78c365 · c78c365
1 parent 9b7cc14
commit c78c365
Show file tree

Hide file tree

Showing 66 changed files with 43 additions and 40 deletions.
diff --git a/files/constants.php b/files/constants.php
@@ -55,21 +55,24 @@
 const PHPFHIR_RESOURCE_TYPE_PROPERTY = 'resourceType';
 const PHPFHIR_VALUE_PROPERTY_NAME = 'value';
 
-// Generation
+// Rendering
 const PHPFHIR_DOCBLOC_MAX_LENGTH = 80;
 const PHPFHIR_NAMESPACE_TRIM_CUTSET = " \t\n\r\0\x0b\\/";
 define('PHPFHIR_TEMPLATE_DIR', realpath(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'template'));
 const PHPFHIR_TEMPLATE_INTERFACES_DIR = PHPFHIR_TEMPLATE_DIR . DIRECTORY_SEPARATOR . 'interfaces';
 const PHPFHIR_TEMPLATE_TRAITS_DIR = PHPFHIR_TEMPLATE_DIR . DIRECTORY_SEPARATOR . 'traits';
 const PHPFHIR_TEMPLATE_FILE_DIR = PHPFHIR_TEMPLATE_DIR . DIRECTORY_SEPARATOR . 'file';
-const PHPFHIR_TEMPLATE_PROPERTIES_DIR = PHPFHIR_TEMPLATE_DIR . DIRECTORY_SEPARATOR . 'properties';
-const PHPFHIR_TEMPLATE_VALIDATION_DIR = PHPFHIR_TEMPLATE_DIR . DIRECTORY_SEPARATOR . 'validation';
-const PHPFHIR_TEMPLATE_METHODS_DIR = PHPFHIR_TEMPLATE_DIR . DIRECTORY_SEPARATOR . 'methods';
-const PHPFHIR_TEMPLATE_CONSTRUCTORS_DIR = PHPFHIR_TEMPLATE_METHODS_DIR . DIRECTORY_SEPARATOR . 'constructors';
-const PHPFHIR_TEMPLATE_TYPES_DIR = PHPFHIR_TEMPLATE_DIR . DIRECTORY_SEPARATOR . 'types';
-const PHPFHIR_TEMPLATE_SERIALIZATION_DIR = PHPFHIR_TEMPLATE_DIR . DIRECTORY_SEPARATOR . 'serialization';
 const PHPFHIR_TEMPLATE_UTILITIES_DIR = PHPFHIR_TEMPLATE_DIR . DIRECTORY_SEPARATOR . 'utilities';
 
+// Type rendering
+const PHPFHIR_TEMPLATE_TYPES_DIR = PHPFHIR_TEMPLATE_DIR . DIRECTORY_SEPARATOR . 'types';
+const PHPFHIR_TEMPLATE_TYPES_PROPERTIES_DIR = PHPFHIR_TEMPLATE_TYPES_DIR . DIRECTORY_SEPARATOR . 'properties';
+const PHPFHIR_TEMPLATE_TYPES_METHODS_DIR = PHPFHIR_TEMPLATE_TYPES_DIR . DIRECTORY_SEPARATOR . 'methods';
+const PHPFHIR_TEMPLATE_TYPES_CONSTRUCTORS_DIR = PHPFHIR_TEMPLATE_TYPES_METHODS_DIR . DIRECTORY_SEPARATOR . 'constructors';
+const PHPFHIR_TEMPLATE_TYPES_SERIALIZATION_DIR = PHPFHIR_TEMPLATE_TYPES_DIR . DIRECTORY_SEPARATOR . 'serialization';
+const PHPFHIR_TEMPLATE_TYPES_VALIDATION_DIR = PHPFHIR_TEMPLATE_TYPES_DIR . DIRECTORY_SEPARATOR . 'validation';
+
+
 // Test Generation
 const PHPFHIR_TEMPLATE_TESTS_DIR = PHPFHIR_TEMPLATE_DIR . DIRECTORY_SEPARATOR . 'tests';
 const PHPFHIR_TEMPLATE_TESTS_TYPES_DIR = PHPFHIR_TEMPLATE_TESTS_DIR . DIRECTORY_SEPARATOR . 'types';

diff --git a/template/types/class.php b/template/types/class.php
@@ -75,7 +75,7 @@
 <?php if (0 !== count($localProperties)) :
     foreach($localProperties as $property) :
         echo require_with(
-            PHPFHIR_TEMPLATE_PROPERTIES_DIR . DIRECTORY_SEPARATOR . 'constants.php',
+            PHPFHIR_TEMPLATE_TYPES_PROPERTIES_DIR . DIRECTORY_SEPARATOR . 'constants.php',
             [
                 'config' => $config,
                 'property' => $property,
@@ -87,7 +87,7 @@
 <?php if (0 !== count($localProperties)) :
     foreach($localProperties as $property) :
         echo require_with(
-            PHPFHIR_TEMPLATE_PROPERTIES_DIR . DIRECTORY_SEPARATOR . 'declaration.php',
+            PHPFHIR_TEMPLATE_TYPES_PROPERTIES_DIR . DIRECTORY_SEPARATOR . 'declaration.php',
             [
                 'config' => $config,
                 'property' => $property,
@@ -97,7 +97,7 @@
 endif;
 
 echo require_with(
-    PHPFHIR_TEMPLATE_VALIDATION_DIR . DIRECTORY_SEPARATOR . 'field_map.php',
+    PHPFHIR_TEMPLATE_TYPES_VALIDATION_DIR . DIRECTORY_SEPARATOR . 'field_map.php',
     [
         'config' => $config,
         'type' => $type,
@@ -107,7 +107,7 @@
 echo "\n";
 
 echo require_with(
-    PHPFHIR_TEMPLATE_METHODS_DIR . DIRECTORY_SEPARATOR . 'constructor.php',
+    PHPFHIR_TEMPLATE_TYPES_METHODS_DIR . DIRECTORY_SEPARATOR . 'constructor.php',
     [
         'config' => $config,
         'type' => $type,
@@ -117,7 +117,7 @@
 );
 
 echo require_with(
-    PHPFHIR_TEMPLATE_METHODS_DIR . DIRECTORY_SEPARATOR . 'common.php',
+    PHPFHIR_TEMPLATE_TYPES_METHODS_DIR . DIRECTORY_SEPARATOR . 'common.php',
     [
         'config' => $config,
         'type' => $type,
@@ -127,7 +127,7 @@
 
 if ($type->isContainedType()) :
     echo require_with(
-        PHPFHIR_TEMPLATE_METHODS_DIR . DIRECTORY_SEPARATOR . 'contained_type.php',
+        PHPFHIR_TEMPLATE_TYPES_METHODS_DIR . DIRECTORY_SEPARATOR . 'contained_type.php',
         [
             'config' => $config,
             'type' => $type,
@@ -138,7 +138,7 @@
  if (0 < count($localProperties)) :
     echo "\n";
     echo require_with(
-        PHPFHIR_TEMPLATE_PROPERTIES_DIR . DIRECTORY_SEPARATOR . 'methods.php',
+        PHPFHIR_TEMPLATE_TYPES_PROPERTIES_DIR . DIRECTORY_SEPARATOR . 'methods.php',
         [
             'config' => $config,
             'type' => $type,
@@ -148,15 +148,15 @@
 endif; ?>
 
 <?php echo require_with(
-        PHPFHIR_TEMPLATE_VALIDATION_DIR . DIRECTORY_SEPARATOR . 'methods.php',
+        PHPFHIR_TEMPLATE_TYPES_VALIDATION_DIR . DIRECTORY_SEPARATOR . 'methods.php',
     [
         'config' => $config,
         'type' => $type,
     ]
 ); ?>
 
 <?php echo require_with(
-        PHPFHIR_TEMPLATE_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml.php',
+        PHPFHIR_TEMPLATE_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml.php',
     [
         'config' => $config,
         'type'     => $type,
@@ -169,7 +169,7 @@
 if (0 < count($localProperties)) :
     echo "\n";
     echo require_with(
-        PHPFHIR_TEMPLATE_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'json.php',
+        PHPFHIR_TEMPLATE_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'json.php',
         [
             'config' => $config,
             'type' => $type,

diff --git a/template/methods/common.php → template/types/methods/common.php b/template/methods/common.php → template/types/methods/common.php
diff --git a/template/methods/constructor.php → template/types/methods/constructor.php b/template/methods/constructor.php → template/types/methods/constructor.php
@@ -34,9 +34,9 @@
 ob_start();
 
 echo match ($typeKind) {
-    TypeKind::PRIMITIVE, TypeKind::_LIST => require_with(PHPFHIR_TEMPLATE_CONSTRUCTORS_DIR . DIRECTORY_SEPARATOR . 'primitive.php', $requireArgs),
-    TypeKind::PRIMITIVE_CONTAINER => require_with(PHPFHIR_TEMPLATE_CONSTRUCTORS_DIR . DIRECTORY_SEPARATOR . 'primitive_container.php', $requireArgs),
-    default => require_with(PHPFHIR_TEMPLATE_CONSTRUCTORS_DIR  . DIRECTORY_SEPARATOR . 'default.php', $requireArgs),
+    TypeKind::PRIMITIVE, TypeKind::_LIST => require_with(PHPFHIR_TEMPLATE_TYPES_CONSTRUCTORS_DIR . DIRECTORY_SEPARATOR . 'primitive.php', $requireArgs),
+    TypeKind::PRIMITIVE_CONTAINER => require_with(PHPFHIR_TEMPLATE_TYPES_CONSTRUCTORS_DIR . DIRECTORY_SEPARATOR . 'primitive_container.php', $requireArgs),
+    default => require_with(PHPFHIR_TEMPLATE_TYPES_CONSTRUCTORS_DIR  . DIRECTORY_SEPARATOR . 'default.php', $requireArgs),
 };
 
 echo "\n";

diff --git a/template/methods/constructors/default.php → ...te/types/methods/constructors/default.php b/template/methods/constructors/default.php → ...te/types/methods/constructors/default.php
@@ -63,7 +63,7 @@ public function __construct(?array $data = null)
     endif;
     if (($propType = $property->getValueFHIRType()) && $propType->getKind()->isOneOf(TypeKind::RESOURCE_INLINE, TypeKind::RESOURCE_CONTAINER)) :
         echo require_with(
-                PHPFHIR_TEMPLATE_CONSTRUCTORS_DIR . DIRECTORY_SEPARATOR . 'resource_container_property_setter_call.php',
+                PHPFHIR_TEMPLATE_TYPES_CONSTRUCTORS_DIR . DIRECTORY_SEPARATOR . 'resource_container_property_setter_call.php',
                 [
                     'config' => $config,
                     'type' => $type,
@@ -72,7 +72,7 @@ public function __construct(?array $data = null)
         );
     else :
         echo require_with(
-                PHPFHIR_TEMPLATE_CONSTRUCTORS_DIR . DIRECTORY_SEPARATOR . 'default_property_setter_call.php',
+                PHPFHIR_TEMPLATE_TYPES_CONSTRUCTORS_DIR . DIRECTORY_SEPARATOR . 'default_property_setter_call.php',
                 [
                     'config' => $config,
                     'type' => $type,

diff --git a/...tructors/default_property_setter_call.php → ...tructors/default_property_setter_call.php b/...tructors/default_property_setter_call.php → ...tructors/default_property_setter_call.php
diff --git a/template/methods/constructors/primitive.php → .../types/methods/constructors/primitive.php b/template/methods/constructors/primitive.php → .../types/methods/constructors/primitive.php
diff --git a/...hods/constructors/primitive_container.php → ...hods/constructors/primitive_container.php b/...hods/constructors/primitive_container.php → ...hods/constructors/primitive_container.php
@@ -74,7 +74,7 @@ public function __construct($data = null)
         continue;
     endif;
     echo require_with(
-            PHPFHIR_TEMPLATE_CONSTRUCTORS_DIR . DIRECTORY_SEPARATOR . 'default_property_setter_call.php',
+            PHPFHIR_TEMPLATE_TYPES_CONSTRUCTORS_DIR . DIRECTORY_SEPARATOR . 'default_property_setter_call.php',
             [
                 'config' => $config,
                 'type' => $type,

diff --git a/.../constructors/property_setter_default.php → .../constructors/property_setter_default.php b/.../constructors/property_setter_default.php → .../constructors/property_setter_default.php
diff --git a/...onstructors/property_setter_primitive.php → ...onstructors/property_setter_primitive.php b/...onstructors/property_setter_primitive.php → ...onstructors/property_setter_primitive.php
diff --git a/...s/property_setter_primitive_container.php → ...s/property_setter_primitive_container.php b/...s/property_setter_primitive_container.php → ...s/property_setter_primitive_container.php
diff --git a/...source_container_property_setter_call.php → ...source_container_property_setter_call.php b/...source_container_property_setter_call.php → ...source_container_property_setter_call.php
diff --git a/template/methods/contained_type.php → template/types/methods/contained_type.php b/template/methods/contained_type.php → template/types/methods/contained_type.php
diff --git a/template/properties/constants.php → template/types/properties/constants.php b/template/properties/constants.php → template/types/properties/constants.php
diff --git a/template/properties/declaration.php → template/types/properties/declaration.php b/template/properties/declaration.php → template/types/properties/declaration.php
diff --git a/template/properties/methods.php → template/types/properties/methods.php b/template/properties/methods.php → template/types/properties/methods.php
@@ -26,15 +26,15 @@
 
 if ($type->getKind()->isOneOf(TypeKind::PRIMITIVE, TypeKind::_LIST)) :
     echo require_with(
-        PHPFHIR_TEMPLATE_PROPERTIES_DIR . DIRECTORY_SEPARATOR . 'methods' . DIRECTORY_SEPARATOR . 'primitive.php',
+        PHPFHIR_TEMPLATE_TYPES_PROPERTIES_DIR . DIRECTORY_SEPARATOR . 'methods' . DIRECTORY_SEPARATOR . 'primitive.php',
         [
             'config' => $config,
             'type' => $type
         ]
     );
 else :
     echo require_with(
-        PHPFHIR_TEMPLATE_PROPERTIES_DIR . DIRECTORY_SEPARATOR . 'methods' . DIRECTORY_SEPARATOR . 'default.php',
+        PHPFHIR_TEMPLATE_TYPES_PROPERTIES_DIR . DIRECTORY_SEPARATOR . 'methods' . DIRECTORY_SEPARATOR . 'default.php',
         [
             'config'           => $config,
             'type'             => $type,

diff --git a/template/properties/methods/default.php → ...late/types/properties/methods/default.php b/template/properties/methods/default.php → ...late/types/properties/methods/default.php
diff --git a/...erties/methods/default/getter_default.php → ...erties/methods/default/getter_default.php b/...erties/methods/default/getter_default.php → ...erties/methods/default/getter_default.php
diff --git a/...ethods/default/getter_primitive_value.php → ...ethods/default/getter_primitive_value.php b/...ethods/default/getter_primitive_value.php → ...ethods/default/getter_primitive_value.php
diff --git a/...ies/methods/default/setter_collection.php → ...ies/methods/default/setter_collection.php b/...ies/methods/default/setter_collection.php → ...ies/methods/default/setter_collection.php
diff --git a/...ods/default/setter_contained_resource.php → ...ods/default/setter_contained_resource.php b/...ods/default/setter_contained_resource.php → ...ods/default/setter_contained_resource.php
diff --git a/.../setter_contained_resource_collection.php → .../setter_contained_resource_collection.php b/.../setter_contained_resource_collection.php → .../setter_contained_resource_collection.php
diff --git a/...erties/methods/default/setter_default.php → ...erties/methods/default/setter_default.php b/...erties/methods/default/setter_default.php → ...erties/methods/default/setter_default.php
diff --git a/...ties/methods/default/setter_primitive.php → ...ties/methods/default/setter_primitive.php b/...ties/methods/default/setter_primitive.php → ...ties/methods/default/setter_primitive.php
diff --git a/template/properties/methods/primitive.php → ...te/types/properties/methods/primitive.php b/template/properties/methods/primitive.php → ...te/types/properties/methods/primitive.php
diff --git a/.../methods/primitive/base64_binary_type.php → .../methods/primitive/base64_binary_type.php b/.../methods/primitive/base64_binary_type.php → .../methods/primitive/base64_binary_type.php
diff --git a/...roperties/methods/primitive/bool_type.php → ...roperties/methods/primitive/bool_type.php b/...roperties/methods/primitive/bool_type.php → ...roperties/methods/primitive/bool_type.php
diff --git a/...roperties/methods/primitive/date_type.php → ...roperties/methods/primitive/date_type.php b/...roperties/methods/primitive/date_type.php → ...roperties/methods/primitive/date_type.php
diff --git a/...rties/methods/primitive/datetime_type.php → ...rties/methods/primitive/datetime_type.php b/...rties/methods/primitive/datetime_type.php → ...rties/methods/primitive/datetime_type.php
diff --git a/...erties/methods/primitive/decimal_type.php → ...erties/methods/primitive/decimal_type.php b/...erties/methods/primitive/decimal_type.php → ...erties/methods/primitive/decimal_type.php
diff --git a/...erties/methods/primitive/instant_type.php → ...erties/methods/primitive/instant_type.php b/...erties/methods/primitive/instant_type.php → ...erties/methods/primitive/instant_type.php
diff --git a/...erties/methods/primitive/integer_type.php → ...erties/methods/primitive/integer_type.php b/...erties/methods/primitive/integer_type.php → ...erties/methods/primitive/integer_type.php
diff --git a/...perties/methods/primitive/string_type.php → ...perties/methods/primitive/string_type.php b/...perties/methods/primitive/string_type.php → ...perties/methods/primitive/string_type.php
diff --git a/...roperties/methods/primitive/time_type.php → ...roperties/methods/primitive/time_type.php b/...roperties/methods/primitive/time_type.php → ...roperties/methods/primitive/time_type.php
diff --git a/...thods/primitive/unsigned_integer_type.php → ...thods/primitive/unsigned_integer_type.php b/...thods/primitive/unsigned_integer_type.php → ...thods/primitive/unsigned_integer_type.php
diff --git a/template/serialization/json.php → template/types/serialization/json.php b/template/serialization/json.php → template/types/serialization/json.php
@@ -27,7 +27,7 @@
 ob_start();
 if ($typeKind->isOneOf(TypeKind::PRIMITIVE, TypeKind::_LIST)) :
     echo require_with(
-        PHPFHIR_TEMPLATE_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . 'primitive.php',
+        PHPFHIR_TEMPLATE_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . 'primitive.php',
         [
             'config' => $config,
             'type'     => $type,
@@ -36,15 +36,15 @@
     );
 elseif ($typeKind->isOneOf(TypeKind::RESOURCE_CONTAINER, TypeKind::RESOURCE_INLINE)) :
     echo require_with(
-        PHPFHIR_TEMPLATE_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . 'resource_container.php',
+        PHPFHIR_TEMPLATE_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . 'resource_container.php',
         [
             'config' => $config,
             'properties' => $localProperties,
         ]
     );
 else:
     echo require_with(
-        PHPFHIR_TEMPLATE_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . 'default.php',
+        PHPFHIR_TEMPLATE_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . 'default.php',
         [
             'config' => $config,
             'type'       => $type,

diff --git a/template/serialization/json/default.php → ...late/types/serialization/json/default.php b/template/serialization/json/default.php → ...late/types/serialization/json/default.php
diff --git a/...ization/json/default_property_default.php → ...ization/json/default_property_default.php b/...ization/json/default_property_default.php → ...ization/json/default_property_default.php
diff --git a/.../json/default_property_primitive_list.php → .../json/default_property_primitive_list.php b/.../json/default_property_primitive_list.php → .../json/default_property_primitive_list.php
diff --git a/...lt_property_value_primitive_container.php → ...lt_property_value_primitive_container.php b/...lt_property_value_primitive_container.php → ...lt_property_value_primitive_container.php
diff --git a/template/serialization/json/list.php → template/types/serialization/json/list.php b/template/serialization/json/list.php → template/types/serialization/json/list.php
diff --git a/template/serialization/json/primitive.php → ...te/types/serialization/json/primitive.php b/template/serialization/json/primitive.php → ...te/types/serialization/json/primitive.php
diff --git a/...serialization/json/resource_container.php → ...serialization/json/resource_container.php b/...serialization/json/resource_container.php → ...serialization/json/resource_container.php
diff --git a/template/serialization/xml.php → template/types/serialization/xml.php b/template/serialization/xml.php → template/types/serialization/xml.php
@@ -32,7 +32,7 @@
 ob_start();
 // unserialize portion
 echo require_with(
-        PHPFHIR_TEMPLATE_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'unserialize' . DIRECTORY_SEPARATOR . 'header.php',
+        PHPFHIR_TEMPLATE_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'unserialize' . DIRECTORY_SEPARATOR . 'header.php',
     [
         'config' => $config,
         'type' => $type,
@@ -44,7 +44,7 @@
 
 if (0 < count($properties)) :
     echo require_with(
-        PHPFHIR_TEMPLATE_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'unserialize' . DIRECTORY_SEPARATOR . 'body.php',
+        PHPFHIR_TEMPLATE_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'unserialize' . DIRECTORY_SEPARATOR . 'body.php',
         [
             'config' => $config,
             'type' => $type,
@@ -61,7 +61,7 @@
 // ResourceContainer and Resource.Inline types have their own special xml serialization mechanism
 if ($typeKind->isOneOf(TypeKind::RESOURCE_CONTAINER, TypeKind::RESOURCE_INLINE)) :
     echo require_with(
-            PHPFHIR_TEMPLATE_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'serialize' . DIRECTORY_SEPARATOR . 'resource_container.php',
+            PHPFHIR_TEMPLATE_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'serialize' . DIRECTORY_SEPARATOR . 'resource_container.php',
             [
                 'config' => $config,
                 'type' => $type,
@@ -71,7 +71,7 @@
     // everything else shares a common header
     // header is always output as it is what creates the simplexml instance
     echo require_with(
-            PHPFHIR_TEMPLATE_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'serialize' . DIRECTORY_SEPARATOR . 'default_header.php',
+            PHPFHIR_TEMPLATE_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'serialize' . DIRECTORY_SEPARATOR . 'default_header.php',
         [
             'config' => $config,
             'parentType' => $parentType,
@@ -80,7 +80,7 @@
 
     if (0 < count($localProperties)) :
         echo require_with(
-            PHPFHIR_TEMPLATE_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'serialize' . DIRECTORY_SEPARATOR . 'default_body.php',
+            PHPFHIR_TEMPLATE_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'serialize' . DIRECTORY_SEPARATOR . 'default_body.php',
             [
                 'config' => $config,
                 'type' => $type,

diff --git a/...ialization/xml/serialize/default_body.php → ...ialization/xml/serialize/default_body.php b/...ialization/xml/serialize/default_body.php → ...ialization/xml/serialize/default_body.php
diff --git a/...tion/xml/serialize/default_body_typed.php → ...tion/xml/serialize/default_body_typed.php b/...tion/xml/serialize/default_body_typed.php → ...tion/xml/serialize/default_body_typed.php
diff --git a/.../serialize/default_body_typed_default.php → .../serialize/default_body_typed_default.php b/.../serialize/default_body_typed_default.php → .../serialize/default_body_typed_default.php
diff --git a/...default_body_typed_resource_container.php → ...default_body_typed_resource_container.php b/...default_body_typed_resource_container.php → ...default_body_typed_resource_container.php
diff --git a/...on/xml/serialize/default_body_untyped.php → ...on/xml/serialize/default_body_untyped.php b/...on/xml/serialize/default_body_untyped.php → ...on/xml/serialize/default_body_untyped.php
diff --git a/...lization/xml/serialize/default_header.php → ...lization/xml/serialize/default_header.php b/...lization/xml/serialize/default_header.php → ...lization/xml/serialize/default_header.php
diff --git a/...tion/xml/serialize/resource_container.php → ...tion/xml/serialize/resource_container.php b/...tion/xml/serialize/resource_container.php → ...tion/xml/serialize/resource_container.php
diff --git a/...te/serialization/xml/unserialize/body.php → ...es/serialization/xml/unserialize/body.php b/...te/serialization/xml/unserialize/body.php → ...es/serialization/xml/unserialize/body.php
diff --git a/...unserialize/body_parse_attr_primitive.php → ...unserialize/body_parse_attr_primitive.php b/...unserialize/body_parse_attr_primitive.php → ...unserialize/body_parse_attr_primitive.php
diff --git a/...xml/unserialize/body_parse_attr_typed.php → ...xml/unserialize/body_parse_attr_typed.php b/...xml/unserialize/body_parse_attr_typed.php → ...xml/unserialize/body_parse_attr_typed.php
diff --git a/...unserialize/body_parse_node_primitive.php → ...unserialize/body_parse_node_primitive.php b/...unserialize/body_parse_node_primitive.php → ...unserialize/body_parse_node_primitive.php
diff --git a/...xml/unserialize/body_parse_node_typed.php → ...xml/unserialize/body_parse_node_typed.php b/...xml/unserialize/body_parse_node_typed.php → ...xml/unserialize/body_parse_node_typed.php
diff --git a/.../unserialize/body_parse_typed_default.php → .../unserialize/body_parse_typed_default.php b/.../unserialize/body_parse_typed_default.php → .../unserialize/body_parse_typed_default.php
diff --git a/...e/body_parse_typed_resource_container.php → ...e/body_parse_typed_resource_container.php b/...e/body_parse_typed_resource_container.php → ...e/body_parse_typed_resource_container.php
diff --git a/.../serialization/xml/unserialize/header.php → .../serialization/xml/unserialize/header.php b/.../serialization/xml/unserialize/header.php → .../serialization/xml/unserialize/header.php
diff --git a/template/validation/field_map.php → template/types/validation/field_map.php b/template/validation/field_map.php → template/types/validation/field_map.php
diff --git a/template/validation/methods.php → template/types/validation/methods.php b/template/validation/methods.php → template/types/validation/methods.php
@@ -59,24 +59,24 @@ public function _getValidationErrors(): array
     if (null === $propertyType) :
         if ($property->isCollection()) :
             echo require_with(
-                PHPFHIR_TEMPLATE_VALIDATION_DIR . DIRECTORY_SEPARATOR . 'methods' . DIRECTORY_SEPARATOR . 'collection_typed.php',
+                PHPFHIR_TEMPLATE_TYPES_VALIDATION_DIR . DIRECTORY_SEPARATOR . 'methods' . DIRECTORY_SEPARATOR . 'collection_typed.php',
                 $requireArgs + ['property' => $property]
             );
         else :
             echo require_with(
-                PHPFHIR_TEMPLATE_VALIDATION_DIR . DIRECTORY_SEPARATOR . 'methods' . DIRECTORY_SEPARATOR . 'primitive.php',
+                PHPFHIR_TEMPLATE_TYPES_VALIDATION_DIR . DIRECTORY_SEPARATOR . 'methods' . DIRECTORY_SEPARATOR . 'primitive.php',
                 $requireArgs + ['property' => $property]
             );
         endif;
     else :
         if ($property->isCollection()) :
             echo require_with(
-                PHPFHIR_TEMPLATE_VALIDATION_DIR . DIRECTORY_SEPARATOR . 'methods' . DIRECTORY_SEPARATOR . 'collection_typed.php',
+                PHPFHIR_TEMPLATE_TYPES_VALIDATION_DIR . DIRECTORY_SEPARATOR . 'methods' . DIRECTORY_SEPARATOR . 'collection_typed.php',
                 $requireArgs + ['property' => $property]
             );
         else :
             echo require_with(
-                PHPFHIR_TEMPLATE_VALIDATION_DIR . DIRECTORY_SEPARATOR . 'methods' . DIRECTORY_SEPARATOR . 'typed.php',
+                PHPFHIR_TEMPLATE_TYPES_VALIDATION_DIR . DIRECTORY_SEPARATOR . 'methods' . DIRECTORY_SEPARATOR . 'typed.php',
                 $requireArgs + ['property' => $property]
             );
         endif;

diff --git a/...lidation/methods/collection_primitive.php → ...lidation/methods/collection_primitive.php b/...lidation/methods/collection_primitive.php → ...lidation/methods/collection_primitive.php
diff --git a/...e/validation/methods/collection_typed.php → ...s/validation/methods/collection_typed.php b/...e/validation/methods/collection_typed.php → ...s/validation/methods/collection_typed.php
diff --git a/template/validation/methods/primitive.php → ...te/types/validation/methods/primitive.php b/template/validation/methods/primitive.php → ...te/types/validation/methods/primitive.php
diff --git a/template/validation/methods/typed.php → template/types/validation/methods/typed.php b/template/validation/methods/typed.php → template/types/validation/methods/typed.php
diff --git a/template/types/xhtml.php b/template/types/xhtml.php
@@ -92,7 +92,7 @@ public function _setElementName(string $elementName): <?php echo $type->getClass
 
 <?php
 echo require_with(
-    PHPFHIR_TEMPLATE_METHODS_DIR . DIRECTORY_SEPARATOR . 'common.php',
+    PHPFHIR_TEMPLATE_TYPES_METHODS_DIR . DIRECTORY_SEPARATOR . 'common.php',
     [
         'config' => $config,
         'type' => $type,
@@ -153,7 +153,7 @@ public function _setData($data): <?php echo $type->getClassName(); ?>
 
 
 <?php echo require_with(
-        PHPFHIR_TEMPLATE_VALIDATION_DIR . DIRECTORY_SEPARATOR . 'methods.php',
+        PHPFHIR_TEMPLATE_TYPES_VALIDATION_DIR . DIRECTORY_SEPARATOR . 'methods.php',
     [
         'config' => $config,
         'type' => $type,
@@ -163,7 +163,7 @@ public function _setData($data): <?php echo $type->getClassName(); ?>
 <?php
 // unserialize portion
 echo require_with(
-        PHPFHIR_TEMPLATE_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'unserialize' . DIRECTORY_SEPARATOR . 'header.php',
+        PHPFHIR_TEMPLATE_TYPES_SERIALIZATION_DIR . DIRECTORY_SEPARATOR . 'xml' . DIRECTORY_SEPARATOR . 'unserialize' . DIRECTORY_SEPARATOR . 'header.php',
     [
         'config' => $config,
         'type' => $type,