Moved multiple text classes into one text class.
Minor commit.