AcademySoftwareFoundation · ld-kerley · Jul 3, 2025 · Aug 1, 2025 · Aug 1, 2025
diff --git a/...s/lights/genglsl/lights_genglsl_impl.mtlx → ...s/genglsl/lights/lights_genglsl_impl.mtlx b/...s/lights/genglsl/lights_genglsl_impl.mtlx → ...s/genglsl/lights/lights_genglsl_impl.mtlx
diff --git a/.../lights/genglsl/mx_directional_light.glsl → .../genglsl/lights/mx_directional_light.glsl b/.../lights/genglsl/mx_directional_light.glsl → .../genglsl/lights/mx_directional_light.glsl
diff --git a/libraries/lights/genglsl/mx_point_light.glsl → ...argets/genglsl/lights/mx_point_light.glsl b/libraries/lights/genglsl/mx_point_light.glsl → ...argets/genglsl/lights/mx_point_light.glsl
diff --git a/libraries/lights/genglsl/mx_spot_light.glsl → ...targets/genglsl/lights/mx_spot_light.glsl b/libraries/lights/genglsl/mx_spot_light.glsl → ...targets/genglsl/lights/mx_spot_light.glsl
diff --git a/...s/nprlib/genglsl/nprlib_genglsl_impl.mtlx → ...s/genglsl/nprlib/nprlib_genglsl_impl.mtlx b/...s/nprlib/genglsl/nprlib_genglsl_impl.mtlx → ...s/genglsl/nprlib/nprlib_genglsl_impl.mtlx
diff --git a/...s/pbrlib/genglsl/lib/mx_closure_type.glsl → ...s/genglsl/pbrlib/lib/mx_closure_type.glsl b/...s/pbrlib/genglsl/lib/mx_closure_type.glsl → ...s/genglsl/pbrlib/lib/mx_closure_type.glsl
diff --git a/...brlib/genglsl/lib/mx_environment_fis.glsl → ...englsl/pbrlib/lib/mx_environment_fis.glsl b/...brlib/genglsl/lib/mx_environment_fis.glsl → ...englsl/pbrlib/lib/mx_environment_fis.glsl
diff --git a/...rlib/genglsl/lib/mx_environment_none.glsl → ...nglsl/pbrlib/lib/mx_environment_none.glsl b/...rlib/genglsl/lib/mx_environment_none.glsl → ...nglsl/pbrlib/lib/mx_environment_none.glsl
diff --git a/...genglsl/lib/mx_environment_prefilter.glsl → .../pbrlib/lib/mx_environment_prefilter.glsl b/...genglsl/lib/mx_environment_prefilter.glsl → .../pbrlib/lib/mx_environment_prefilter.glsl
diff --git a/...genglsl/lib/mx_generate_albedo_table.glsl → .../pbrlib/lib/mx_generate_albedo_table.glsl b/...genglsl/lib/mx_generate_albedo_table.glsl → .../pbrlib/lib/mx_generate_albedo_table.glsl
diff --git a/...englsl/lib/mx_generate_prefilter_env.glsl → ...pbrlib/lib/mx_generate_prefilter_env.glsl b/...englsl/lib/mx_generate_prefilter_env.glsl → ...pbrlib/lib/mx_generate_prefilter_env.glsl
diff --git a/...ies/pbrlib/genglsl/lib/mx_microfacet.glsl → ...ets/genglsl/pbrlib/lib/mx_microfacet.glsl b/...ies/pbrlib/genglsl/lib/mx_microfacet.glsl → ...ets/genglsl/pbrlib/lib/mx_microfacet.glsl
diff --git a/...ib/genglsl/lib/mx_microfacet_diffuse.glsl → ...lsl/pbrlib/lib/mx_microfacet_diffuse.glsl b/...ib/genglsl/lib/mx_microfacet_diffuse.glsl → ...lsl/pbrlib/lib/mx_microfacet_diffuse.glsl
diff --git a/...rlib/genglsl/lib/mx_microfacet_sheen.glsl → ...nglsl/pbrlib/lib/mx_microfacet_sheen.glsl b/...rlib/genglsl/lib/mx_microfacet_sheen.glsl → ...nglsl/pbrlib/lib/mx_microfacet_sheen.glsl
diff --git a/...b/genglsl/lib/mx_microfacet_specular.glsl → ...sl/pbrlib/lib/mx_microfacet_specular.glsl b/...b/genglsl/lib/mx_microfacet_specular.glsl → ...sl/pbrlib/lib/mx_microfacet_specular.glsl
diff --git a/libraries/pbrlib/genglsl/lib/mx_shadow.glsl → ...targets/genglsl/pbrlib/lib/mx_shadow.glsl b/libraries/pbrlib/genglsl/lib/mx_shadow.glsl → ...targets/genglsl/pbrlib/lib/mx_shadow.glsl
diff --git a/.../genglsl/lib/mx_transmission_opacity.glsl → ...l/pbrlib/lib/mx_transmission_opacity.glsl b/.../genglsl/lib/mx_transmission_opacity.glsl → ...l/pbrlib/lib/mx_transmission_opacity.glsl
diff --git a/.../genglsl/lib/mx_transmission_refract.glsl → ...l/pbrlib/lib/mx_transmission_refract.glsl b/.../genglsl/lib/mx_transmission_refract.glsl → ...l/pbrlib/lib/mx_transmission_refract.glsl
diff --git a/libraries/pbrlib/genglsl/mx_add_bsdf.glsl → ...s/targets/genglsl/pbrlib/mx_add_bsdf.glsl b/libraries/pbrlib/genglsl/mx_add_bsdf.glsl → ...s/targets/genglsl/pbrlib/mx_add_bsdf.glsl
diff --git a/libraries/pbrlib/genglsl/mx_add_edf.glsl → ...es/targets/genglsl/pbrlib/mx_add_edf.glsl b/libraries/pbrlib/genglsl/mx_add_edf.glsl → ...es/targets/genglsl/pbrlib/mx_add_edf.glsl
diff --git a/...es/pbrlib/genglsl/mx_anisotropic_vdf.glsl → ...ts/genglsl/pbrlib/mx_anisotropic_vdf.glsl b/...es/pbrlib/genglsl/mx_anisotropic_vdf.glsl → ...ts/genglsl/pbrlib/mx_anisotropic_vdf.glsl
diff --git a/...aries/pbrlib/genglsl/mx_artistic_ior.glsl → ...rgets/genglsl/pbrlib/mx_artistic_ior.glsl b/...aries/pbrlib/genglsl/mx_artistic_ior.glsl → ...rgets/genglsl/pbrlib/mx_artistic_ior.glsl
diff --git a/libraries/pbrlib/genglsl/mx_blackbody.glsl → .../targets/genglsl/pbrlib/mx_blackbody.glsl b/libraries/pbrlib/genglsl/mx_blackbody.glsl → .../targets/genglsl/pbrlib/mx_blackbody.glsl
diff --git a/...brlib/genglsl/mx_burley_diffuse_bsdf.glsl → ...englsl/pbrlib/mx_burley_diffuse_bsdf.glsl b/...brlib/genglsl/mx_burley_diffuse_bsdf.glsl → ...englsl/pbrlib/mx_burley_diffuse_bsdf.glsl
diff --git a/...s/pbrlib/genglsl/mx_chiang_hair_bsdf.glsl → ...s/genglsl/pbrlib/mx_chiang_hair_bsdf.glsl b/...s/pbrlib/genglsl/mx_chiang_hair_bsdf.glsl → ...s/genglsl/pbrlib/mx_chiang_hair_bsdf.glsl
diff --git a/...ies/pbrlib/genglsl/mx_conductor_bsdf.glsl → ...ets/genglsl/pbrlib/mx_conductor_bsdf.glsl b/...ies/pbrlib/genglsl/mx_conductor_bsdf.glsl → ...ets/genglsl/pbrlib/mx_conductor_bsdf.glsl
diff --git a/...es/pbrlib/genglsl/mx_dielectric_bsdf.glsl → ...ts/genglsl/pbrlib/mx_dielectric_bsdf.glsl b/...es/pbrlib/genglsl/mx_dielectric_bsdf.glsl → ...ts/genglsl/pbrlib/mx_dielectric_bsdf.glsl
diff --git a/...pbrlib/genglsl/mx_displacement_float.glsl → ...genglsl/pbrlib/mx_displacement_float.glsl b/...pbrlib/genglsl/mx_displacement_float.glsl → ...genglsl/pbrlib/mx_displacement_float.glsl
diff --git a/...rlib/genglsl/mx_displacement_vector3.glsl → ...nglsl/pbrlib/mx_displacement_vector3.glsl b/...rlib/genglsl/mx_displacement_vector3.glsl → ...nglsl/pbrlib/mx_displacement_vector3.glsl
diff --git a/.../genglsl/mx_generalized_schlick_bsdf.glsl → ...l/pbrlib/mx_generalized_schlick_bsdf.glsl b/.../genglsl/mx_generalized_schlick_bsdf.glsl → ...l/pbrlib/mx_generalized_schlick_bsdf.glsl
diff --git a/...b/genglsl/mx_generalized_schlick_edf.glsl → ...sl/pbrlib/mx_generalized_schlick_edf.glsl b/...b/genglsl/mx_generalized_schlick_edf.glsl → ...sl/pbrlib/mx_generalized_schlick_edf.glsl
diff --git a/libraries/pbrlib/genglsl/mx_layer_bsdf.glsl → ...targets/genglsl/pbrlib/mx_layer_bsdf.glsl b/libraries/pbrlib/genglsl/mx_layer_bsdf.glsl → ...targets/genglsl/pbrlib/mx_layer_bsdf.glsl
diff --git a/libraries/pbrlib/genglsl/mx_layer_vdf.glsl → .../targets/genglsl/pbrlib/mx_layer_vdf.glsl b/libraries/pbrlib/genglsl/mx_layer_vdf.glsl → .../targets/genglsl/pbrlib/mx_layer_vdf.glsl
diff --git a/libraries/pbrlib/genglsl/mx_mix_bsdf.glsl → ...s/targets/genglsl/pbrlib/mx_mix_bsdf.glsl b/libraries/pbrlib/genglsl/mx_mix_bsdf.glsl → ...s/targets/genglsl/pbrlib/mx_mix_bsdf.glsl
diff --git a/libraries/pbrlib/genglsl/mx_mix_edf.glsl → ...es/targets/genglsl/pbrlib/mx_mix_edf.glsl b/libraries/pbrlib/genglsl/mx_mix_edf.glsl → ...es/targets/genglsl/pbrlib/mx_mix_edf.glsl
diff --git a/...rlib/genglsl/mx_multiply_bsdf_color3.glsl → ...nglsl/pbrlib/mx_multiply_bsdf_color3.glsl b/...rlib/genglsl/mx_multiply_bsdf_color3.glsl → ...nglsl/pbrlib/mx_multiply_bsdf_color3.glsl
diff --git a/...brlib/genglsl/mx_multiply_bsdf_float.glsl → ...englsl/pbrlib/mx_multiply_bsdf_float.glsl b/...brlib/genglsl/mx_multiply_bsdf_float.glsl → ...englsl/pbrlib/mx_multiply_bsdf_float.glsl
diff --git a/...brlib/genglsl/mx_multiply_edf_color3.glsl → ...englsl/pbrlib/mx_multiply_edf_color3.glsl b/...brlib/genglsl/mx_multiply_edf_color3.glsl → ...englsl/pbrlib/mx_multiply_edf_color3.glsl
diff --git a/...pbrlib/genglsl/mx_multiply_edf_float.glsl → ...genglsl/pbrlib/mx_multiply_edf_float.glsl b/...pbrlib/genglsl/mx_multiply_edf_float.glsl → ...genglsl/pbrlib/mx_multiply_edf_float.glsl
diff --git a/...b/genglsl/mx_oren_nayar_diffuse_bsdf.glsl → ...sl/pbrlib/mx_oren_nayar_diffuse_bsdf.glsl b/...b/genglsl/mx_oren_nayar_diffuse_bsdf.glsl → ...sl/pbrlib/mx_oren_nayar_diffuse_bsdf.glsl
diff --git a/...rlib/genglsl/mx_roughness_anisotropy.glsl → ...nglsl/pbrlib/mx_roughness_anisotropy.glsl b/...rlib/genglsl/mx_roughness_anisotropy.glsl → ...nglsl/pbrlib/mx_roughness_anisotropy.glsl
diff --git a/...ies/pbrlib/genglsl/mx_roughness_dual.glsl → ...ets/genglsl/pbrlib/mx_roughness_dual.glsl b/...ies/pbrlib/genglsl/mx_roughness_dual.glsl → ...ets/genglsl/pbrlib/mx_roughness_dual.glsl
diff --git a/libraries/pbrlib/genglsl/mx_sheen_bsdf.glsl → ...targets/genglsl/pbrlib/mx_sheen_bsdf.glsl b/libraries/pbrlib/genglsl/mx_sheen_bsdf.glsl → ...targets/genglsl/pbrlib/mx_sheen_bsdf.glsl
diff --git a/...es/pbrlib/genglsl/mx_subsurface_bsdf.glsl → ...ts/genglsl/pbrlib/mx_subsurface_bsdf.glsl b/...es/pbrlib/genglsl/mx_subsurface_bsdf.glsl → ...ts/genglsl/pbrlib/mx_subsurface_bsdf.glsl
diff --git a/...s/pbrlib/genglsl/mx_translucent_bsdf.glsl → ...s/genglsl/pbrlib/mx_translucent_bsdf.glsl b/...s/pbrlib/genglsl/mx_translucent_bsdf.glsl → ...s/genglsl/pbrlib/mx_translucent_bsdf.glsl
diff --git a/libraries/pbrlib/genglsl/mx_uniform_edf.glsl → ...argets/genglsl/pbrlib/mx_uniform_edf.glsl b/libraries/pbrlib/genglsl/mx_uniform_edf.glsl → ...argets/genglsl/pbrlib/mx_uniform_edf.glsl
diff --git a/...s/pbrlib/genglsl/pbrlib_genglsl_impl.mtlx → ...s/genglsl/pbrlib/pbrlib_genglsl_impl.mtlx b/...s/pbrlib/genglsl/pbrlib_genglsl_impl.mtlx → ...s/genglsl/pbrlib/pbrlib_genglsl_impl.mtlx
diff --git a/...aries/stdlib/genglsl/lib/mx_geometry.glsl → ...rgets/genglsl/stdlib/lib/mx_geometry.glsl b/...aries/stdlib/genglsl/lib/mx_geometry.glsl → ...rgets/genglsl/stdlib/lib/mx_geometry.glsl
diff --git a/libraries/stdlib/genglsl/lib/mx_hextile.glsl → ...argets/genglsl/stdlib/lib/mx_hextile.glsl b/libraries/stdlib/genglsl/lib/mx_hextile.glsl → ...argets/genglsl/stdlib/lib/mx_hextile.glsl
diff --git a/libraries/stdlib/genglsl/lib/mx_hsv.glsl → ...es/targets/genglsl/stdlib/lib/mx_hsv.glsl b/libraries/stdlib/genglsl/lib/mx_hsv.glsl → ...es/targets/genglsl/stdlib/lib/mx_hsv.glsl
diff --git a/libraries/stdlib/genglsl/lib/mx_math.glsl → ...s/targets/genglsl/stdlib/lib/mx_math.glsl b/libraries/stdlib/genglsl/lib/mx_math.glsl → ...s/targets/genglsl/stdlib/lib/mx_math.glsl
diff --git a/libraries/stdlib/genglsl/lib/mx_noise.glsl → .../targets/genglsl/stdlib/lib/mx_noise.glsl b/libraries/stdlib/genglsl/lib/mx_noise.glsl → .../targets/genglsl/stdlib/lib/mx_noise.glsl
diff --git a/...s/stdlib/genglsl/lib/mx_transform_uv.glsl → ...s/genglsl/stdlib/lib/mx_transform_uv.glsl b/...s/stdlib/genglsl/lib/mx_transform_uv.glsl → ...s/genglsl/stdlib/lib/mx_transform_uv.glsl
diff --git a/...ib/genglsl/lib/mx_transform_uv_vflip.glsl → ...lsl/stdlib/lib/mx_transform_uv_vflip.glsl b/...ib/genglsl/lib/mx_transform_uv_vflip.glsl → ...lsl/stdlib/lib/mx_transform_uv_vflip.glsl
diff --git a/libraries/stdlib/genglsl/mx_aastep.glsl → ...ies/targets/genglsl/stdlib/mx_aastep.glsl b/libraries/stdlib/genglsl/mx_aastep.glsl → ...ies/targets/genglsl/stdlib/mx_aastep.glsl
diff --git a/libraries/stdlib/genglsl/mx_burn_color3.glsl → ...argets/genglsl/stdlib/mx_burn_color3.glsl b/libraries/stdlib/genglsl/mx_burn_color3.glsl → ...argets/genglsl/stdlib/mx_burn_color3.glsl
diff --git a/libraries/stdlib/genglsl/mx_burn_color4.glsl → ...argets/genglsl/stdlib/mx_burn_color4.glsl b/libraries/stdlib/genglsl/mx_burn_color4.glsl → ...argets/genglsl/stdlib/mx_burn_color4.glsl
diff --git a/libraries/stdlib/genglsl/mx_burn_float.glsl → ...targets/genglsl/stdlib/mx_burn_float.glsl b/libraries/stdlib/genglsl/mx_burn_float.glsl → ...targets/genglsl/stdlib/mx_burn_float.glsl
diff --git a/.../stdlib/genglsl/mx_cellnoise2d_float.glsl → .../genglsl/stdlib/mx_cellnoise2d_float.glsl b/.../stdlib/genglsl/mx_cellnoise2d_float.glsl → .../genglsl/stdlib/mx_cellnoise2d_float.glsl
diff --git a/.../stdlib/genglsl/mx_cellnoise3d_float.glsl → .../genglsl/stdlib/mx_cellnoise3d_float.glsl b/.../stdlib/genglsl/mx_cellnoise3d_float.glsl → .../genglsl/stdlib/mx_cellnoise3d_float.glsl
diff --git a/...lsl/mx_creatematrix_vector3_matrix33.glsl → ...lib/mx_creatematrix_vector3_matrix33.glsl b/...lsl/mx_creatematrix_vector3_matrix33.glsl → ...lib/mx_creatematrix_vector3_matrix33.glsl
diff --git a/...lsl/mx_creatematrix_vector3_matrix44.glsl → ...lib/mx_creatematrix_vector3_matrix44.glsl b/...lsl/mx_creatematrix_vector3_matrix44.glsl → ...lib/mx_creatematrix_vector3_matrix44.glsl
diff --git a/...lsl/mx_creatematrix_vector4_matrix44.glsl → ...lib/mx_creatematrix_vector4_matrix44.glsl b/...lsl/mx_creatematrix_vector4_matrix44.glsl → ...lib/mx_creatematrix_vector4_matrix44.glsl
diff --git a/...tdlib/genglsl/mx_disjointover_color4.glsl → ...englsl/stdlib/mx_disjointover_color4.glsl b/...tdlib/genglsl/mx_disjointover_color4.glsl → ...englsl/stdlib/mx_disjointover_color4.glsl
diff --git a/...aries/stdlib/genglsl/mx_dodge_color3.glsl → ...rgets/genglsl/stdlib/mx_dodge_color3.glsl b/...aries/stdlib/genglsl/mx_dodge_color3.glsl → ...rgets/genglsl/stdlib/mx_dodge_color3.glsl
diff --git a/...aries/stdlib/genglsl/mx_dodge_color4.glsl → ...rgets/genglsl/stdlib/mx_dodge_color4.glsl b/...aries/stdlib/genglsl/mx_dodge_color4.glsl → ...rgets/genglsl/stdlib/mx_dodge_color4.glsl
diff --git a/libraries/stdlib/genglsl/mx_dodge_float.glsl → ...argets/genglsl/stdlib/mx_dodge_float.glsl b/libraries/stdlib/genglsl/mx_dodge_float.glsl → ...argets/genglsl/stdlib/mx_dodge_float.glsl
diff --git a/...es/stdlib/genglsl/mx_fractal2d_float.glsl → ...ts/genglsl/stdlib/mx_fractal2d_float.glsl b/...es/stdlib/genglsl/mx_fractal2d_float.glsl → ...ts/genglsl/stdlib/mx_fractal2d_float.glsl
diff --git a/.../stdlib/genglsl/mx_fractal2d_vector2.glsl → .../genglsl/stdlib/mx_fractal2d_vector2.glsl b/.../stdlib/genglsl/mx_fractal2d_vector2.glsl → .../genglsl/stdlib/mx_fractal2d_vector2.glsl
diff --git a/.../stdlib/genglsl/mx_fractal2d_vector3.glsl → .../genglsl/stdlib/mx_fractal2d_vector3.glsl b/.../stdlib/genglsl/mx_fractal2d_vector3.glsl → .../genglsl/stdlib/mx_fractal2d_vector3.glsl
diff --git a/.../stdlib/genglsl/mx_fractal2d_vector4.glsl → .../genglsl/stdlib/mx_fractal2d_vector4.glsl b/.../stdlib/genglsl/mx_fractal2d_vector4.glsl → .../genglsl/stdlib/mx_fractal2d_vector4.glsl
diff --git a/...es/stdlib/genglsl/mx_fractal3d_float.glsl → ...ts/genglsl/stdlib/mx_fractal3d_float.glsl b/...es/stdlib/genglsl/mx_fractal3d_float.glsl → ...ts/genglsl/stdlib/mx_fractal3d_float.glsl
diff --git a/.../stdlib/genglsl/mx_fractal3d_vector2.glsl → .../genglsl/stdlib/mx_fractal3d_vector2.glsl b/.../stdlib/genglsl/mx_fractal3d_vector2.glsl → .../genglsl/stdlib/mx_fractal3d_vector2.glsl
diff --git a/.../stdlib/genglsl/mx_fractal3d_vector3.glsl → .../genglsl/stdlib/mx_fractal3d_vector3.glsl b/.../stdlib/genglsl/mx_fractal3d_vector3.glsl → .../genglsl/stdlib/mx_fractal3d_vector3.glsl
diff --git a/.../stdlib/genglsl/mx_fractal3d_vector4.glsl → .../genglsl/stdlib/mx_fractal3d_vector4.glsl b/.../stdlib/genglsl/mx_fractal3d_vector4.glsl → .../genglsl/stdlib/mx_fractal3d_vector4.glsl
diff --git a/...ib/genglsl/mx_heighttonormal_vector3.glsl → ...lsl/stdlib/mx_heighttonormal_vector3.glsl b/...ib/genglsl/mx_heighttonormal_vector3.glsl → ...lsl/stdlib/mx_heighttonormal_vector3.glsl
diff --git a/...ries/stdlib/genglsl/mx_hextiledimage.glsl → ...gets/genglsl/stdlib/mx_hextiledimage.glsl b/...ries/stdlib/genglsl/mx_hextiledimage.glsl → ...gets/genglsl/stdlib/mx_hextiledimage.glsl
diff --git a/.../stdlib/genglsl/mx_hextilednormalmap.glsl → .../genglsl/stdlib/mx_hextilednormalmap.glsl b/.../stdlib/genglsl/mx_hextilednormalmap.glsl → .../genglsl/stdlib/mx_hextilednormalmap.glsl
diff --git a/...es/stdlib/genglsl/mx_hsvtorgb_color3.glsl → ...ts/genglsl/stdlib/mx_hsvtorgb_color3.glsl b/...es/stdlib/genglsl/mx_hsvtorgb_color3.glsl → ...ts/genglsl/stdlib/mx_hsvtorgb_color3.glsl
diff --git a/...es/stdlib/genglsl/mx_hsvtorgb_color4.glsl → ...ts/genglsl/stdlib/mx_hsvtorgb_color4.glsl b/...es/stdlib/genglsl/mx_hsvtorgb_color4.glsl → ...ts/genglsl/stdlib/mx_hsvtorgb_color4.glsl
diff --git a/...aries/stdlib/genglsl/mx_image_color3.glsl → ...rgets/genglsl/stdlib/mx_image_color3.glsl b/...aries/stdlib/genglsl/mx_image_color3.glsl → ...rgets/genglsl/stdlib/mx_image_color3.glsl
diff --git a/...aries/stdlib/genglsl/mx_image_color4.glsl → ...rgets/genglsl/stdlib/mx_image_color4.glsl b/...aries/stdlib/genglsl/mx_image_color4.glsl → ...rgets/genglsl/stdlib/mx_image_color4.glsl
diff --git a/libraries/stdlib/genglsl/mx_image_float.glsl → ...argets/genglsl/stdlib/mx_image_float.glsl b/libraries/stdlib/genglsl/mx_image_float.glsl → ...argets/genglsl/stdlib/mx_image_float.glsl
diff --git a/...ries/stdlib/genglsl/mx_image_vector2.glsl → ...gets/genglsl/stdlib/mx_image_vector2.glsl b/...ries/stdlib/genglsl/mx_image_vector2.glsl → ...gets/genglsl/stdlib/mx_image_vector2.glsl
diff --git a/...ries/stdlib/genglsl/mx_image_vector3.glsl → ...gets/genglsl/stdlib/mx_image_vector3.glsl b/...ries/stdlib/genglsl/mx_image_vector3.glsl → ...gets/genglsl/stdlib/mx_image_vector3.glsl
diff --git a/...ries/stdlib/genglsl/mx_image_vector4.glsl → ...gets/genglsl/stdlib/mx_image_vector4.glsl b/...ries/stdlib/genglsl/mx_image_vector4.glsl → ...gets/genglsl/stdlib/mx_image_vector4.glsl
diff --git a/...s/stdlib/genglsl/mx_luminance_color3.glsl → ...s/genglsl/stdlib/mx_luminance_color3.glsl b/...s/stdlib/genglsl/mx_luminance_color3.glsl → ...s/genglsl/stdlib/mx_luminance_color3.glsl
diff --git a/...s/stdlib/genglsl/mx_luminance_color4.glsl → ...s/genglsl/stdlib/mx_luminance_color4.glsl b/...s/stdlib/genglsl/mx_luminance_color4.glsl → ...s/genglsl/stdlib/mx_luminance_color4.glsl
diff --git a/.../stdlib/genglsl/mx_mix_surfaceshader.glsl → .../genglsl/stdlib/mx_mix_surfaceshader.glsl b/.../stdlib/genglsl/mx_mix_surfaceshader.glsl → .../genglsl/stdlib/mx_mix_surfaceshader.glsl
diff --git a/...ries/stdlib/genglsl/mx_noise2d_float.glsl → ...gets/genglsl/stdlib/mx_noise2d_float.glsl b/...ries/stdlib/genglsl/mx_noise2d_float.glsl → ...gets/genglsl/stdlib/mx_noise2d_float.glsl
diff --git a/...es/stdlib/genglsl/mx_noise2d_vector2.glsl → ...ts/genglsl/stdlib/mx_noise2d_vector2.glsl b/...es/stdlib/genglsl/mx_noise2d_vector2.glsl → ...ts/genglsl/stdlib/mx_noise2d_vector2.glsl
diff --git a/...es/stdlib/genglsl/mx_noise2d_vector3.glsl → ...ts/genglsl/stdlib/mx_noise2d_vector3.glsl b/...es/stdlib/genglsl/mx_noise2d_vector3.glsl → ...ts/genglsl/stdlib/mx_noise2d_vector3.glsl
diff --git a/...es/stdlib/genglsl/mx_noise2d_vector4.glsl → ...ts/genglsl/stdlib/mx_noise2d_vector4.glsl b/...es/stdlib/genglsl/mx_noise2d_vector4.glsl → ...ts/genglsl/stdlib/mx_noise2d_vector4.glsl
diff --git a/...ries/stdlib/genglsl/mx_noise3d_float.glsl → ...gets/genglsl/stdlib/mx_noise3d_float.glsl b/...ries/stdlib/genglsl/mx_noise3d_float.glsl → ...gets/genglsl/stdlib/mx_noise3d_float.glsl
diff --git a/...es/stdlib/genglsl/mx_noise3d_vector2.glsl → ...ts/genglsl/stdlib/mx_noise3d_vector2.glsl b/...es/stdlib/genglsl/mx_noise3d_vector2.glsl → ...ts/genglsl/stdlib/mx_noise3d_vector2.glsl
diff --git a/...es/stdlib/genglsl/mx_noise3d_vector3.glsl → ...ts/genglsl/stdlib/mx_noise3d_vector3.glsl b/...es/stdlib/genglsl/mx_noise3d_vector3.glsl → ...ts/genglsl/stdlib/mx_noise3d_vector3.glsl
diff --git a/...es/stdlib/genglsl/mx_noise3d_vector4.glsl → ...ts/genglsl/stdlib/mx_noise3d_vector4.glsl b/...es/stdlib/genglsl/mx_noise3d_vector4.glsl → ...ts/genglsl/stdlib/mx_noise3d_vector4.glsl
diff --git a/libraries/stdlib/genglsl/mx_normalmap.glsl → .../targets/genglsl/stdlib/mx_normalmap.glsl b/libraries/stdlib/genglsl/mx_normalmap.glsl → .../targets/genglsl/stdlib/mx_normalmap.glsl
diff --git a/...ies/stdlib/genglsl/mx_premult_color4.glsl → ...ets/genglsl/stdlib/mx_premult_color4.glsl b/...ies/stdlib/genglsl/mx_premult_color4.glsl → ...ets/genglsl/stdlib/mx_premult_color4.glsl
diff --git a/...aries/stdlib/genglsl/mx_ramplr_float.glsl → ...rgets/genglsl/stdlib/mx_ramplr_float.glsl b/...aries/stdlib/genglsl/mx_ramplr_float.glsl → ...rgets/genglsl/stdlib/mx_ramplr_float.glsl
diff --git a/...ies/stdlib/genglsl/mx_ramplr_vector2.glsl → ...ets/genglsl/stdlib/mx_ramplr_vector2.glsl b/...ies/stdlib/genglsl/mx_ramplr_vector2.glsl → ...ets/genglsl/stdlib/mx_ramplr_vector2.glsl
diff --git a/...ies/stdlib/genglsl/mx_ramplr_vector3.glsl → ...ets/genglsl/stdlib/mx_ramplr_vector3.glsl b/...ies/stdlib/genglsl/mx_ramplr_vector3.glsl → ...ets/genglsl/stdlib/mx_ramplr_vector3.glsl
diff --git a/...ies/stdlib/genglsl/mx_ramplr_vector4.glsl → ...ets/genglsl/stdlib/mx_ramplr_vector4.glsl b/...ies/stdlib/genglsl/mx_ramplr_vector4.glsl → ...ets/genglsl/stdlib/mx_ramplr_vector4.glsl
diff --git a/...aries/stdlib/genglsl/mx_ramptb_float.glsl → ...rgets/genglsl/stdlib/mx_ramptb_float.glsl b/...aries/stdlib/genglsl/mx_ramptb_float.glsl → ...rgets/genglsl/stdlib/mx_ramptb_float.glsl
diff --git a/...ies/stdlib/genglsl/mx_ramptb_vector2.glsl → ...ets/genglsl/stdlib/mx_ramptb_vector2.glsl b/...ies/stdlib/genglsl/mx_ramptb_vector2.glsl → ...ets/genglsl/stdlib/mx_ramptb_vector2.glsl
diff --git a/...ies/stdlib/genglsl/mx_ramptb_vector3.glsl → ...ets/genglsl/stdlib/mx_ramptb_vector3.glsl b/...ies/stdlib/genglsl/mx_ramptb_vector3.glsl → ...ets/genglsl/stdlib/mx_ramptb_vector3.glsl
diff --git a/...ies/stdlib/genglsl/mx_ramptb_vector4.glsl → ...ets/genglsl/stdlib/mx_ramptb_vector4.glsl b/...ies/stdlib/genglsl/mx_ramptb_vector4.glsl → ...ets/genglsl/stdlib/mx_ramptb_vector4.glsl
diff --git a/...es/stdlib/genglsl/mx_rgbtohsv_color3.glsl → ...ts/genglsl/stdlib/mx_rgbtohsv_color3.glsl b/...es/stdlib/genglsl/mx_rgbtohsv_color3.glsl → ...ts/genglsl/stdlib/mx_rgbtohsv_color3.glsl
diff --git a/...es/stdlib/genglsl/mx_rgbtohsv_color4.glsl → ...ts/genglsl/stdlib/mx_rgbtohsv_color4.glsl b/...es/stdlib/genglsl/mx_rgbtohsv_color4.glsl → ...ts/genglsl/stdlib/mx_rgbtohsv_color4.glsl
diff --git a/...ies/stdlib/genglsl/mx_rotate_vector2.glsl → ...ets/genglsl/stdlib/mx_rotate_vector2.glsl b/...ies/stdlib/genglsl/mx_rotate_vector2.glsl → ...ets/genglsl/stdlib/mx_rotate_vector2.glsl
diff --git a/...ies/stdlib/genglsl/mx_rotate_vector3.glsl → ...ets/genglsl/stdlib/mx_rotate_vector3.glsl b/...ies/stdlib/genglsl/mx_rotate_vector3.glsl → ...ets/genglsl/stdlib/mx_rotate_vector3.glsl
diff --git a/...s/stdlib/genglsl/mx_smoothstep_float.glsl → ...s/genglsl/stdlib/mx_smoothstep_float.glsl b/...s/stdlib/genglsl/mx_smoothstep_float.glsl → ...s/genglsl/stdlib/mx_smoothstep_float.glsl
diff --git a/...ries/stdlib/genglsl/mx_splitlr_float.glsl → ...gets/genglsl/stdlib/mx_splitlr_float.glsl b/...ries/stdlib/genglsl/mx_splitlr_float.glsl → ...gets/genglsl/stdlib/mx_splitlr_float.glsl
diff --git a/...es/stdlib/genglsl/mx_splitlr_vector2.glsl → ...ts/genglsl/stdlib/mx_splitlr_vector2.glsl b/...es/stdlib/genglsl/mx_splitlr_vector2.glsl → ...ts/genglsl/stdlib/mx_splitlr_vector2.glsl
diff --git a/...es/stdlib/genglsl/mx_splitlr_vector3.glsl → ...ts/genglsl/stdlib/mx_splitlr_vector3.glsl b/...es/stdlib/genglsl/mx_splitlr_vector3.glsl → ...ts/genglsl/stdlib/mx_splitlr_vector3.glsl
diff --git a/...es/stdlib/genglsl/mx_splitlr_vector4.glsl → ...ts/genglsl/stdlib/mx_splitlr_vector4.glsl b/...es/stdlib/genglsl/mx_splitlr_vector4.glsl → ...ts/genglsl/stdlib/mx_splitlr_vector4.glsl
diff --git a/...ries/stdlib/genglsl/mx_splittb_float.glsl → ...gets/genglsl/stdlib/mx_splittb_float.glsl b/...ries/stdlib/genglsl/mx_splittb_float.glsl → ...gets/genglsl/stdlib/mx_splittb_float.glsl
diff --git a/...es/stdlib/genglsl/mx_splittb_vector2.glsl → ...ts/genglsl/stdlib/mx_splittb_vector2.glsl b/...es/stdlib/genglsl/mx_splittb_vector2.glsl → ...ts/genglsl/stdlib/mx_splittb_vector2.glsl
diff --git a/...es/stdlib/genglsl/mx_splittb_vector3.glsl → ...ts/genglsl/stdlib/mx_splittb_vector3.glsl b/...es/stdlib/genglsl/mx_splittb_vector3.glsl → ...ts/genglsl/stdlib/mx_splittb_vector3.glsl
diff --git a/...es/stdlib/genglsl/mx_splittb_vector4.glsl → ...ts/genglsl/stdlib/mx_splittb_vector4.glsl b/...es/stdlib/genglsl/mx_splittb_vector4.glsl → ...ts/genglsl/stdlib/mx_splittb_vector4.glsl
diff --git a/...ries/stdlib/genglsl/mx_surface_unlit.glsl → ...gets/genglsl/stdlib/mx_surface_unlit.glsl b/...ries/stdlib/genglsl/mx_surface_unlit.glsl → ...gets/genglsl/stdlib/mx_surface_unlit.glsl
diff --git a/...genglsl/mx_transformmatrix_vector2M3.glsl → .../stdlib/mx_transformmatrix_vector2M3.glsl b/...genglsl/mx_transformmatrix_vector2M3.glsl → .../stdlib/mx_transformmatrix_vector2M3.glsl
diff --git a/...genglsl/mx_transformmatrix_vector3M4.glsl → .../stdlib/mx_transformmatrix_vector3M4.glsl b/...genglsl/mx_transformmatrix_vector3M4.glsl → .../stdlib/mx_transformmatrix_vector3M4.glsl
diff --git a/...s/stdlib/genglsl/mx_unpremult_color4.glsl → ...s/genglsl/stdlib/mx_unpremult_color4.glsl b/...s/stdlib/genglsl/mx_unpremult_color4.glsl → ...s/genglsl/stdlib/mx_unpremult_color4.glsl
diff --git a/...tdlib/genglsl/mx_worleynoise2d_float.glsl → ...englsl/stdlib/mx_worleynoise2d_float.glsl b/...tdlib/genglsl/mx_worleynoise2d_float.glsl → ...englsl/stdlib/mx_worleynoise2d_float.glsl
diff --git a/...lib/genglsl/mx_worleynoise2d_vector2.glsl → ...glsl/stdlib/mx_worleynoise2d_vector2.glsl b/...lib/genglsl/mx_worleynoise2d_vector2.glsl → ...glsl/stdlib/mx_worleynoise2d_vector2.glsl
diff --git a/...lib/genglsl/mx_worleynoise2d_vector3.glsl → ...glsl/stdlib/mx_worleynoise2d_vector3.glsl b/...lib/genglsl/mx_worleynoise2d_vector3.glsl → ...glsl/stdlib/mx_worleynoise2d_vector3.glsl
diff --git a/...tdlib/genglsl/mx_worleynoise3d_float.glsl → ...englsl/stdlib/mx_worleynoise3d_float.glsl b/...tdlib/genglsl/mx_worleynoise3d_float.glsl → ...englsl/stdlib/mx_worleynoise3d_float.glsl
diff --git a/...lib/genglsl/mx_worleynoise3d_vector2.glsl → ...glsl/stdlib/mx_worleynoise3d_vector2.glsl b/...lib/genglsl/mx_worleynoise3d_vector2.glsl → ...glsl/stdlib/mx_worleynoise3d_vector2.glsl
diff --git a/...lib/genglsl/mx_worleynoise3d_vector3.glsl → ...glsl/stdlib/mx_worleynoise3d_vector3.glsl b/...lib/genglsl/mx_worleynoise3d_vector3.glsl → ...glsl/stdlib/mx_worleynoise3d_vector3.glsl
diff --git a/...s/stdlib/genglsl/stdlib_genglsl_impl.mtlx → ...s/genglsl/stdlib/stdlib_genglsl_impl.mtlx b/...s/stdlib/genglsl/stdlib_genglsl_impl.mtlx → ...s/genglsl/stdlib/stdlib_genglsl_impl.mtlx
diff --git a/...ies/nprlib/genmdl/nprlib_genmdl_impl.mtlx → ...ets/genmdl/nprlib/nprlib_genmdl_impl.mtlx b/...ies/nprlib/genmdl/nprlib_genmdl_impl.mtlx → ...ets/genmdl/nprlib/nprlib_genmdl_impl.mtlx
diff --git a/...ies/pbrlib/genmdl/pbrlib_genmdl_impl.mtlx → ...ets/genmdl/pbrlib/pbrlib_genmdl_impl.mtlx b/...ies/pbrlib/genmdl/pbrlib_genmdl_impl.mtlx → ...ets/genmdl/pbrlib/pbrlib_genmdl_impl.mtlx
diff --git a/...ies/stdlib/genmdl/stdlib_genmdl_impl.mtlx → ...ets/genmdl/stdlib/stdlib_genmdl_impl.mtlx b/...ies/stdlib/genmdl/stdlib_genmdl_impl.mtlx → ...ets/genmdl/stdlib/stdlib_genmdl_impl.mtlx
diff --git a/...ies/lights/genmsl/lights_genmsl_impl.mtlx → ...ets/genmsl/lights/lights_genmsl_impl.mtlx b/...ies/lights/genmsl/lights_genmsl_impl.mtlx → ...ets/genmsl/lights/lights_genmsl_impl.mtlx
diff --git a/.../lights/genmsl/mx_directional_light.metal → .../genmsl/lights/mx_directional_light.metal b/.../lights/genmsl/mx_directional_light.metal → .../genmsl/lights/mx_directional_light.metal
diff --git a/libraries/lights/genmsl/mx_point_light.metal → ...argets/genmsl/lights/mx_point_light.metal b/libraries/lights/genmsl/mx_point_light.metal → ...argets/genmsl/lights/mx_point_light.metal
diff --git a/libraries/lights/genmsl/mx_spot_light.metal → ...targets/genmsl/lights/mx_spot_light.metal b/libraries/lights/genmsl/mx_spot_light.metal → ...targets/genmsl/lights/mx_spot_light.metal
diff --git a/...ies/nprlib/genmsl/nprlib_genmsl_impl.mtlx → ...ets/genmsl/nprlib/nprlib_genmsl_impl.mtlx b/...ies/nprlib/genmsl/nprlib_genmsl_impl.mtlx → ...ets/genmsl/nprlib/nprlib_genmsl_impl.mtlx
diff --git a/...ies/pbrlib/genmsl/pbrlib_genmsl_impl.mtlx → ...ets/genmsl/pbrlib/pbrlib_genmsl_impl.mtlx b/...ies/pbrlib/genmsl/pbrlib_genmsl_impl.mtlx → ...ets/genmsl/pbrlib/pbrlib_genmsl_impl.mtlx
diff --git a/libraries/stdlib/genmsl/lib/mx_math.metal → ...s/targets/genmsl/stdlib/lib/mx_math.metal b/libraries/stdlib/genmsl/lib/mx_math.metal → ...s/targets/genmsl/stdlib/lib/mx_math.metal
diff --git a/...ib/genmsl/lib/mx_matscalaroperators.metal → ...sl/stdlib/lib/mx_matscalaroperators.metal b/...ib/genmsl/lib/mx_matscalaroperators.metal → ...sl/stdlib/lib/mx_matscalaroperators.metal
diff --git a/libraries/stdlib/genmsl/lib/mx_texture.metal → ...argets/genmsl/stdlib/lib/mx_texture.metal b/libraries/stdlib/genmsl/lib/mx_texture.metal → ...argets/genmsl/stdlib/lib/mx_texture.metal
diff --git a/...ies/stdlib/genmsl/stdlib_genmsl_impl.mtlx → ...ets/genmsl/stdlib/stdlib_genmsl_impl.mtlx b/...ies/stdlib/genmsl/stdlib_genmsl_impl.mtlx → ...ets/genmsl/stdlib/stdlib_genmsl_impl.mtlx
@@ -19,22 +19,22 @@
   <!-- ======================================================================== -->
 
   <!-- <image> -->
