moving lines to 1 base class