AMENDED AND RESTATED EMPLOYMENT/SEVERANCE AGREEMENT