Changed link to demo and some dir names