Move lines to separate package