tags are now consolidated into a set.
refactoring files