Renamed demo file structure