-  <implementation name="IM_image_float_genmsl" nodedef="ND_image_float" file="../genglsl/mx_image_float.glsl" function="mx_image_float" target="genmsl">
+  <implementation name="IM_image_float_genmsl" nodedef="ND_image_float" file="../../genglsl/stdlib/mx_image_float.glsl" function="mx_image_float" target="genmsl">
     <input name="default" type="float" implname="default_value" />
   </implementation>
-  <implementation name="IM_image_color3_genmsl" nodedef="ND_image_color3" file="../genglsl/mx_image_color3.glsl" function="mx_image_color3" target="genmsl">
+  <implementation name="IM_image_color3_genmsl" nodedef="ND_image_color3" file="../../genglsl/stdlib/mx_image_color3.glsl" function="mx_image_color3" target="genmsl">
     <input name="default" type="color3" implname="default_value" />
   </implementation>
-  <implementation name="IM_image_color4_genmsl" nodedef="ND_image_color4" file="../genglsl/mx_image_color4.glsl" function="mx_image_color4" target="genmsl">
+  <implementation name="IM_image_color4_genmsl" nodedef="ND_image_color4" file="../../genglsl/stdlib/mx_image_color4.glsl" function="mx_image_color4" target="genmsl">
     <input name="default" type="color4" implname="default_value" />
   </implementation>
