Remove old files, update demo to be selfcontained