Added WixMacroExtension project
Fixed folder structure