Moved master and minion behaviors to core and normalized them