Replaced the component_type and package class types by proper classes.
Moved some trimming from the Trim module to the package class.