Refactoring: Move mapping UI to separate package