Moved POJO to model package