Reorganized files, added some comments to the demo.