-  <implementation name="IM_image_vector2_genmsl" nodedef="ND_image_vector2" file="../genglsl/mx_image_vector2.glsl" function="mx_image_vector2" target="genmsl">
+  <implementation name="IM_image_vector2_genmsl" nodedef="ND_image_vector2" file="../../genglsl/stdlib/mx_image_vector2.glsl" function="mx_image_vector2" target="genmsl">
     <input name="default" type="vector2" implname="default_value" />
   </implementation>
-  <implementation name="IM_image_vector3_genmsl" nodedef="ND_image_vector3" file="../genglsl/mx_image_vector3.glsl" function="mx_image_vector3" target="genmsl">
+  <implementation name="IM_image_vector3_genmsl" nodedef="ND_image_vector3" file="../../genglsl/stdlib/mx_image_vector3.glsl" function="mx_image_vector3" target="genmsl">
     <input name="default" type="vector3" implname="default_value" />
   </implementation>
-  <implementation name="IM_image_vector4_genmsl" nodedef="ND_image_vector4" file="../genglsl/mx_image_vector4.glsl" function="mx_image_vector4" target="genmsl">
+  <implementation name="IM_image_vector4_genmsl" nodedef="ND_image_vector4" file="../../genglsl/stdlib/mx_image_vector4.glsl" function="mx_image_vector4" target="genmsl">
     <input name="default" type="vector4" implname="default_value" />
   </implementation>
 

