This video shows exactly what I did. He did a nice job explaining everything.

Chevy 2005 Aveo headlamp Replacement.wmv - YouTube