Changed the files around and added a demonstration file