Updated folder and demo project