Tidied up code across all demos. Started renaming demos to better suit