First refactor of previous classes

Adding name attribute.
Preparing for contacts section