Type fix
Tag class ref + rest of the tag module layout