Move all types into a 1 file for easier install