Rebased the ghost files off the azure generated ones.
More missed commits.