Rearrange demo support files