Adding more files for demo & renames