Add missing files, un-updated path to fix demo 2.1, 2.2
Remove unnecessary files