Improving organisation of demos