More conversion to yard
Removed version as a switch
Using templates for help
Reorganizing