Changed namespace structure and introduce contact helpers