update demo and folder structure
update demo and folder structure