Minor structure changes, organized imports.
Authored by: jan333 2010-11-17
Parent: [r68]
Child: [r70]