Tidied up engine wrapping.
Tidied up engine wrapping (files missed from previous).