Refactor contacts
WIP: Refactor addresses and contacts