Flatten all the types into a single file. It's going to be easier on consumers this way (at the cost of the maintainer). Fixes #2