Move view-helpers into lib