CONN-1034: Updated package names, removed DNS and Policy