Move OutputStrategy into cmd package