Improve folder structure
Note: Demo no longer available
Fix demo.