added ship addresses

Removed nested ship addresses, and replaced with associations.