Refactored product catalog into modules