Moved classes from ported parts of previous word cloud to separate package