Renamed Friend to Contact
Changed class-naming convention