Using ComponentSupport, optimize import
Using component support
Deprecated resource store utils.

Only one method used in only one place, so moved it in.
Updated packaging mapper.
Deprecated smart wastebasket.
Removed MetadataManager inferface, as this made a mess here