Simplified spec and updated version to 0.2.0
Moved demo to separate folder