move CategoryList into classes