Move locations data (#244)
Move contact method type data (#244)