fixed vestiges of last rename
Moving item templates to separate classes
Added arbitrary tags