Renamed all _ folders to -
Release 0.2.1
Merge branch 'master' into dev/proper.cli