refactoring, move to mapper package