Move helpers into modules, hersir name generation