Major refactor to change storefront-->tenant to make system more easily described