Structure changing, getting ready to implement into wordpress demo store.