Fix schema location rebase issue after build split

I forgot to move new schemas that were added after the initial split
Merge pull request #6407 from stuartwdouglas/schema-fi

Fix schema location rebase issue after build split