Consolidate controls into \controls folder.
First paragraph of Demo can appear at very top of demo.