Move into package.
Separate from Item listings and behaviours.