Added a discounted package. Moved interfaces specific to the discounted
setting.