Remove unneeded lines, move Ing.&Rec. classes to POJO package

A little clearer organization.