Fix annotation in Contact.java and some suggestions
added in other files.  Contacts isn't specific to memory
DAO, so I moved it to entity package.