Renaming demo-folder and fixing pods for demo