Renamed the packages and files according to the changed demo name
Merge remote-tracking branch 'origin/master'