more tasks so rejig modul, class names for consistency