Models are not loaded correctly in resource packs with subpacks

Steps to Reproduce:

1. Download and apply the attached resource pack

2. Enter any world

3. Find or spawn a ghast

Observed Results:
Only ghast.entity.json is loaded, causing the ghast to be huge.

Expected Results:
Both ghast.entity.json and ghast.geo.json are loaded, making the ghast appear at its normal size.

Notes: Models will be loaded correctly if placed inside of the subpack folders.