HTML fix (tr) in finder template
CMS and Module factories are in Vivo\CMS\Api namespace

Moved from Vivo\Service.