Re-arrange the config and plugins directories
Fix usage docs
Evaluate the ret dictionary correctly for pillar