refactoring pocos and mappers completed