Move product to it's own module