conversion to classes, add tab module