Updates to overall structure and setting up alternative billing and shipping options