Split tags into their own set

Note that only the application of tags is complete. Display and
load/save still to come.