Move "Product" definition back to section 8.