Rename classes so they better match students' existing classes

Added mergeAddressBooks() method