Reorganize products in database; add skeleton Variant type