Tag class

* Moved tag class under system template