Reorganizing stuff
Updated demos
0.0.7