diff --git a/...ies/nprlib/genosl/nprlib_genosl_impl.mtlx → ...ets/genosl/nprlib/nprlib_genosl_impl.mtlx b/...ies/nprlib/genosl/nprlib_genosl_impl.mtlx → ...ets/genosl/nprlib/nprlib_genosl_impl.mtlx
diff --git a/...aries/pbrlib/genosl/lib/mx_microfacet.osl → ...rgets/genosl/pbrlib/lib/mx_microfacet.osl b/...aries/pbrlib/genosl/lib/mx_microfacet.osl → ...rgets/genosl/pbrlib/lib/mx_microfacet.osl
diff --git a/...ries/pbrlib/genosl/mx_anisotropic_vdf.osl → ...gets/genosl/pbrlib/mx_anisotropic_vdf.osl b/...ries/pbrlib/genosl/mx_anisotropic_vdf.osl → ...gets/genosl/pbrlib/mx_anisotropic_vdf.osl
diff --git a/libraries/pbrlib/genosl/mx_artistic_ior.osl → ...targets/genosl/pbrlib/mx_artistic_ior.osl b/libraries/pbrlib/genosl/mx_artistic_ior.osl → ...targets/genosl/pbrlib/mx_artistic_ior.osl
diff --git a/libraries/pbrlib/genosl/mx_blackbody.osl → ...es/targets/genosl/pbrlib/mx_blackbody.osl b/libraries/pbrlib/genosl/mx_blackbody.osl → ...es/targets/genosl/pbrlib/mx_blackbody.osl
diff --git a/...ies/pbrlib/genosl/mx_chiang_hair_bsdf.osl → ...ets/genosl/pbrlib/mx_chiang_hair_bsdf.osl b/...ies/pbrlib/genosl/mx_chiang_hair_bsdf.osl → ...ets/genosl/pbrlib/mx_chiang_hair_bsdf.osl
diff --git a/...brlib/genosl/mx_chiang_hair_roughness.osl → ...enosl/pbrlib/mx_chiang_hair_roughness.osl b/...brlib/genosl/mx_chiang_hair_roughness.osl → ...enosl/pbrlib/mx_chiang_hair_roughness.osl
diff --git a/...ries/pbrlib/genosl/mx_dielectric_bsdf.osl → ...gets/genosl/pbrlib/mx_dielectric_bsdf.osl b/...ries/pbrlib/genosl/mx_dielectric_bsdf.osl → ...gets/genosl/pbrlib/mx_dielectric_bsdf.osl
diff --git a/...ib/genosl/mx_generalized_schlick_bsdf.osl → ...sl/pbrlib/mx_generalized_schlick_bsdf.osl b/...ib/genosl/mx_generalized_schlick_bsdf.osl → ...sl/pbrlib/mx_generalized_schlick_bsdf.osl
diff --git a/...lib/genosl/mx_generalized_schlick_edf.osl → ...osl/pbrlib/mx_generalized_schlick_edf.osl b/...lib/genosl/mx_generalized_schlick_edf.osl → ...osl/pbrlib/mx_generalized_schlick_edf.osl
diff --git a/...pbrlib/genosl/mx_roughness_anisotropy.osl → ...genosl/pbrlib/mx_roughness_anisotropy.osl b/...pbrlib/genosl/mx_roughness_anisotropy.osl → ...genosl/pbrlib/mx_roughness_anisotropy.osl
diff --git a/...aries/pbrlib/genosl/mx_roughness_dual.osl → ...rgets/genosl/pbrlib/mx_roughness_dual.osl b/...aries/pbrlib/genosl/mx_roughness_dual.osl → ...rgets/genosl/pbrlib/mx_roughness_dual.osl
diff --git a/...ries/pbrlib/genosl/mx_subsurface_bsdf.osl → ...gets/genosl/pbrlib/mx_subsurface_bsdf.osl b/...ries/pbrlib/genosl/mx_subsurface_bsdf.osl → ...gets/genosl/pbrlib/mx_subsurface_bsdf.osl
diff --git a/libraries/pbrlib/genosl/mx_surface.osl → ...ries/targets/genosl/pbrlib/mx_surface.osl b/libraries/pbrlib/genosl/mx_surface.osl → ...ries/targets/genosl/pbrlib/mx_surface.osl
diff --git a/...ies/pbrlib/genosl/pbrlib_genosl_impl.mtlx → ...ets/genosl/pbrlib/pbrlib_genosl_impl.mtlx b/...ies/pbrlib/genosl/pbrlib_genosl_impl.mtlx → ...ets/genosl/pbrlib/pbrlib_genosl_impl.mtlx
diff --git a/libraries/stdlib/genosl/include/color4.h → ...es/targets/genosl/stdlib/include/color4.h b/libraries/stdlib/genosl/include/color4.h → ...es/targets/genosl/stdlib/include/color4.h
diff --git a/libraries/stdlib/genosl/include/matrix33.h → .../targets/genosl/stdlib/include/matrix33.h b/libraries/stdlib/genosl/include/matrix33.h → .../targets/genosl/stdlib/include/matrix33.h
diff --git a/libraries/stdlib/genosl/include/mx_funcs.h → .../targets/genosl/stdlib/include/mx_funcs.h b/libraries/stdlib/genosl/include/mx_funcs.h → .../targets/genosl/stdlib/include/mx_funcs.h
diff --git a/libraries/stdlib/genosl/include/vector2.h → ...s/targets/genosl/stdlib/include/vector2.h b/libraries/stdlib/genosl/include/vector2.h → ...s/targets/genosl/stdlib/include/vector2.h
diff --git a/libraries/stdlib/genosl/include/vector4.h → ...s/targets/genosl/stdlib/include/vector4.h b/libraries/stdlib/genosl/include/vector4.h → ...s/targets/genosl/stdlib/include/vector4.h
diff --git a/...ies/stdlib/genosl/lib/mx_transform_uv.osl → ...ets/genosl/stdlib/lib/mx_transform_uv.osl b/...ies/stdlib/genosl/lib/mx_transform_uv.osl → ...ets/genosl/stdlib/lib/mx_transform_uv.osl
diff --git a/...dlib/genosl/lib/mx_transform_uv_vflip.osl → ...nosl/stdlib/lib/mx_transform_uv_vflip.osl b/...dlib/genosl/lib/mx_transform_uv_vflip.osl → ...nosl/stdlib/lib/mx_transform_uv_vflip.osl
diff --git a/...s/stdlib/genosl/lib/vector4_extra_ops.osl → ...s/genosl/stdlib/lib/vector4_extra_ops.osl b/...s/stdlib/genosl/lib/vector4_extra_ops.osl → ...s/genosl/stdlib/lib/vector4_extra_ops.osl
diff --git a/libraries/stdlib/genosl/mx_burn_color3.osl → .../targets/genosl/stdlib/mx_burn_color3.osl b/libraries/stdlib/genosl/mx_burn_color3.osl → .../targets/genosl/stdlib/mx_burn_color3.osl
diff --git a/libraries/stdlib/genosl/mx_burn_color4.osl → .../targets/genosl/stdlib/mx_burn_color4.osl b/libraries/stdlib/genosl/mx_burn_color4.osl → .../targets/genosl/stdlib/mx_burn_color4.osl
diff --git a/libraries/stdlib/genosl/mx_burn_float.osl → ...s/targets/genosl/stdlib/mx_burn_float.osl b/libraries/stdlib/genosl/mx_burn_float.osl → ...s/targets/genosl/stdlib/mx_burn_float.osl
diff --git a/...es/stdlib/genosl/mx_cellnoise2d_float.osl → ...ts/genosl/stdlib/mx_cellnoise2d_float.osl b/...es/stdlib/genosl/mx_cellnoise2d_float.osl → ...ts/genosl/stdlib/mx_cellnoise2d_float.osl
diff --git a/...es/stdlib/genosl/mx_cellnoise3d_float.osl → ...ts/genosl/stdlib/mx_cellnoise3d_float.osl b/...es/stdlib/genosl/mx_cellnoise3d_float.osl → ...ts/genosl/stdlib/mx_cellnoise3d_float.osl
diff --git a/libraries/stdlib/genosl/mx_creatematrix.osl → ...targets/genosl/stdlib/mx_creatematrix.osl b/libraries/stdlib/genosl/mx_creatematrix.osl → ...targets/genosl/stdlib/mx_creatematrix.osl
diff --git a/.../stdlib/genosl/mx_disjointover_color4.osl → .../genosl/stdlib/mx_disjointover_color4.osl b/.../stdlib/genosl/mx_disjointover_color4.osl → .../genosl/stdlib/mx_disjointover_color4.osl
diff --git a/libraries/stdlib/genosl/mx_dodge_color3.osl → ...targets/genosl/stdlib/mx_dodge_color3.osl b/libraries/stdlib/genosl/mx_dodge_color3.osl → ...targets/genosl/stdlib/mx_dodge_color3.osl
diff --git a/libraries/stdlib/genosl/mx_dodge_color4.osl → ...targets/genosl/stdlib/mx_dodge_color4.osl b/libraries/stdlib/genosl/mx_dodge_color4.osl → ...targets/genosl/stdlib/mx_dodge_color4.osl
diff --git a/libraries/stdlib/genosl/mx_dodge_float.osl → .../targets/genosl/stdlib/mx_dodge_float.osl b/libraries/stdlib/genosl/mx_dodge_float.osl → .../targets/genosl/stdlib/mx_dodge_float.osl
diff --git a/...ries/stdlib/genosl/mx_fractal2d_float.osl → ...gets/genosl/stdlib/mx_fractal2d_float.osl b/...ries/stdlib/genosl/mx_fractal2d_float.osl → ...gets/genosl/stdlib/mx_fractal2d_float.osl
diff --git a/...es/stdlib/genosl/mx_fractal2d_vector2.osl → ...ts/genosl/stdlib/mx_fractal2d_vector2.osl b/...es/stdlib/genosl/mx_fractal2d_vector2.osl → ...ts/genosl/stdlib/mx_fractal2d_vector2.osl
diff --git a/...es/stdlib/genosl/mx_fractal2d_vector3.osl → ...ts/genosl/stdlib/mx_fractal2d_vector3.osl b/...es/stdlib/genosl/mx_fractal2d_vector3.osl → ...ts/genosl/stdlib/mx_fractal2d_vector3.osl
diff --git a/...es/stdlib/genosl/mx_fractal2d_vector4.osl → ...ts/genosl/stdlib/mx_fractal2d_vector4.osl b/...es/stdlib/genosl/mx_fractal2d_vector4.osl → ...ts/genosl/stdlib/mx_fractal2d_vector4.osl
diff --git a/...ries/stdlib/genosl/mx_fractal3d_float.osl → ...gets/genosl/stdlib/mx_fractal3d_float.osl b/...ries/stdlib/genosl/mx_fractal3d_float.osl → ...gets/genosl/stdlib/mx_fractal3d_float.osl
diff --git a/...es/stdlib/genosl/mx_fractal3d_vector2.osl → ...ts/genosl/stdlib/mx_fractal3d_vector2.osl b/...es/stdlib/genosl/mx_fractal3d_vector2.osl → ...ts/genosl/stdlib/mx_fractal3d_vector2.osl
diff --git a/...es/stdlib/genosl/mx_fractal3d_vector3.osl → ...ts/genosl/stdlib/mx_fractal3d_vector3.osl b/...es/stdlib/genosl/mx_fractal3d_vector3.osl → ...ts/genosl/stdlib/mx_fractal3d_vector3.osl
diff --git a/...es/stdlib/genosl/mx_fractal3d_vector4.osl → ...ts/genosl/stdlib/mx_fractal3d_vector4.osl b/...es/stdlib/genosl/mx_fractal3d_vector4.osl → ...ts/genosl/stdlib/mx_fractal3d_vector4.osl
diff --git a/libraries/stdlib/genosl/mx_frame_float.osl → .../targets/genosl/stdlib/mx_frame_float.osl b/libraries/stdlib/genosl/mx_frame_float.osl → .../targets/genosl/stdlib/mx_frame_float.osl
diff --git a/...ies/stdlib/genosl/mx_geomcolor_color3.osl → ...ets/genosl/stdlib/mx_geomcolor_color3.osl b/...ies/stdlib/genosl/mx_geomcolor_color3.osl → ...ets/genosl/stdlib/mx_geomcolor_color3.osl
diff --git a/...ies/stdlib/genosl/mx_geomcolor_color4.osl → ...ets/genosl/stdlib/mx_geomcolor_color4.osl b/...ies/stdlib/genosl/mx_geomcolor_color4.osl → ...ets/genosl/stdlib/mx_geomcolor_color4.osl
diff --git a/...ries/stdlib/genosl/mx_geomcolor_float.osl → ...gets/genosl/stdlib/mx_geomcolor_float.osl b/...ries/stdlib/genosl/mx_geomcolor_float.osl → ...gets/genosl/stdlib/mx_geomcolor_float.osl
diff --git a/...tdlib/genosl/mx_geompropvalue_boolean.osl → ...enosl/stdlib/mx_geompropvalue_boolean.osl b/...tdlib/genosl/mx_geompropvalue_boolean.osl → ...enosl/stdlib/mx_geompropvalue_boolean.osl
diff --git a/...stdlib/genosl/mx_geompropvalue_color3.osl → ...genosl/stdlib/mx_geompropvalue_color3.osl b/...stdlib/genosl/mx_geompropvalue_color3.osl → ...genosl/stdlib/mx_geompropvalue_color3.osl
diff --git a/...stdlib/genosl/mx_geompropvalue_color4.osl → ...genosl/stdlib/mx_geompropvalue_color4.osl b/...stdlib/genosl/mx_geompropvalue_color4.osl → ...genosl/stdlib/mx_geompropvalue_color4.osl
diff --git a/.../stdlib/genosl/mx_geompropvalue_float.osl → .../genosl/stdlib/mx_geompropvalue_float.osl b/.../stdlib/genosl/mx_geompropvalue_float.osl → .../genosl/stdlib/mx_geompropvalue_float.osl
diff --git a/...tdlib/genosl/mx_geompropvalue_integer.osl → ...enosl/stdlib/mx_geompropvalue_integer.osl b/...tdlib/genosl/mx_geompropvalue_integer.osl → ...enosl/stdlib/mx_geompropvalue_integer.osl
diff --git a/...stdlib/genosl/mx_geompropvalue_string.osl → ...genosl/stdlib/mx_geompropvalue_string.osl b/...stdlib/genosl/mx_geompropvalue_string.osl → ...genosl/stdlib/mx_geompropvalue_string.osl
diff --git a/...tdlib/genosl/mx_geompropvalue_vector2.osl → ...enosl/stdlib/mx_geompropvalue_vector2.osl b/...tdlib/genosl/mx_geompropvalue_vector2.osl → ...enosl/stdlib/mx_geompropvalue_vector2.osl
diff --git a/...tdlib/genosl/mx_geompropvalue_vector3.osl → ...enosl/stdlib/mx_geompropvalue_vector3.osl b/...tdlib/genosl/mx_geompropvalue_vector3.osl → ...enosl/stdlib/mx_geompropvalue_vector3.osl
diff --git a/...tdlib/genosl/mx_geompropvalue_vector4.osl → ...enosl/stdlib/mx_geompropvalue_vector4.osl b/...tdlib/genosl/mx_geompropvalue_vector4.osl → ...enosl/stdlib/mx_geompropvalue_vector4.osl
diff --git a/...dlib/genosl/mx_heighttonormal_vector3.osl → ...nosl/stdlib/mx_heighttonormal_vector3.osl b/...dlib/genosl/mx_heighttonormal_vector3.osl → ...nosl/stdlib/mx_heighttonormal_vector3.osl
diff --git a/...ries/stdlib/genosl/mx_hsvtorgb_color3.osl → ...gets/genosl/stdlib/mx_hsvtorgb_color3.osl b/...ries/stdlib/genosl/mx_hsvtorgb_color3.osl → ...gets/genosl/stdlib/mx_hsvtorgb_color3.osl
diff --git a/...ries/stdlib/genosl/mx_hsvtorgb_color4.osl → ...gets/genosl/stdlib/mx_hsvtorgb_color4.osl b/...ries/stdlib/genosl/mx_hsvtorgb_color4.osl → ...gets/genosl/stdlib/mx_hsvtorgb_color4.osl
diff --git a/libraries/stdlib/genosl/mx_image_color3.osl → ...targets/genosl/stdlib/mx_image_color3.osl b/libraries/stdlib/genosl/mx_image_color3.osl → ...targets/genosl/stdlib/mx_image_color3.osl
diff --git a/libraries/stdlib/genosl/mx_image_color4.osl → ...targets/genosl/stdlib/mx_image_color4.osl b/libraries/stdlib/genosl/mx_image_color4.osl → ...targets/genosl/stdlib/mx_image_color4.osl
diff --git a/libraries/stdlib/genosl/mx_image_float.osl → .../targets/genosl/stdlib/mx_image_float.osl b/libraries/stdlib/genosl/mx_image_float.osl → .../targets/genosl/stdlib/mx_image_float.osl
diff --git a/libraries/stdlib/genosl/mx_image_vector2.osl → ...argets/genosl/stdlib/mx_image_vector2.osl b/libraries/stdlib/genosl/mx_image_vector2.osl → ...argets/genosl/stdlib/mx_image_vector2.osl
diff --git a/libraries/stdlib/genosl/mx_image_vector3.osl → ...argets/genosl/stdlib/mx_image_vector3.osl b/libraries/stdlib/genosl/mx_image_vector3.osl → ...argets/genosl/stdlib/mx_image_vector3.osl
diff --git a/libraries/stdlib/genosl/mx_image_vector4.osl → ...argets/genosl/stdlib/mx_image_vector4.osl b/libraries/stdlib/genosl/mx_image_vector4.osl → ...argets/genosl/stdlib/mx_image_vector4.osl
diff --git a/...ies/stdlib/genosl/mx_luminance_color3.osl → ...ets/genosl/stdlib/mx_luminance_color3.osl b/...ies/stdlib/genosl/mx_luminance_color3.osl → ...ets/genosl/stdlib/mx_luminance_color3.osl
diff --git a/...ies/stdlib/genosl/mx_luminance_color4.osl → ...ets/genosl/stdlib/mx_luminance_color4.osl b/...ies/stdlib/genosl/mx_luminance_color4.osl → ...ets/genosl/stdlib/mx_luminance_color4.osl
diff --git a/...es/stdlib/genosl/mx_mix_surfaceshader.osl → ...ts/genosl/stdlib/mx_mix_surfaceshader.osl b/...es/stdlib/genosl/mx_mix_surfaceshader.osl → ...ts/genosl/stdlib/mx_mix_surfaceshader.osl
diff --git a/libraries/stdlib/genosl/mx_noise2d_float.osl → ...argets/genosl/stdlib/mx_noise2d_float.osl b/libraries/stdlib/genosl/mx_noise2d_float.osl → ...argets/genosl/stdlib/mx_noise2d_float.osl
diff --git a/...ries/stdlib/genosl/mx_noise2d_vector2.osl → ...gets/genosl/stdlib/mx_noise2d_vector2.osl b/...ries/stdlib/genosl/mx_noise2d_vector2.osl → ...gets/genosl/stdlib/mx_noise2d_vector2.osl
diff --git a/...ries/stdlib/genosl/mx_noise2d_vector3.osl → ...gets/genosl/stdlib/mx_noise2d_vector3.osl b/...ries/stdlib/genosl/mx_noise2d_vector3.osl → ...gets/genosl/stdlib/mx_noise2d_vector3.osl
diff --git a/...ries/stdlib/genosl/mx_noise2d_vector4.osl → ...gets/genosl/stdlib/mx_noise2d_vector4.osl b/...ries/stdlib/genosl/mx_noise2d_vector4.osl → ...gets/genosl/stdlib/mx_noise2d_vector4.osl
diff --git a/libraries/stdlib/genosl/mx_noise3d_float.osl → ...argets/genosl/stdlib/mx_noise3d_float.osl b/libraries/stdlib/genosl/mx_noise3d_float.osl → ...argets/genosl/stdlib/mx_noise3d_float.osl
diff --git a/...ries/stdlib/genosl/mx_noise3d_vector2.osl → ...gets/genosl/stdlib/mx_noise3d_vector2.osl b/...ries/stdlib/genosl/mx_noise3d_vector2.osl → ...gets/genosl/stdlib/mx_noise3d_vector2.osl
diff --git a/...ries/stdlib/genosl/mx_noise3d_vector3.osl → ...gets/genosl/stdlib/mx_noise3d_vector3.osl b/...ries/stdlib/genosl/mx_noise3d_vector3.osl → ...gets/genosl/stdlib/mx_noise3d_vector3.osl
diff --git a/...ries/stdlib/genosl/mx_noise3d_vector4.osl → ...gets/genosl/stdlib/mx_noise3d_vector4.osl b/...ries/stdlib/genosl/mx_noise3d_vector4.osl → ...gets/genosl/stdlib/mx_noise3d_vector4.osl
diff --git a/libraries/stdlib/genosl/mx_normalmap.osl → ...es/targets/genosl/stdlib/mx_normalmap.osl b/libraries/stdlib/genosl/mx_normalmap.osl → ...es/targets/genosl/stdlib/mx_normalmap.osl
diff --git a/...aries/stdlib/genosl/mx_premult_color4.osl → ...rgets/genosl/stdlib/mx_premult_color4.osl b/...aries/stdlib/genosl/mx_premult_color4.osl → ...rgets/genosl/stdlib/mx_premult_color4.osl
diff --git a/...ries/stdlib/genosl/mx_rgbtohsv_color3.osl → ...gets/genosl/stdlib/mx_rgbtohsv_color3.osl b/...ries/stdlib/genosl/mx_rgbtohsv_color3.osl → ...gets/genosl/stdlib/mx_rgbtohsv_color3.osl
diff --git a/...ries/stdlib/genosl/mx_rgbtohsv_color4.osl → ...gets/genosl/stdlib/mx_rgbtohsv_color4.osl b/...ries/stdlib/genosl/mx_rgbtohsv_color4.osl → ...gets/genosl/stdlib/mx_rgbtohsv_color4.osl
diff --git a/...aries/stdlib/genosl/mx_rotate_vector2.osl → ...rgets/genosl/stdlib/mx_rotate_vector2.osl b/...aries/stdlib/genosl/mx_rotate_vector2.osl → ...rgets/genosl/stdlib/mx_rotate_vector2.osl
diff --git a/...aries/stdlib/genosl/mx_rotate_vector3.osl → ...rgets/genosl/stdlib/mx_rotate_vector3.osl b/...aries/stdlib/genosl/mx_rotate_vector3.osl → ...rgets/genosl/stdlib/mx_rotate_vector3.osl
diff --git a/libraries/stdlib/genosl/mx_surface_unlit.osl → ...argets/genosl/stdlib/mx_surface_unlit.osl b/libraries/stdlib/genosl/mx_surface_unlit.osl → ...argets/genosl/stdlib/mx_surface_unlit.osl
diff --git a/...ries/stdlib/genosl/mx_surfacematerial.osl → ...gets/genosl/stdlib/mx_surfacematerial.osl b/...ries/stdlib/genosl/mx_surfacematerial.osl → ...gets/genosl/stdlib/mx_surfacematerial.osl
diff --git a/libraries/stdlib/genosl/mx_time_float.osl → ...s/targets/genosl/stdlib/mx_time_float.osl b/libraries/stdlib/genosl/mx_time_float.osl → ...s/targets/genosl/stdlib/mx_time_float.osl
diff --git a/...b/genosl/mx_transformmatrix_vector2M3.osl → ...l/stdlib/mx_transformmatrix_vector2M3.osl b/...b/genosl/mx_transformmatrix_vector2M3.osl → ...l/stdlib/mx_transformmatrix_vector2M3.osl
diff --git a/...ies/stdlib/genosl/mx_unpremult_color4.osl → ...ets/genosl/stdlib/mx_unpremult_color4.osl b/...ies/stdlib/genosl/mx_unpremult_color4.osl → ...ets/genosl/stdlib/mx_unpremult_color4.osl
diff --git a/.../stdlib/genosl/mx_worleynoise2d_float.osl → .../genosl/stdlib/mx_worleynoise2d_float.osl b/.../stdlib/genosl/mx_worleynoise2d_float.osl → .../genosl/stdlib/mx_worleynoise2d_float.osl
diff --git a/...tdlib/genosl/mx_worleynoise2d_vector2.osl → ...enosl/stdlib/mx_worleynoise2d_vector2.osl b/...tdlib/genosl/mx_worleynoise2d_vector2.osl → ...enosl/stdlib/mx_worleynoise2d_vector2.osl
diff --git a/...tdlib/genosl/mx_worleynoise2d_vector3.osl → ...enosl/stdlib/mx_worleynoise2d_vector3.osl b/...tdlib/genosl/mx_worleynoise2d_vector3.osl → ...enosl/stdlib/mx_worleynoise2d_vector3.osl
diff --git a/.../stdlib/genosl/mx_worleynoise3d_float.osl → .../genosl/stdlib/mx_worleynoise3d_float.osl b/.../stdlib/genosl/mx_worleynoise3d_float.osl → .../genosl/stdlib/mx_worleynoise3d_float.osl
diff --git a/...tdlib/genosl/mx_worleynoise3d_vector2.osl → ...enosl/stdlib/mx_worleynoise3d_vector2.osl b/...tdlib/genosl/mx_worleynoise3d_vector2.osl → ...enosl/stdlib/mx_worleynoise3d_vector2.osl
diff --git a/...tdlib/genosl/mx_worleynoise3d_vector3.osl → ...enosl/stdlib/mx_worleynoise3d_vector3.osl b/...tdlib/genosl/mx_worleynoise3d_vector3.osl → ...enosl/stdlib/mx_worleynoise3d_vector3.osl
diff --git a/...ies/stdlib/genosl/stdlib_genosl_impl.mtlx → ...ets/genosl/stdlib/stdlib_genosl_impl.mtlx b/...ies/stdlib/genosl/stdlib_genosl_impl.mtlx → ...ets/genosl/stdlib/stdlib_genosl_impl.mtlx
diff --git a/source/MaterialXGenShader/GenOptions.h b/source/MaterialXGenShader/GenOptions.h
@@ -93,7 +93,8 @@ class MX_GENSHADER_API GenOptions
         hwNormalizeUdimTexCoords(false),
         hwWriteAlbedoTable(false),
         hwWriteEnvPrefilter(false),
