Refactor/common module

Externalizing the address provider