refactoring: more packages and more descriptive names
Authored by: keidel 2005-04-02
Parent: [r3103]
Child: [r3105]