Update 2: Finished merging the rest!

I realised that if I copy the Goals into the Raw Goals folder and rebuild the story, they are incorporated. Everything else was easy beyond that.

Thanks for all your help!