I'm assuming the old classes where left there to preserve backwards compatibility, correct?