Non-linear Structure Formation and the Acoustic Scale