Extracted 'rich' code into a decorator type. Refactored packages.