Update import statements to match new package structure.
Authored by: briggs@adobe.com 2010-02-08
Parent: [r1029]
Child: [r1031]