Move products to , for easier submodule use