Move tags to their own class, adjust accordingly
Tweak tag related commands as well