-        hwImplicitBitangents(true)
+        hwImplicitBitangents(true),
+        dataLibraryLegacyLocationFallback(true)
     {
     }
     virtual ~GenOptions() { }
@@ -191,6 +192,10 @@ class MX_GENSHADER_API GenOptions
     /// Calculate fallback bitangents from existing normals and tangents
     /// inside the bitangent node.
     bool hwImplicitBitangents;
+
+    /// Enables the fallback heuristic to locate a data library file by
+    /// its location in the previous structure.
+    bool dataLibraryLegacyLocationFallback;
 };
 
 MATERIALX_NAMESPACE_END

diff --git a/source/MaterialXGenShader/ShaderGenerator.cpp b/source/MaterialXGenShader/ShaderGenerator.cpp
@@ -84,6 +84,38 @@ void ShaderGenerator::emitLibraryInclude(const FilePath& filename, GenContext& c
     FilePath libraryPrefix = context.getOptions().libraryPrefix;
     FilePath fullFilename = libraryPrefix.isEmpty() ? filename : libraryPrefix / filename;
     FilePath resolvedFilename = context.resolveSourceFile(fullFilename, FilePath());
+
+    if (context.getOptions().dataLibraryLegacyLocationFallback)
+    {
+        // heuristic to deal with relocation of data library files - this should be deprecated at some point in the future
+        // and possibly guarded by a shader generation option?
+        //
+        // if we originally passed a relative file, then we expect resolveSourceFile() to return an absolute path
+        // if the file was found, otherwise it just returns the original relative file.
+        // we can use this difference to detect if the library include was not located and attempt to find it in
+        // the old location.
+        if (!fullFilename.isAbsolute() && !resolvedFilename.isAbsolute() && fullFilename == resolvedFilename)
+        {
+            // we didn't find the file, so lets try and look in the "new" location.
+            // Example
+            // old : stdlib/genmsl/lib/mx_texture.metal
+            // new : targets/genmsl/stdlib/lib/mx_texture.metal
+            //
+            // remapping heuristic
+            // 1) add the "targets" prefix
+            // 2) swap the first two parts
+            // 3) append the rest
+            FilePath altFilename = FilePath("targets") / FilePath(filename[1]) / FilePath(filename[0]);
+            for (size_t i = 2; i < filename.size(); ++i)
+            {
+                altFilename = altFilename / FilePath(filename[i]);
+            }
+
+            fullFilename = libraryPrefix.isEmpty() ? altFilename : libraryPrefix / altFilename;
+            resolvedFilename = context.resolveSourceFile(fullFilename, FilePath());
+        }
+    }
+
     stage.addInclude(fullFilename, resolvedFilename, context);
 }
 

