revision of the codebase to unify all types under the collection and
widget paradigm
adjusting the model so that it can extend to use more than the current
limited choices, moved templates to more appropriate names