Fixes to demo files & reorg of folders