Merge "Align the structure of percent demos with other support demo projects." into nyc-dev