Application: reorganized class declarations.