move mappers and models into reasonable package structures