support masterless minion
move minion to it's own subfolder
Merge branch 'master' into dev
use new state path