changed package-structure. organized imports.
Authored by: dan-ro 2012-08-17
Parent: [r20596]
Child: [r20598]