Reorganize, validate tags