Affinity Support

Changes and refactoring for affinity group support
Renamed placement to affinity which will affect AWS support.