diff --git a/source/MaterialXTest/MaterialXRender/RenderUtil.cpp b/source/MaterialXTest/MaterialXRender/RenderUtil.cpp
@@ -197,7 +197,7 @@ bool ShaderRenderTester::validate(const mx::FilePath optionsFilePath)
 
     mx::GenContext context(_shaderGenerator);
     context.registerSourceCodeSearchPath(searchPath);
-    context.registerSourceCodeSearchPath(searchPath.find("libraries/stdlib/genosl/include"));
+    context.registerSourceCodeSearchPath(searchPath.find("libraries/targets/genosl/stdlib/include"));
 
     // Set target unit space
     context.getOptions().targetDistanceUnit = "meter";

diff --git a/source/MaterialXTest/MaterialXRenderOsl/GenReference.cpp b/source/MaterialXTest/MaterialXRenderOsl/GenReference.cpp
@@ -41,7 +41,7 @@ TEST_CASE("GenReference: OSL Reference", "[genreference]")
         }
         // Add in library include path for compile testing as the generated
         // shader's includes are not added with absolute paths.
-        oslIncludePaths.append(searchPath.find("libraries/stdlib/genosl/include"));
+        oslIncludePaths.append(searchPath.find("libraries/targets/genosl/stdlib/include"));
         oslRenderer->setOslIncludePath(oslIncludePaths);
     }