Contact, Address classes moved to model package.