#25: Refactor code to use the provided ContactService library; fixed untracked files; performed general refactorization