clean up struct definitions to be identical to orig FC+VS codebase now that we do...