Fix structs to typedefs to make types less verbose
