Reorganized pojo and mapper classes into separate packages