move pojo classes to pojo package