Refactoring, new structure of pojos, first page of user done