Refactoring -> Product images + Add subcategories