Moved types out of client package