Reorganisation of demo directory