Rework building: Windows changes to handle extensions and product names