Moved the demo code into the library, updated READMEs