Use separated wix bundles.
Fix wix references.