Moved BasicCommand to proper package
(untested) Allow YAML as default