Refactor product, cart and checkout and reintegrate payscape