Move types into book