Add 'tz' block matcher

* Reorganize spec files
* Put multiple classes into different files