Fix up Typescript types so that everything can be auto-generated from the Typescript src rather than a separate typescript types file.