move Product,ProductDescription entity out of Catalog ns